Remove HildonDialog deprecated symbol

HildonDialog is deprecated, GtkDialog is the recommended widget

https://bugs.maemo.org/show_bug.cgi?id=5188

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 33854b9..4e18836 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -707,7 +707,7 @@ folder_chooser_dialog_run (ModestFolderView *original,
        GtkWidget *pannable;
        const gchar *visible_id = NULL;
 
        GtkWidget *pannable;
        const gchar *visible_id = NULL;
 

-       userdata.dialog = hildon_dialog_new ();
+       userdata.dialog = gtk_dialog_new ();

        pannable = hildon_pannable_area_new ();
        folder_view = modest_platform_create_folder_view (NULL);
 
        pannable = hildon_pannable_area_new ();
        folder_view = modest_platform_create_folder_view (NULL);
 

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 2adbe1b..18ffb9a 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -107,15 +107,9 @@ modest_global_settings_dialog_get_type (void)
                        (GInstanceInitFunc) modest_global_settings_dialog_init,
                        NULL
                };
                        (GInstanceInitFunc) modest_global_settings_dialog_init,
                        NULL
                };

-#ifdef MODEST_TOOLKIT_HILDON2
-               my_type = g_type_register_static (HILDON_TYPE_DIALOG,
-                                                 "ModestGlobalSettingsDialog",
-                                                 &my_info, 0);
-#else

                my_type = g_type_register_static (GTK_TYPE_DIALOG,
                                                  "ModestGlobalSettingsDialog",
                                                  &my_info, 0);
                my_type = g_type_register_static (GTK_TYPE_DIALOG,
                                                  "ModestGlobalSettingsDialog",
                                                  &my_info, 0);

-#endif

        }
        return my_type;
 }
        }
        return my_type;
 }

diff --git a/src/widgets/modest-global-settings-dialog.h b/src/widgets/modest-global-settings-dialog.h
index bc4b768..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__
 
 #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 */
 #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 {
 typedef struct _ModestGlobalSettingsDialogClass ModestGlobalSettingsDialogClass;
 
 struct _ModestGlobalSettingsDialog {

-#ifdef MODEST_TOOLKIT_HILDON2
-        HildonDialog parent;
-#else

         GtkDialog parent;
         GtkDialog parent;

-#endif

 };
 
 struct _ModestGlobalSettingsDialogClass {
 };
 
 struct _ModestGlobalSettingsDialogClass {

-#ifdef MODEST_TOOLKIT_HILDON2
-       HildonDialogClass parent_class;
-#else

        GtkDialogClass parent_class;
        GtkDialogClass parent_class;

-#endif

 
        /* Returns the current connection method. Assumes that the device is online */
        ModestConnectedVia (*current_connection_func) (void);
 
        /* Returns the current connection method. Assumes that the device is online */
        ModestConnectedVia (*current_connection_func) (void);