Fix for 367607 : Remove deprecated GTK+ symbols - Deprecated *_unref symbols and combo_box fixes

(bzr r11140)

5 files changed, 30 insertions, 11 deletions

diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 1cc6e72ed..92a1b0fb8 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -311,7 +311,7 @@ CanvasGrid::createCanvasItem(SPDesktop * desktop)
     item->grid = this;
     sp_canvas_item_show(SP_CANVAS_ITEM(item));
 
-    gtk_object_ref(GTK_OBJECT(item));    // since we're keeping a link to this item, we need to bump up the ref count
+    g_object_ref(item);    // since we're keeping a link to this item, we need to bump up the ref count
     canvasitems = g_slist_prepend(canvasitems, item);
 
     return item;
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index e5be4f8a9..f352133e5 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1078,7 +1078,7 @@ void SPCanvasGroup::viewboxChanged(SPCanvasItem *item, Geom::IntRect const &new_
 
 void SPCanvasGroup::add(SPCanvasItem *item)
 {
-    gtk_object_ref( GTK_OBJECT(item) );
+    g_object_ref(item);
     g_object_ref_sink(item);
 
     if (!items) {
@@ -1181,7 +1181,7 @@ void SPCanvasImpl::init(SPCanvas *canvas)
     canvas->root = SP_CANVAS_ITEM(g_object_new(SPCanvasGroup::getType(), NULL));
     canvas->root->canvas = canvas;
 
-    gtk_object_ref (GTK_OBJECT (canvas->root));
+    g_object_ref (canvas->root);
     g_object_ref_sink (canvas->root);
 
     canvas->need_repick = TRUE;
@@ -1484,7 +1484,7 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event)
     gint finished = FALSE;
 
     while (item && !finished) {
-        gtk_object_ref (GTK_OBJECT (item));
+        g_object_ref (item);
         g_signal_emit (G_OBJECT (item), item_signals[ITEM_EVENT], 0, &ev, &finished);
         SPCanvasItem *parent = item->parent;
         g_object_unref (item);
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index ea1ddde5e..964ca9d67 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -326,7 +326,7 @@ sp_unit_selector_add_adjustment(SPUnitSelector *us, GtkAdjustment *adj)
 
     g_return_if_fail(!g_slist_find(us->adjustments, adj));
 
-    gtk_object_ref(GTK_OBJECT(adj));
+    g_object_ref(adj);
     us->adjustments = g_slist_prepend(us->adjustments, adj);
 }
 
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 5aa8d3d00..894fc2cd8 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -205,7 +205,17 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         gtk_widget_show(hb);
         gtk_box_pack_start(GTK_BOX(vb), hb, FALSE, FALSE, 0);
 
+/*
+This would introduce dependency on gtk version 2.24 which is currently not available in
+Trisquel GNU/Linux 4.5.1 (released on May 25th, 2011)
+This conditional and its #else block can be deleted in the future.
+*/
+#if GTK_CHECK_VERSION(2, 24,0)
+        fsel->size = gtk_combo_box_text_new_with_entry ();
+#else
         fsel->size = gtk_combo_box_entry_new_text ();
+#endif
+
         gtk_widget_set_tooltip_text (fsel->size, _("Font size (px)"));
         gtk_widget_set_size_request(fsel->size, 90, -1);
         g_signal_connect (G_OBJECT(fsel->size), "changed", G_CALLBACK (sp_font_selector_size_changed), fsel);
@@ -216,9 +226,13 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         gtk_box_pack_end(GTK_BOX (hb), l, FALSE, FALSE, 0);
 
         for (unsigned int n = 0; sizes[n]; ++n)
-            {
-                gtk_combo_box_append_text (GTK_COMBO_BOX(fsel->size), sizes[n]);
-            }
+        {
+#if GTK_CHECK_VERSION(2, 24,0)
+            gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fsel->size), sizes[n]);
+#else
+            gtk_combo_box_append_text (GTK_COMBO_BOX(fsel->size), sizes[n]);
+#endif
+        }
 
         gtk_widget_show_all (fsel->size);
 
@@ -304,7 +318,12 @@ static void sp_font_selector_style_select_row (GtkTreeSelection *selection,
 
 static void sp_font_selector_size_changed( GtkComboBox */*cbox*/, SPFontSelector *fsel )
 {
-    char *text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (fsel->size));
+    char *text = NULL;
+#if GTK_CHECK_VERSION(2, 24,0)
+    text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (fsel->size));
+#else
+    text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (fsel->size));
+#endif
     gfloat old_size = fsel->fontsize;
 
     gchar *endptr;
@@ -375,7 +394,7 @@ static void sp_font_selector_emit_set (SPFontSelector *fsel)
             fsel->font->Unref();
         }
         fsel->font = font;
-        gtk_signal_emit(GTK_OBJECT(fsel), fs_signals[FONT_SET], fsel->font);
+        g_signal_emit(GTK_OBJECT(fsel), fs_signals[FONT_SET], 0, fsel->font);
     }
     fsel->fontsize_dirty = false;
     if (font) {
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 047083b43..17a33affe 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -347,7 +347,7 @@ void sp_color_slider_set_adjustment(SPColorSlider *slider, GtkAdjustment *adjust
 		}
 
 		slider->adjustment = adjustment;
-		gtk_object_ref (GTK_OBJECT (adjustment));
+		g_object_ref (adjustment);
 		g_object_ref_sink (adjustment);
 
 		g_signal_connect (G_OBJECT (adjustment), "changed",