Fixes NB#130154, remove deprecated gtk+ symbols

diff --git a/src/hildon2/modest-number-editor.h b/src/hildon2/modest-number-editor.h
index 3e4ed2c..171632d 100644 (file)
--- a/src/hildon2/modest-number-editor.h
+++ b/src/hildon2/modest-number-editor.h
@@ -40,20 +40,21 @@ G_BEGIN_DECLS
                                                 (modest_number_editor_get_type())
 
 #define                                         MODEST_NUMBER_EDITOR(obj) \
-                                                (GTK_CHECK_CAST (obj, MODEST_TYPE_NUMBER_EDITOR, ModestNumberEditor))
+                                                (G_TYPE_CHECK_INSTANCE_CAST (obj, MODEST_TYPE_NUMBER_EDITOR, ModestNumberEditor))
 
 #define                                         MODEST_NUMBER_EDITOR_CLASS(klass) \
-                                                (GTK_CHECK_CLASS_CAST ((klass), MODEST_TYPE_NUMBER_EDITOR, \
+                                                (G_TYPE_CHECK_CLASS_CAST ((klass), MODEST_TYPE_NUMBER_EDITOR, \
                                                 ModestNumberEditorClass))
 
 #define                                         MODEST_IS_NUMBER_EDITOR(obj) \
-                                                (GTK_CHECK_TYPE (obj, MODEST_TYPE_NUMBER_EDITOR))
+                                                (G_TYPE_CHECK_INSTANCE_TYPE (obj, MODEST_TYPE_NUMBER_EDITOR))
 
 #define                                         MODEST_IS_NUMBER_EDITOR_CLASS(klass) \
-                                                (GTK_CHECK_CLASS_TYPE ((klass), MODEST_TYPE_NUMBER_EDITOR))
+                                                (G_TYPE_CHECK_CLASS_TYPE ((klass), MODEST_TYPE_NUMBER_EDITOR))
 
 #define                                         MODEST_NUMBER_EDITOR_GET_CLASS(obj) \
-                                                ((ModestNumberEditorClass *) G_OBJECT_GET_CLASS(obj))
+                                               (G_TYPE_INSTANCE_GET_CLASS ((obj), MODEST_TYPE_NUMBER_EDITOR, \
+                                               ModestNumberEditorClass))
 
 typedef struct                                  _ModestNumberEditor ModestNumberEditor;
 

diff --git a/src/widgets/modest-wizard-dialog.h b/src/widgets/modest-wizard-dialog.h
index 60b690d..25391cb 100644 (file)
--- a/src/widgets/modest-wizard-dialog.h
+++ b/src/widgets/modest-wizard-dialog.h
@@ -40,20 +40,19 @@ G_BEGIN_DECLS
 
 #define MODEST_TYPE_WIZARD_DIALOG (modest_wizard_dialog_get_type())
 
-#define MODEST_WIZARD_DIALOG(obj) (GTK_CHECK_CAST ((obj), \
+#define MODEST_WIZARD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
             MODEST_TYPE_WIZARD_DIALOG, ModestWizardDialog))
 
-#define MODEST_WIZARD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
+#define MODEST_WIZARD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
             MODEST_TYPE_WIZARD_DIALOG, ModestWizardDialogClass))
 
-#define MODEST_IS_WIZARD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), \
+#define MODEST_IS_WIZARD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
             MODEST_TYPE_WIZARD_DIALOG))
 
-#define MODEST_IS_WIZARD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
+#define MODEST_IS_WIZARD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
             MODEST_TYPE_WIZARD_DIALOG))
             
-#define MODEST_WIZARD_DIALOG_GET_CLASS(obj) \
-            (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+#define MODEST_WIZARD_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
             MODEST_TYPE_WIZARD_DIALOG, ModestWizardDialogClass))
 
 typedef struct _ModestWizardDialog ModestWizardDialog;