* Changes in the autotools stuff affecting a lot of platform dependent

[modest] / src / widgets / modest-global-settings-dialog-priv.h

diff --git a/src/widgets/modest-global-settings-dialog-priv.h b/src/widgets/modest-global-settings-dialog-priv.h
index ca1f6f5..ec351a9 100644 (file)
--- a/src/widgets/modest-global-settings-dialog-priv.h
+++ b/src/widgets/modest-global-settings-dialog-priv.h
@@ -41,8 +41,7 @@ typedef struct _ModestGlobalSettingsState {
        gint     update_interval;
        gint     size_limit;
        gboolean play_sound;
-       gint     msg_format;
-       gboolean include_reply;
+       gboolean prefer_formatted_text;
 } ModestGlobalSettingsState;
 
 typedef struct _ModestGlobalSettingsDialogPrivate ModestGlobalSettingsDialogPrivate;
@@ -52,14 +51,19 @@ struct _ModestGlobalSettingsDialogPrivate {
        GtkWidget *composing_page;
 
        GtkWidget *auto_update;
+       
+       ModestPairList *connect_via_list;
        GtkWidget *connect_via;
+       
+       ModestPairList *update_interval_list;
        GtkWidget *update_interval;
+       
        GtkWidget *size_limit;
        GtkWidget *play_sound;
+       
+       ModestPairList *msg_format_list;
        GtkWidget *msg_format;
-       GtkWidget *include_reply;
 
-       gboolean   changed;
        ModestGlobalSettingsState initial_state;
 };
 
@@ -71,9 +75,6 @@ ModestPairList*   _modest_global_settings_dialog_get_connected_via   (void);
 ModestPairList*   _modest_global_settings_dialog_get_update_interval (void);
 ModestPairList*   _modest_global_settings_dialog_get_msg_formats     (void);
 
-void     _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialogPrivate *priv);
-gboolean _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialogPrivate *priv);
-
 G_END_DECLS
 
 #endif /* __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__ */