[goobox] removed use of GtkTooltips

[Paolo Bacchilega <paobac src gnome org>]

commit d01c3182ab5550e4501b2539d31473ff31d43e0d
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Jul 15 09:25:28 2010 +0200

    removed use of GtkTooltips

 src/goo-player-info.c        |   13 ++---------
 src/goo-volume-tool-button.c |   46 +++++++----------------------------------
 src/goo-window.c             |    4 ---
 3 files changed, 11 insertions(+), 52 deletions(-)
---
diff --git a/src/goo-player-info.c b/src/goo-player-info.c
index 38b32c5..25fc3bd 100644
--- a/src/goo-player-info.c
+++ b/src/goo-player-info.c
@@ -58,7 +58,6 @@ struct _GooPlayerInfoPrivateData {
 	GtkWidget   *cover_button;
 	GtkWidget   *status_image;
 	GtkWidget   *notebook;
-	GtkTooltips *tips;
 	char        *current_time;
 	char        *total_time;
 	char         time[64];
@@ -360,10 +359,6 @@ goo_player_info_construct (GooPlayerInfo *info)
 	GTK_BOX (info)->spacing = SPACING;
 	GTK_BOX (info)->homogeneous = FALSE;
 
-	priv->tips = gtk_tooltips_new ();
-	gtk_object_ref (GTK_OBJECT (priv->tips));
-	gtk_object_sink (GTK_OBJECT (priv->tips));
-
 	/* Title and Artist */
 
 	priv->title1_label = gtk_label_new (NULL);
@@ -418,10 +413,9 @@ goo_player_info_construct (GooPlayerInfo *info)
 		gtk_button_set_relief (GTK_BUTTON (priv->cover_button),
 				       GTK_RELIEF_NONE);
 
-		gtk_tooltips_set_tip (priv->tips,
-				      GTK_WIDGET (priv->cover_button),
-				      _("Click here to choose a cover for this CD"),
-				      NULL);
+		gtk_widget_set_tooltip_text (GTK_WIDGET (priv->cover_button),
+					     _("Click here to choose a cover for this CD"));
+
 		g_signal_connect (G_OBJECT (priv->cover_button),
 				  "clicked",
 				  G_CALLBACK (cover_button_clicked_cb),
@@ -529,7 +523,6 @@ goo_player_info_finalize (GObject *object)
 			g_source_remove (info->priv->update_id);
 			info->priv->update_id = 0;
 		}
-		gtk_object_unref (GTK_OBJECT (info->priv->tips));
 		info->priv = NULL;
 	}
 
diff --git a/src/goo-volume-tool-button.c b/src/goo-volume-tool-button.c
index 2341fd4..2f7e3dd 100644
--- a/src/goo-volume-tool-button.c
+++ b/src/goo-volume-tool-button.c
@@ -62,7 +62,6 @@ struct _GooVolumeToolButtonPrivate {
 	GtkWidget   *popup_win;
 	GtkWidget   *volume_scale;
 	GtkWidget   *volume_label;
-	GtkTooltips *tips;
 	double       value;
 	double       from_value;
 	double       to_value;
@@ -90,23 +89,6 @@ static guint goo_volume_tool_button_signals[LAST_SIGNAL] = { 0 };
 G_DEFINE_TYPE (GooVolumeToolButton, goo_volume_tool_button, GTK_TYPE_TOOL_BUTTON)
 
 
-static gboolean
-goo_volume_tool_button_set_tooltip (GtkToolItem *tool_item,
-				    GtkTooltips *tooltips,
-				    const char  *tip_text,
-				    const char  *tip_private)
-{
-	GooVolumeToolButton *button;
-
-	g_return_val_if_fail (GOO_IS_VOLUME_TOOL_BUTTON (tool_item), FALSE);
-
-	button = GOO_VOLUME_TOOL_BUTTON (tool_item);
-	/* gtk_tooltips_set_tip (tooltips, button->priv->button, tip_text, tip_private);*/
-	
-	return TRUE;
-}
-
-
 static void
 goo_volume_tool_button_construct_contents (GooVolumeToolButton *button)
 {
@@ -180,10 +162,8 @@ update_volume_label (GooVolumeToolButton *button)
 	g_free (text);
 
 	text = g_strdup_printf (_("Volume level: %3.0f%%"), value * 100.0);
-	gtk_tooltips_set_tip (button->priv->tips,
-			      button->priv->button,
-			      text,
-			      NULL);
+	gtk_widget_set_tooltip_text (button->priv->button, text);
+
 	g_free (text);
 }
 
@@ -215,7 +195,6 @@ goo_volume_tool_button_finalize (GObject *object)
 	GooVolumeToolButton *button;
 
 	button = GOO_VOLUME_TOOL_BUTTON (object);
-	gtk_object_unref (GTK_OBJECT (button->priv->tips));
 	G_OBJECT_CLASS (goo_volume_tool_button_parent_class)->finalize (object);
 }
 
@@ -223,15 +202,8 @@ goo_volume_tool_button_finalize (GObject *object)
 static void
 goo_volume_tool_button_class_init (GooVolumeToolButtonClass *klass)
 {
-	GObjectClass       *object_class;
-	GtkToolItemClass   *toolitem_class;
-	GtkToolButtonClass *toolbutton_class;
-	GtkWidgetClass     *gtkwidget_class;
-	
-	object_class = (GObjectClass *) klass;
-	toolitem_class = (GtkToolItemClass *) klass;
-	toolbutton_class = (GtkToolButtonClass *) klass;
-	gtkwidget_class = (GtkWidgetClass *) klass;
+	GObjectClass     *object_class;
+	GtkToolItemClass *toolitem_class;
 
 	goo_volume_tool_button_signals[CHANGED] =
                 g_signal_new ("changed",
@@ -243,8 +215,10 @@ goo_volume_tool_button_class_init (GooVolumeToolButtonClass *klass)
 			      G_TYPE_NONE, 
 			      0);
 
+	object_class = (GObjectClass *) klass;
 	object_class->finalize = goo_volume_tool_button_finalize;
-	toolitem_class->set_tooltip = goo_volume_tool_button_set_tooltip;
+
+	toolitem_class = (GtkToolItemClass *) klass;
 	toolitem_class->toolbar_reconfigured = goo_volume_tool_button_toolbar_reconfigured;
 	
 	g_type_class_add_private (object_class, sizeof (GooVolumeToolButtonPrivate));
@@ -644,10 +618,6 @@ goo_volume_button_construct (GooVolumeToolButton *button)
 	GtkWidget *up_button;
 	GtkWidget *down_button;
 	
-	button->priv->tips = gtk_tooltips_new ();
-	gtk_object_ref (GTK_OBJECT (button->priv->tips));
-	gtk_object_sink (GTK_OBJECT (button->priv->tips));
-
 	/* Create the popup window. */
 
 	button->priv->popup_win = gtk_window_new (GTK_WINDOW_POPUP);
@@ -759,7 +729,7 @@ goo_volume_button_construct (GooVolumeToolButton *button)
 	gtk_container_add (GTK_CONTAINER (arrow_button), arrow);
 	gtk_box_pack_end (GTK_BOX (box), arrow_button,
 			  FALSE, FALSE, 0);
-	gtk_tooltips_set_tip (button->priv->tips, arrow_button, _("Change the volume level"), NULL);
+	gtk_widget_set_tooltip_text (arrow_button, _("Change the volume level"));
 
 	gtk_widget_show_all (box);
 	gtk_widget_hide (button->priv->volume_label);
diff --git a/src/goo-window.c b/src/goo-window.c
index b1a719d..d0dd7af 100644
--- a/src/goo-window.c
+++ b/src/goo-window.c
@@ -89,7 +89,6 @@ struct _GooWindowPrivate {
 	GtkStatusIcon     *status_icon;
 	GtkWidget         *status_tooltip_content;
 
-	GtkTooltips       *tooltips;
 	guint              help_message_cid;
 	guint              list_info_cid;
 	guint              progress_cid;
@@ -473,7 +472,6 @@ goo_window_finalize (GObject *object)
 
 		/**/
 
-		gtk_object_destroy (GTK_OBJECT (window->priv->tooltips));
 		g_object_unref (window->priv->list_store);
 		
 		if (window->priv->next_timeout_handle != 0) {
@@ -2277,8 +2275,6 @@ goo_window_construct (GooWindow    *window,
 
 	/* Create the widgets. */
 
-	window->priv->tooltips = gtk_tooltips_new ();
-
 	/* * File list. */
 
 	window->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS,