quick-lounge-applet r237 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Mon Feb  2 11:11:10 2009
New Revision: 237
URL: http://svn.gnome.org/viewvc/quick-lounge-applet?rev=237&view=rev

Log:
2009-02-02  Paolo Bacchilega  <paobac svn gnome org>

	* src/quick-box.h: 
	* src/quick-box.c: use the new tooltip api.


Modified:
   trunk/ChangeLog
   trunk/src/quick-box.c
   trunk/src/quick-box.h

Modified: trunk/src/quick-box.c
==============================================================================
--- trunk/src/quick-box.c	(original)
+++ trunk/src/quick-box.c	Mon Feb  2 11:11:10 2009
@@ -914,9 +914,6 @@
   
 	quick_box = QUICK_BOX (object);
 
-	if (quick_box->tooltips != NULL) 
-                g_object_unref (quick_box->tooltips);
-
 	g_free (quick_box->priv->col_size);
 	g_free (quick_box->priv->buttons_on_col);
 	g_object_unref (quick_box->priv->icon_theme);
@@ -1091,7 +1088,8 @@
 			gpointer          data)
 {
 	QuickBox *quick_box = data;
-	gtk_tooltips_disable (quick_box->tooltips);
+	
+	gtk_widget_set_has_tooltip (GTK_WIDGET (quick_box), FALSE);
 }
 
 
@@ -1101,7 +1099,8 @@
 		      gpointer          data)
 {
 	QuickBox *quick_box = data;
-	gtk_tooltips_enable (quick_box->tooltips);
+	
+	gtk_widget_set_has_tooltip (GTK_WIDGET (quick_box), TRUE);
 }
 
 
@@ -1213,10 +1212,8 @@
 			tip = g_strdup (comment);
 		else
 			tip = g_strdup (name);
-		gtk_tooltips_set_tip (quick_box->tooltips, 
-				      GTK_WIDGET (item),
-				      tip,
-				      NULL);	
+		gtk_widget_set_tooltip_text  (GTK_WIDGET (quick_box), tip);
+		
 		/**/
 
 		if (quick_box->priv->orient == PANEL_APPLET_ORIENT_UP)
@@ -1270,10 +1267,7 @@
 		return;
 	}
 
-	gtk_tooltips_set_tip (quick_box->tooltips, 
-			      get_arrow_widget (quick_box),
-			      _("Hide launchers menu"),
-			      NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (get_arrow_widget (quick_box)), _("Hide launchers menu"));
 
 	g_signal_connect_swapped (G_OBJECT (popup_menu),
 				  "deactivate",
@@ -1313,10 +1307,7 @@
 					 quick_box);
 	
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (arrow), FALSE);
-	gtk_tooltips_set_tip (quick_box->tooltips, 
-			      arrow,
-			      _("Show hidden launchers"),
-			      NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (arrow), _("Show hidden launchers"));
 	
 	g_signal_handlers_unblock_by_func (G_OBJECT (arrow),
 					   G_CALLBACK (arrow_button_toggled),
@@ -1353,10 +1344,7 @@
 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 	gtk_widget_set_parent (button, GTK_WIDGET (quick_box));
 
-	gtk_tooltips_set_tip (quick_box->tooltips, 
-			      button,
-			      _("Show hidden launchers"),
-			      NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Show hidden launchers"));
 	g_signal_connect (G_OBJECT (button), 
 			  "button_press_event",
 			  G_CALLBACK (arrow_button_do_not_eat_button_press), 
@@ -1397,17 +1385,12 @@
 	priv->populate_menu_func = NULL;
 	priv->populate_menu_data = NULL;
 
-	quick_box->tooltips = gtk_tooltips_new ();
-	g_object_ref (quick_box->tooltips);
-	gtk_object_sink (GTK_OBJECT (quick_box->tooltips));
-
 	priv->arrow_up    = create_arrow_button (quick_box, GTK_ARROW_UP);
 	priv->arrow_down  = create_arrow_button (quick_box, GTK_ARROW_DOWN);
 	priv->arrow_left  = create_arrow_button (quick_box, GTK_ARROW_LEFT);
 	priv->arrow_right = create_arrow_button (quick_box, GTK_ARROW_RIGHT);
 }
 
-
 
 GType
 quick_box_get_type ()
@@ -1653,10 +1636,7 @@
 			   ((comment != NULL) && (*comment != 0)) ? "\n" : NULL,
 			   ((comment != NULL) && (*comment != 0)) ? comment: NULL,
 			   NULL);
-	gtk_tooltips_set_tip (quick_box->tooltips, 
-			      button,
-			      tip,
-			      NULL);
+	gtk_widget_set_tooltip_text (button, tip);
 	
 	g_free (tip);
 	g_free (comment);
@@ -1950,11 +1930,8 @@
 			   ((comment != NULL) && (*comment != 0)) ? "\n" : NULL, 
 			   comment, 
 			   NULL);
-	gtk_tooltips_set_tip (quick_box->tooltips, 
-			      GTK_WIDGET (quick_button),
-			      tip,
-			      NULL);
-	
+	gtk_widget_set_tooltip_text (GTK_WIDGET (quick_button), tip);
+
 	g_free (tip);
 	g_free (comment);
 	g_free (name);

Modified: trunk/src/quick-box.h
==============================================================================
--- trunk/src/quick-box.h	(original)
+++ trunk/src/quick-box.h	Mon Feb  2 11:11:10 2009
@@ -42,7 +42,6 @@
 
 struct _QuickBox {
 	GtkBox __parent;
-	GtkTooltips     *tooltips;
 	QuickBoxPrivate *priv;
 };