** Fix for bug #542889

2008-17-14  Paolo Borelli  <pborelli@katamail.com>

	** Fix for bug #542889

	Port to the new gtk tooltip api.


svn path=/trunk/; revision=35744

4 files changed, 14 insertions, 18 deletions

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 57696e0e68..3649c5b274 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,12 @@
+2008-17-14  Paolo Borelli  <pborelli@katamail.com>
+
+	** Fix for bug #542889
+
+	* e-search-bar.h:
+	* widgets/misc/e-search-bar.c:
+	* widgets/misc/e-task-widget.c:
+	Port to the new gtk tooltip api.
+
 2008-07-12  Paolo Borelli  <pborelli@katamail.com>
 
 	** Fix for bug #542631
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 2c18e3ce0d..ffef719f17 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -339,8 +339,9 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb)
 		}
 
 		t = g_strdup_printf ("%s: %s\n%s", _("Search"), text, _("Click here to change the search type"));
-		gtk_tooltips_set_tip (esb->tooltips, esb->option_button, t, "Search type");
+		gtk_widget_set_tooltip_text (esb->option_button, t);
 		g_free (t);
+
 		gtk_widget_set_sensitive (esb->clear_button, FALSE);
 	}
 
@@ -474,7 +475,7 @@ option_activated_cb (GtkWidget *widget,
 		else
 			t = g_strdup_printf ("%s: %s", _("Search"), _("Click here to change the search type"));
 
-		gtk_tooltips_set_tip (esb->tooltips, esb->option_button, t, "Search type");
+		gtk_widget_set_tooltip_text (esb->option_button, t);
 		g_free (t);
 	}
 
@@ -934,7 +935,6 @@ init (ESearchBar *esb)
 	esb->scopeoption      = NULL;
 	esb->scopeoption_box  = NULL;
 
-	esb->tooltips         = NULL;
 	esb->pending_activate = 0;
 
 	esb->item_id          = 0;
@@ -970,8 +970,6 @@ e_search_bar_construct (ESearchBar *search_bar,
 
 	gtk_box_set_homogeneous (GTK_BOX (search_bar), FALSE);
 
-	search_bar->tooltips = gtk_tooltips_new ();
-
 	bighbox = gtk_hbox_new (FALSE, 0);
 	search_bar->entry_box = gtk_hbox_new (0, FALSE);
 	search_bar->icon_entry = e_icon_entry_new ();
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index ec9f24e11c..f4a8ec93c2 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -94,7 +94,7 @@ struct _ESearchBar
 	GtkWidget *scopeoption_menu;
 
 	guint      pending_activate;
-	GtkTooltips *tooltips;
+
 	/* The currently-selected item & subitem */
 	int        item_id;
 	int        viewitem_id; /* Current View Id */
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index c0043ce88b..74b0ba6891 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -36,8 +36,6 @@
 struct _ETaskWidgetPrivate {
 	char *component_id;
 
-	GtkTooltips *tooltips;
-
 	GdkPixbuf *icon_pixbuf;
 	GtkWidget *label;
 	GtkWidget *box;
@@ -61,11 +59,6 @@ impl_dispose (GObject *object)
 
 	priv = task_widget->priv;
 
-	if (priv->tooltips != NULL) {
-		g_object_unref (priv->tooltips);
-		priv->tooltips = NULL;
-	}
-
 	if (priv->icon_pixbuf != NULL) {
 		g_object_unref (priv->icon_pixbuf);
 		priv->icon_pixbuf = NULL;
@@ -107,7 +100,6 @@ e_task_widget_init (ETaskWidget *task_widget)
 	priv = g_new (ETaskWidgetPrivate, 1);
 
 	priv->component_id = NULL;
-	priv->tooltips     = NULL;
 	priv->icon_pixbuf  = NULL;
 	priv->label        = NULL;
 	priv->image        = NULL;
@@ -213,9 +205,6 @@ e_task_widget_construct (ETaskWidget *task_widget,
 
 	}
 
-	priv->tooltips = gtk_tooltips_new ();
-	g_object_ref_sink (priv->tooltips);
-
 	e_task_widget_update (task_widget, information, -1.0);
 }
 
@@ -297,7 +286,7 @@ e_task_widget_update (ETaskWidget *task_widget,
 
 	gtk_label_set_text (GTK_LABEL (priv->label), text);
 
-	gtk_tooltips_set_tip (priv->tooltips, GTK_WIDGET (task_widget), text, NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (task_widget), text);
 
 	g_free (text);
 }