X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.h;h=cd14357926ac1a9e239a758b3b57e33c29eb67e0;hp=bc4b76873294965673100d030eb969ea1be735db;hb=02f0668bb12c4fccb22f0fef53548b8e0f39698f;hpb=4d13843468411ea6cab17313a11f34c35c190e7e;ds=sidebyside diff --git a/src/widgets/modest-global-settings-dialog.h b/src/widgets/modest-global-settings-dialog.h index bc4b768..cd14357 100644 --- a/src/widgets/modest-global-settings-dialog.h +++ b/src/widgets/modest-global-settings-dialog.h @@ -30,11 +30,7 @@ #ifndef __MODEST_GLOBAL_SETTINGS_DIALOG_H__ #define __MODEST_GLOBAL_SETTINGS_DIALOG_H__ -#ifdef MODEST_TOOLKIT_HILDON2 -#include -#else -#include -#endif +#include #include "widgets/modest-global-settings-dialog-priv.h" #include "modest-platform.h" /* other include files */ @@ -63,19 +59,11 @@ 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);