projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is a manual merge of branch drop split view intro trunk.
[modest]
/
src
/
widgets
/
modest-serversecurity-combo-box.h
diff --git
a/src/widgets/modest-serversecurity-combo-box.h
b/src/widgets/modest-serversecurity-combo-box.h
index
f47f6ea
..
f431637
100644
(file)
--- a/
src/widgets/modest-serversecurity-combo-box.h
+++ b/
src/widgets/modest-serversecurity-combo-box.h
@@
-7,7
+7,7
@@
#define _MODEST_SERVERSECURITY_COMBO_BOX
#include <gtk/gtkcombobox.h>
#define _MODEST_SERVERSECURITY_COMBO_BOX
#include <gtk/gtkcombobox.h>
-#include "modest-protocol-info.h"
+#include "modest-protocol-registry.h"
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-45,12
+45,12
@@
GType modest_serversecurity_combo_box_get_type (void);
ModestServersecurityComboBox* modest_serversecurity_combo_box_new (void);
ModestServersecurityComboBox* modest_serversecurity_combo_box_new (void);
-void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobox, ModestTransportStoreProtocol protocol);
+void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobox, ModestProtocolType protocol);
-ModestConnectionProtocol modest_serversecurity_combo_box_get_active_serversecurity (ModestServersecurityComboBox *combobox);
+ModestProtocolType modest_serversecurity_combo_box_get_active_serversecurity (ModestServersecurityComboBox *combobox);
gboolean modest_serversecurity_combo_box_set_active_serversecurity (ModestServersecurityComboBox *combobox,
gboolean modest_serversecurity_combo_box_set_active_serversecurity (ModestServersecurityComboBox *combobox,
- ModestConnectionProtocol serversecurity);
+ ModestProtocolType serversecurity);
gint modest_serversecurity_combo_box_get_active_serversecurity_port (ModestServersecurityComboBox *combobox);
gint modest_serversecurity_combo_box_get_active_serversecurity_port (ModestServersecurityComboBox *combobox);