X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.h;h=25a787f92f215f5c9edc8aef68b418d1763f8e4a;hb=5f456f4b288067f9de646b31adabedef5a7171af;hp=c734faf07402559bd494f8f19c48982b034769bb;hpb=d6ea0a5d1f08adc2afe5f87499964d6de93d39c7;p=modest

diff --git a/src/widgets/modest-global-settings-dialog.h b/src/widgets/modest-global-settings-dialog.h
index c734faf..25a787f 100644
--- a/src/widgets/modest-global-settings-dialog.h
+++ b/src/widgets/modest-global-settings-dialog.h
@@ -30,8 +30,13 @@
 #ifndef __MODEST_GLOBAL_SETTINGS_DIALOG_H__
 #define __MODEST_GLOBAL_SETTINGS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-dialog.h>
+#else
+#include <gtk/gtk.h>
+#endif
 #include "widgets/modest-global-settings-dialog-priv.h"
+#include "modest-platform.h"
 /* other include files */
 
 G_BEGIN_DECLS
@@ -45,11 +50,6 @@ G_BEGIN_DECLS
 #define MODEST_GLOBAL_SETTINGS_DIALOG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_GLOBAL_SETTINGS_DIALOG,ModestGlobalSettingsDialogClass))
 
 /* Global settings */
-typedef enum _ModestConnectedVia {
-	MODEST_CONNECTED_VIA_WLAN = 1,
-	MODEST_CONNECTED_VIA_ANY,
-} ModestConnectedVia;
-
 typedef enum _ModestUpdateInterval {
 	MODEST_UPDATE_INTERVAL_5_MIN = 5,
 	MODEST_UPDATE_INTERVAL_10_MIN = 10,
@@ -63,24 +63,29 @@ typedef struct _ModestGlobalSettingsDialog      ModestGlobalSettingsDialog;
 typedef struct _ModestGlobalSettingsDialogClass ModestGlobalSettingsDialogClass;
 
 struct _ModestGlobalSettingsDialog {
+#ifdef MODEST_TOOLKIT_HILDON2
+	 HildonDialog parent;
+#else
 	 GtkDialog parent;
+#endif
 };
 
 struct _ModestGlobalSettingsDialogClass {
+#ifdef MODEST_TOOLKIT_HILDON2
+	HildonDialogClass parent_class;
+#else
 	GtkDialogClass parent_class;
+#endif
 
 	/* Returns the current connection method. Assumes that the device is online */
 	ModestConnectedVia (*current_connection_func) (void);
+	gboolean (*save_settings_func)  (ModestGlobalSettingsDialog *self);
 };
 
 /* member functions */
 GType        modest_global_settings_dialog_get_type    (void) G_GNUC_CONST;
 
-/* Do *NOT* use this functions directly. They must be only used by
-   subclasses. We put them here and not in the -priv header file
-   because recursive dependencies */
-void     _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self);
-gboolean _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self);
+gboolean modest_global_settings_dialog_save_settings (ModestGlobalSettingsDialog *self);
 
 
 G_END_DECLS