Use GTK+ single includes
[modest] / src / widgets / modest-global-settings-dialog-priv.h
index 1f39e5b..c55472d 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__
 #define __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "modest-pair.h"
 
 G_BEGIN_DECLS
@@ -40,9 +40,9 @@ typedef struct _ModestGlobalSettingsState {
        gint     connect_via;
        gint     update_interval;
        gint     size_limit;
+       gchar *default_account;
        gboolean play_sound;
        gboolean prefer_formatted_text;
-       gboolean include_reply;
 } ModestGlobalSettingsState;
 
 typedef struct _ModestGlobalSettingsDialogPrivate ModestGlobalSettingsDialogPrivate;
@@ -52,14 +52,22 @@ struct _ModestGlobalSettingsDialogPrivate {
        GtkWidget *composing_page;
 
        GtkWidget *auto_update;
+       
+       ModestPairList *connect_via_list;
        GtkWidget *connect_via;
+       
+       ModestPairList *accounts_list;
+       GtkWidget *default_account_selector;
+
+       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;
 };