Remove HildonDialog deprecated symbol

[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 79c988b..cd14357 100644 (file)
--- 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 <hildon/hildon-dialog.h>
-#else
-#include <gtk/gtkdialog.h>
-#endif
+#include <gtk/gtk.h>
 #include "widgets/modest-global-settings-dialog-priv.h"
 #include "modest-platform.h"
 /* other include files */
@@ -63,32 +59,21 @@ 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