Get rid of deprecated gtk_marshal_* and some old GtkComboBox API

(bzr r10959)

11 files changed, 53 insertions, 28 deletions

diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
index febd90287..81aee087e 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -51,6 +51,7 @@
 #endif /* GDK_WINDOWING_X11 */
 
 #include "ege-color-prof-tracker.h"
+#include "helper/sp-marshal.h"
 
 /*
 #define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
@@ -185,7 +186,7 @@ void ege_color_prof_tracker_class_init( EgeColorProfTrackerClass* klass )
                                        G_SIGNAL_RUN_FIRST,
                                        0,
                                        NULL, NULL,
-                                       gtk_marshal_VOID__INT_INT,
+                                       sp_marshal_VOID__INT_INT,
                                        G_TYPE_NONE, 2,
                                        G_TYPE_INT,
                                        G_TYPE_INT);
@@ -195,7 +196,7 @@ void ege_color_prof_tracker_class_init( EgeColorProfTrackerClass* klass )
                                          G_SIGNAL_RUN_FIRST,
                                          0,
                                          NULL, NULL,
-                                         gtk_marshal_VOID__INT_INT,
+                                         sp_marshal_VOID__INT_INT,
                                          G_TYPE_NONE, 2,
                                          G_TYPE_INT,
                                          G_TYPE_INT);
@@ -205,7 +206,7 @@ void ege_color_prof_tracker_class_init( EgeColorProfTrackerClass* klass )
                                           G_SIGNAL_RUN_FIRST,
                                           0,
                                           NULL, NULL,
-                                          gtk_marshal_VOID__INT_INT,
+                                          sp_marshal_VOID__INT_INT,
                                           G_TYPE_NONE, 2,
                                           G_TYPE_INT,
                                           G_TYPE_INT);
diff --git a/src/helper/sp-marshal.list b/src/helper/sp-marshal.list
index 1dc4dd65c..6014c820d 100644
--- a/src/helper/sp-marshal.list
+++ b/src/helper/sp-marshal.list
@@ -5,3 +5,4 @@ BOOLEAN:POINTER,UINT
 BOOLEAN:POINTER,POINTER
 INT:POINTER,POINTER
 DOUBLE:POINTER,UINT
+VOID:INT,INT
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index f07d0cac4..d0cc73081 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -59,6 +59,7 @@
 #include "selection.h"
 #include "ui/dialog/debug.h"
 #include "xml/repr.h"
+#include "helper/sp-marshal.h"
 
 static Inkscape::Application *inkscape = NULL;
 
@@ -190,7 +191,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass)
                                G_SIGNAL_RUN_FIRST,
                                G_STRUCT_OFFSET (Inkscape::ApplicationClass, modify_selection),
                                NULL, NULL,
-                               gtk_marshal_VOID__POINTER_UINT,
+                               sp_marshal_VOID__POINTER_UINT,
                                G_TYPE_NONE, 2,
                                G_TYPE_POINTER, G_TYPE_UINT);
     inkscape_signals[CHANGE_SELECTION] = g_signal_new ("change_selection",
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 08f79f9e2..4515f3f97 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -127,7 +127,7 @@ static void sp_font_selector_class_init(SPFontSelectorClass *c)
                                            GTK_RUN_FIRST,
                                            GTK_CLASS_TYPE(object_class),
                                            GTK_SIGNAL_OFFSET(SPFontSelectorClass, font_set),
-                                           gtk_marshal_NONE__POINTER,
+                                           g_cclosure_marshal_VOID__POINTER,
                                            GTK_TYPE_NONE,
                                            1, GTK_TYPE_POINTER);
 
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index bece60a08..0d473bae2 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -89,28 +89,28 @@ sp_gradient_selector_class_init (SPGradientSelectorClass *klass)
                                         (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                         G_STRUCT_OFFSET (SPGradientSelectorClass, grabbed),
 					NULL, NULL,
-                                        gtk_marshal_NONE__NONE,
+                                        g_cclosure_marshal_VOID__VOID,
                                         G_TYPE_NONE, 0);
     signals[DRAGGED] =  g_signal_new ("dragged",
                                         G_TYPE_FROM_CLASS(object_class),
                                         (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                         G_STRUCT_OFFSET (SPGradientSelectorClass, dragged),
 					NULL, NULL,
-                                        gtk_marshal_NONE__NONE,
+                                        g_cclosure_marshal_VOID__VOID,
                                         G_TYPE_NONE, 0);
     signals[RELEASED] = g_signal_new ("released",
                                         G_TYPE_FROM_CLASS(object_class),
                                         (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                         G_STRUCT_OFFSET (SPGradientSelectorClass, released),
 					NULL, NULL,
-                                        gtk_marshal_NONE__NONE,
+                                        g_cclosure_marshal_VOID__VOID,
                                         G_TYPE_NONE, 0);
     signals[CHANGED] =  g_signal_new ("changed",
                                         G_TYPE_FROM_CLASS(object_class),
                                         (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                         G_STRUCT_OFFSET (SPGradientSelectorClass, changed),
 					NULL, NULL,
-                                        gtk_marshal_NONE__NONE,
+                                        g_cclosure_marshal_VOID__VOID,
                                         G_TYPE_NONE, 0);
 
     object_class->destroy = sp_gradient_selector_destroy;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 8d05de101..37b9483f2 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -109,7 +109,7 @@ static void sp_gradient_vector_selector_class_init(SPGradientVectorSelectorClass
 					G_SIGNAL_RUN_LAST,
                                         G_STRUCT_OFFSET(SPGradientVectorSelectorClass, vector_set),
 					NULL, NULL,
-					gtk_marshal_NONE__POINTER,
+					g_cclosure_marshal_VOID__POINTER,
 					G_TYPE_NONE, 1,
 					GTK_TYPE_POINTER);
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index fc9dc9263..b231b4e38 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -166,42 +166,42 @@ sp_paint_selector_class_init(SPPaintSelectorClass *klass)
                                                 (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                                 G_STRUCT_OFFSET(SPPaintSelectorClass, mode_changed),
 						NULL, NULL,
-                                                gtk_marshal_NONE__UINT,
+                                                g_cclosure_marshal_VOID__UINT,
                                                 G_TYPE_NONE, 1, GTK_TYPE_UINT);
     psel_signals[GRABBED] =  g_signal_new("grabbed",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPPaintSelectorClass, grabbed),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+                                            g_cclosure_marshal_VOID__VOID,
                                             G_TYPE_NONE, 0);
     psel_signals[DRAGGED] =  g_signal_new("dragged",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPPaintSelectorClass, dragged),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+                                            g_cclosure_marshal_VOID__VOID,
                                             G_TYPE_NONE, 0);
     psel_signals[RELEASED] = g_signal_new("released",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPPaintSelectorClass, released),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+                                            g_cclosure_marshal_VOID__VOID,
                                             G_TYPE_NONE, 0);
     psel_signals[CHANGED] =  g_signal_new("changed",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPPaintSelectorClass, changed),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+                                            g_cclosure_marshal_VOID__VOID,
                                             G_TYPE_NONE, 0);
     psel_signals[FILLRULE_CHANGED] = g_signal_new("fillrule_changed",
                                                     G_TYPE_FROM_CLASS(object_class),
                                                     (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                                     G_STRUCT_OFFSET(SPPaintSelectorClass, fillrule_changed),
 						    NULL, NULL,
-                                                    gtk_marshal_NONE__UINT,
+                                                    g_cclosure_marshal_VOID__UINT,
                                                     G_TYPE_NONE, 1, GTK_TYPE_UINT);
 
     object_class->destroy = sp_paint_selector_destroy;
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index d2868d24b..c9550f244 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -303,8 +303,13 @@ void ColorICCSelector::init()
     gtk_table_attach( GTK_TABLE (t), _fixupBtn, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD );
 
 
+#if GTK_CHECK_VERSION(2,24,0)
+    _profileSel = gtk_combo_box_text_new();
+    gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(_profileSel), _("<none>") );
+#else
     _profileSel = gtk_combo_box_new_text();
     gtk_combo_box_append_text( GTK_COMBO_BOX(_profileSel), _("<none>") );
+#endif
     gtk_widget_show( _profileSel );
     gtk_combo_box_set_active( GTK_COMBO_BOX(_profileSel), 0 );
     gtk_table_attach( GTK_TABLE(t), _profileSel, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD );
@@ -460,7 +465,11 @@ void ColorICCSelector::_profileSelected( GtkWidget* /*src*/, gpointer data )
 {
     ColorICCSelector* self = reinterpret_cast<ColorICCSelector*>(data);
     gint activeIndex = gtk_combo_box_get_active( GTK_COMBO_BOX(self->_profileSel) );
+#if GTK_CHECK_VERSION(2,24,0)
+    gchar* name = (activeIndex != 0) ? gtk_combo_box_text_get_active_text( GTK_COMBO_BOX_TEXT(self->_profileSel) ) : 0;
+#else
     gchar* name = (activeIndex != 0) ? gtk_combo_box_get_active_text( GTK_COMBO_BOX(self->_profileSel) ) : 0;
+#endif //GTK_CHECK_VERSION
     self->_switchToProfile( name );
     if ( name ) {
         g_free( name );
@@ -574,10 +583,18 @@ void ColorICCSelector::_profilesChanged( std::string const & name )
     GtkTreeModel* model = gtk_combo_box_get_model( combo );
     GtkTreeIter iter;
     while ( gtk_tree_model_get_iter_first( model, &iter ) ) {
+#if GTK_CHECK_VERSION(2,24,0)
+        gtk_combo_box_text_remove( GTK_COMBO_BOX_TEXT(combo), 0 );
+#else
         gtk_combo_box_remove_text( combo, 0 );
+#endif
     }
 
+#if GTK_CHECK_VERSION(2,24,0)
+    gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(combo), _("<none>"));
+#else
     gtk_combo_box_append_text( combo, _("<none>"));
+#endif
 
     gtk_combo_box_set_active( combo, 0 );
 
@@ -586,7 +603,11 @@ void ColorICCSelector::_profilesChanged( std::string const & name )
     while ( current ) {
         SPObject* obj = SP_OBJECT(current->data);
         Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
+#if GTK_CHECK_VERSION(2,24,0)
+        gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(combo), prof->name );
+#else
         gtk_combo_box_append_text( combo, prof->name );
+#endif
         if ( name == prof->name ) {
             gtk_combo_box_set_active( combo, index );
         }
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index b017ed923..45e996cb6 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -75,28 +75,28 @@ void sp_color_selector_class_init( SPColorSelectorClass *klass )
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPColorSelectorClass, grabbed),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+					    g_cclosure_marshal_VOID__VOID,
                                             GTK_TYPE_NONE, 0 );
     csel_signals[DRAGGED] = g_signal_new( "dragged",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPColorSelectorClass, dragged),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+					    g_cclosure_marshal_VOID__VOID,
                                             GTK_TYPE_NONE, 0 );
     csel_signals[RELEASED] = g_signal_new( "released",
                                              G_TYPE_FROM_CLASS(object_class),
                                              (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                              G_STRUCT_OFFSET(SPColorSelectorClass, released),
 					     NULL, NULL,
-                                             gtk_marshal_NONE__NONE,
+					     g_cclosure_marshal_VOID__VOID,
                                              GTK_TYPE_NONE, 0 );
     csel_signals[CHANGED] = g_signal_new( "changed",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
                                             G_STRUCT_OFFSET(SPColorSelectorClass, changed),
 					    NULL, NULL,
-                                            gtk_marshal_NONE__NONE,
+					    g_cclosure_marshal_VOID__VOID,
                                             GTK_TYPE_NONE, 0 );
 
     klass->name = nameset;
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 341eb18e2..8d07e153c 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -90,28 +90,28 @@ sp_color_slider_class_init (SPColorSliderClass *klass)
 						  (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
 						  G_STRUCT_OFFSET (SPColorSliderClass, grabbed),
 						  NULL, NULL,
-						  gtk_marshal_NONE__NONE,
+						  g_cclosure_marshal_VOID__VOID,
 						  G_TYPE_NONE, 0);
 	slider_signals[DRAGGED] = g_signal_new ("dragged",
 						  G_TYPE_FROM_CLASS(object_class),
 						  (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
 						  G_STRUCT_OFFSET (SPColorSliderClass, dragged),
 						  NULL, NULL,
-						  gtk_marshal_NONE__NONE,
+						  g_cclosure_marshal_VOID__VOID,
 						  G_TYPE_NONE, 0);
 	slider_signals[RELEASED] = g_signal_new ("released",
 						  G_TYPE_FROM_CLASS(object_class),
 						  (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
 						  G_STRUCT_OFFSET (SPColorSliderClass, released),
 						  NULL, NULL,
-						  gtk_marshal_NONE__NONE,
+						  g_cclosure_marshal_VOID__VOID,
 						  G_TYPE_NONE, 0);
 	slider_signals[CHANGED] = g_signal_new ("changed",
 						  G_TYPE_FROM_CLASS(object_class),
 						  (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
 						  G_STRUCT_OFFSET (SPColorSliderClass, changed),
 						  NULL, NULL,
-						  gtk_marshal_NONE__NONE,
+						  g_cclosure_marshal_VOID__VOID,
 						  G_TYPE_NONE, 0);
 
 	object_class->destroy = sp_color_slider_destroy;
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 97af9c7fa..d1336b4e5 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -16,6 +16,7 @@
 #include "macros.h"
 #include "../document.h"
 #include "sp-widget.h"
+#include "helper/sp-marshal.h"
 
 enum {
 	CONSTRUCT,
@@ -84,14 +85,14 @@ sp_widget_class_init (SPWidgetClass *klass)
 						    G_SIGNAL_RUN_FIRST,
 						    G_STRUCT_OFFSET (SPWidgetClass, construct),
 						    NULL, NULL,
-						    gtk_marshal_NONE__NONE,
+						    g_cclosure_marshal_VOID__VOID,
 						    G_TYPE_NONE, 0);
 	signals[CHANGE_SELECTION] = g_signal_new ("change_selection",
 						    G_TYPE_FROM_CLASS(object_class),
 						    G_SIGNAL_RUN_FIRST,
 						    G_STRUCT_OFFSET (SPWidgetClass, change_selection),
 						    NULL, NULL,
-						    gtk_marshal_NONE__POINTER,
+						    g_cclosure_marshal_VOID__POINTER,
 						    G_TYPE_NONE, 1,
 						    GTK_TYPE_POINTER);
 	signals[MODIFY_SELECTION] = g_signal_new ("modify_selection",
@@ -99,7 +100,7 @@ sp_widget_class_init (SPWidgetClass *klass)
 						    G_SIGNAL_RUN_FIRST,
 						    G_STRUCT_OFFSET (SPWidgetClass, modify_selection),
 						    NULL, NULL,
-						    gtk_marshal_NONE__POINTER_UINT,
+						    sp_marshal_VOID__POINTER_UINT,
 						    G_TYPE_NONE, 2,
 						    GTK_TYPE_POINTER, GTK_TYPE_UINT);
 	signals[SET_SELECTION] =    g_signal_new ("set_selection",
@@ -107,7 +108,7 @@ sp_widget_class_init (SPWidgetClass *klass)
 						    G_SIGNAL_RUN_FIRST,
 						    G_STRUCT_OFFSET (SPWidgetClass, set_selection),
 						    NULL, NULL,
-						    gtk_marshal_NONE__POINTER,
+						    g_cclosure_marshal_VOID__POINTER,
 						    G_TYPE_NONE, 1,
 						    GTK_TYPE_POINTER);