Replace use of deprecated GtkTooltips API

Fixed bugs:
  - https://launchpad.net/bugs/793086

(bzr r10256.1.1)

3 files changed, 8 insertions, 39 deletions

diff --git a/src/libgdl/gdl-dock-bar.c b/src/libgdl/gdl-dock-bar.c
index c4882e7ad..37710b693 100644
--- a/src/libgdl/gdl-dock-bar.c
+++ b/src/libgdl/gdl-dock-bar.c
@@ -65,7 +65,6 @@ static void gdl_dock_bar_remove_item      (GdlDockBar      *dockbar,
 struct _GdlDockBarPrivate {
     GdlDockMaster   *master;
     GSList          *items;
-    GtkTooltips     *tooltips;
     GtkOrientation   orientation;
     GdlDockBarStyle  dockbar_style;
 };
@@ -130,11 +129,8 @@ gdl_dock_bar_instance_init (GdlDockBar *dockbar)
     dockbar->_priv = g_new0 (GdlDockBarPrivate, 1);
     dockbar->_priv->master = NULL;
     dockbar->_priv->items = NULL;
-    dockbar->_priv->tooltips = gtk_tooltips_new ();
     dockbar->_priv->orientation = GTK_ORIENTATION_VERTICAL;
     dockbar->_priv->dockbar_style = GDL_DOCK_BAR_BOTH;
-    g_object_ref (dockbar->_priv->tooltips);
-    gtk_object_sink (GTK_OBJECT (dockbar->_priv->tooltips));
 }
 
 static void
@@ -208,11 +204,6 @@ gdl_dock_bar_destroy (GtkObject *object)
             priv->master = NULL;
         }
 
-        if (priv->tooltips) {
-            g_object_unref (priv->tooltips);
-            priv->tooltips = NULL;
-        }
-        
         dockbar->_priv = NULL;
 
         g_free (priv);
@@ -334,7 +325,7 @@ gdl_dock_bar_add_item (GdlDockBar  *dockbar,
     gtk_container_add (GTK_CONTAINER (button), box);
     gtk_box_pack_start (GTK_BOX (dockbar), button, FALSE, FALSE, 0);
 
-    gtk_tooltips_set_tip (priv->tooltips, button, name, name);
+    gtk_widget_set_tooltip_text (button, name);
     g_free (name);
 
     g_object_set_data (G_OBJECT (item), "GdlDockBar", dockbar);
diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c
index 6457016de..de09fc150 100644
--- a/src/libgdl/gdl-dock-item-grip.c
+++ b/src/libgdl/gdl-dock-item-grip.c
@@ -33,7 +33,6 @@ enum {
 struct _GdlDockItemGripPrivate {
     GtkWidget   *close_button;
     GtkWidget   *iconify_button;
-    GtkTooltips *tooltips;
 
     gboolean     icon_pixbuf_valid;
     GdkPixbuf   *icon_pixbuf;
@@ -264,11 +263,6 @@ gdl_dock_item_grip_destroy (GtkObject *object)
             priv->icon_pixbuf = NULL;
         }
 
-        if (priv->tooltips) {
-            g_object_unref (priv->tooltips);
-            priv->tooltips = NULL;
-        }
-
         if (grip->item)
             g_signal_handlers_disconnect_by_func (grip->item,
                                                   gdl_dock_item_grip_item_notify,
@@ -386,13 +380,10 @@ gdl_dock_item_grip_instance_init (GdlDockItemGrip *grip)
     g_signal_connect (G_OBJECT (grip->_priv->iconify_button), "clicked",
                       G_CALLBACK (gdl_dock_item_grip_iconify_clicked), grip);
 
-    grip->_priv->tooltips = gtk_tooltips_new ();
-    g_object_ref (grip->_priv->tooltips);
-    gtk_object_sink (GTK_OBJECT (grip->_priv->tooltips));
-    gtk_tooltips_set_tip (grip->_priv->tooltips, grip->_priv->iconify_button,
-                          _("Iconify"), _("Iconify this dock"));
-    gtk_tooltips_set_tip (grip->_priv->tooltips, grip->_priv->close_button,
-                          _("Close"), _("Close this dock"));
+    gtk_widget_set_tooltip_text (grip->_priv->iconify_button,
+                          _("Iconify"));
+    gtk_widget_set_tooltip_text (grip->_priv->close_button,
+                          _("Close"));
 }
 
 static void
diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c
index c5e139e70..aaddc6d80 100644
--- a/src/libgdl/gdl-switcher.c
+++ b/src/libgdl/gdl-switcher.c
@@ -74,7 +74,6 @@ typedef struct {
     GtkWidget *icon;
     GtkWidget *arrow;
     GtkWidget *hbox;
-    GtkTooltips *tooltips;
     int id;
 } Button;
 
@@ -103,7 +102,7 @@ GDL_CLASS_BOILERPLATE (GdlSwitcher, gdl_switcher, GtkNotebook, GTK_TYPE_NOTEBOOK
 
 static Button *
 button_new (GtkWidget *button_widget, GtkWidget *label, GtkWidget *icon,
-            GtkTooltips *tooltips, GtkWidget *arrow, GtkWidget *hbox, int id)
+            GtkWidget *arrow, GtkWidget *hbox, int id)
 {
     Button *button = g_new (Button, 1);
 
@@ -112,7 +111,6 @@ button_new (GtkWidget *button_widget, GtkWidget *label, GtkWidget *icon,
     button->icon = icon;
     button->arrow = arrow;
     button->hbox = hbox;
-    button->tooltips = tooltips;
     button->id = id;
 
     g_object_ref (button_widget);
@@ -120,7 +118,6 @@ button_new (GtkWidget *button_widget, GtkWidget *label, GtkWidget *icon,
     g_object_ref (icon);
     g_object_ref (arrow);
     g_object_ref (hbox);
-    g_object_ref (tooltips);
 
     return button;
 }
@@ -132,7 +129,6 @@ button_free (Button *button)
     g_object_unref (button->label);
     g_object_unref (button->icon);
     g_object_unref (button->hbox);
-    g_object_unref (button->tooltips);
     g_free (button);
 }
 
@@ -750,7 +746,6 @@ gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
     GtkWidget *icon_widget;
     GtkWidget *label_widget;
     GtkWidget *arrow;
-    GtkTooltips *button_tooltips;
     
     button_widget = gtk_toggle_button_new ();
     if (switcher->priv->show)
@@ -781,24 +776,19 @@ gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
     }
     gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
     gtk_widget_show (label_widget);
-    button_tooltips = gtk_tooltips_new();
-    gtk_tooltips_set_tip (GTK_TOOLTIPS (button_tooltips), button_widget,
-                          tooltips, NULL);        
+    gtk_widget_set_tooltip_text (button_widget, tooltips);        
 
     switch (INTERNAL_MODE (switcher)) {
     case GDL_SWITCHER_STYLE_TEXT:
         gtk_box_pack_start (GTK_BOX (hbox), label_widget, TRUE, TRUE, 0);
-        gtk_tooltips_disable (button_tooltips);
         break;
     case GDL_SWITCHER_STYLE_ICON:
         gtk_box_pack_start (GTK_BOX (hbox), icon_widget, TRUE, TRUE, 0);
-        gtk_tooltips_enable (button_tooltips);
         break;
     case GDL_SWITCHER_STYLE_BOTH:
     default:
         gtk_box_pack_start (GTK_BOX (hbox), icon_widget, FALSE, TRUE, 0);
         gtk_box_pack_start (GTK_BOX (hbox), label_widget, TRUE, TRUE, 0);
-        gtk_tooltips_disable (button_tooltips);
         break;
     }
     arrow = gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE);
@@ -808,7 +798,7 @@ gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
     switcher->priv->buttons =
         g_slist_append (switcher->priv->buttons,
                         button_new (button_widget, label_widget,
-                                    icon_widget, button_tooltips,
+                                    icon_widget, 
                                     arrow, hbox, switcher_id));
     gtk_widget_set_parent (button_widget, GTK_WIDGET (switcher));
 
@@ -901,7 +891,6 @@ set_switcher_style_internal (GdlSwitcher *switcher,
                 gtk_box_pack_start (GTK_BOX (button->hbox), button->label,
                                     TRUE, TRUE, 0);
                 gtk_widget_show (button->label);
-                gtk_tooltips_disable (button->tooltips);
             }
             break;
         case GDL_SWITCHER_STYLE_ICON:
@@ -914,7 +903,6 @@ set_switcher_style_internal (GdlSwitcher *switcher,
             } else
                 gtk_container_child_set (GTK_CONTAINER (button->hbox),
                                          button->icon, "expand", TRUE, NULL);
-            gtk_tooltips_enable (button->tooltips);
             break;
         case GDL_SWITCHER_STYLE_BOTH:
             if (INTERNAL_MODE (switcher)
@@ -929,7 +917,6 @@ set_switcher_style_internal (GdlSwitcher *switcher,
                                          button->icon, "expand", FALSE, NULL);
             }
 
-            gtk_tooltips_disable (button->tooltips);
             gtk_box_pack_start (GTK_BOX (button->hbox), button->label, TRUE,
                                 TRUE, 0);
             gtk_widget_show (button->label);