* Now folder view does not support drag'n'drop.

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

diff --git a/src/widgets/modest-global-settings-dialog.h b/src/widgets/modest-global-settings-dialog.h
index c734faf..79c988b 100644 (file)
--- 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__
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-dialog.h>
+#else
 #include <gtk/gtkdialog.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,11 +63,19 @@ 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);