Index: src/gui/main.cpp
===================================================================
--- src/gui/main.cpp	(révision 5762)
+++ src/gui/main.cpp	(copie de travail)
@@ -112,7 +112,6 @@
   GtkWidget *video_settings_frame;
   GtkWidget *video_settings_window;
   
-  GtkTooltips *tips;
   GtkAccelGroup *accel;
 
   GtkWidget *main_menu;
@@ -850,8 +849,7 @@
   
   gtk_widget_show (GTK_WIDGET (item));
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (item), 
-			     mw->tips, _("Find Contacts"), NULL);
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), _("Find Contacts"));
 
   gtk_frontend = dynamic_cast<GtkFrontend *>(services->get ("gtk-frontend"));
   g_signal_connect_swapped (G_OBJECT (button), "clicked",
@@ -873,8 +871,8 @@
   
     gtk_widget_show (GTK_WIDGET (item));
     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-    gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (item), 
-			       mw->tips, _("Add contact to roster"), NULL);
+    gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), 
+			       _("Add contact to roster"));
     g_signal_connect (G_OBJECT (button), "clicked",
 		      GTK_SIGNAL_FUNC (pull_trigger_cb),
 		      (gpointer)trigger);
@@ -1026,8 +1024,8 @@
   gtk_container_set_border_width (GTK_CONTAINER (mw->connect_button), 2);
   gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), FALSE);
 
-  gtk_tooltips_set_tip (mw->tips, GTK_WIDGET (mw->connect_button), 
-			_("Enter a URI on the left, and click this button to place a call"), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (mw->connect_button), 
+			_("Enter a URI on the left, and click this button to place a call"));
   
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
@@ -1481,8 +1479,8 @@
   gtk_box_pack_start (GTK_BOX (hbox), hscale_brightness, TRUE, TRUE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 3);
 
-  gtk_tooltips_set_tip (mw->tips, hscale_brightness,
-			_("Adjust brightness"), NULL);
+  gtk_widget_set_tooltip_text (hscale_brightness,
+			_("Adjust brightness"));
 
   g_signal_connect (G_OBJECT (mw->adj_brightness), "value-changed",
 		    G_CALLBACK (video_settings_changed_cb), 
@@ -1503,8 +1501,8 @@
   gtk_box_pack_start (GTK_BOX (hbox), hscale_whiteness, TRUE, TRUE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 3);
 
-  gtk_tooltips_set_tip (mw->tips, hscale_whiteness,
-			_("Adjust whiteness"), NULL);
+  gtk_widget_set_tooltip_text (hscale_whiteness,
+			_("Adjust whiteness"));
 
   g_signal_connect (G_OBJECT (mw->adj_whiteness), "value-changed",
 		    G_CALLBACK (video_settings_changed_cb), 
@@ -1525,8 +1523,8 @@
   gtk_box_pack_start (GTK_BOX (hbox), hscale_colour, TRUE, TRUE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 3);
 
-  gtk_tooltips_set_tip (mw->tips, hscale_colour,
-			_("Adjust color"), NULL);
+  gtk_widget_set_tooltip_text (hscale_colour,
+			_("Adjust color"));
 
   g_signal_connect (G_OBJECT (mw->adj_colour), "value-changed",
 		    G_CALLBACK (video_settings_changed_cb), 
@@ -1547,8 +1545,8 @@
   gtk_box_pack_start (GTK_BOX (hbox), hscale_contrast, TRUE, TRUE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 3);
 
-  gtk_tooltips_set_tip (mw->tips, hscale_contrast,
-			_("Adjust contrast"), NULL);
+  gtk_widget_set_tooltip_text (hscale_contrast,
+			_("Adjust contrast"));
 
   g_signal_connect (G_OBJECT (mw->adj_contrast), "value-changed",
 		    G_CALLBACK (video_settings_changed_cb), 
@@ -1795,9 +1793,8 @@
   gtk_widget_show (button);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), 
 		      GTK_TOOL_ITEM (item), -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (item), mw->tips,
-			     _("Change the volume of your soundcard"), 
-			     NULL);
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
+			     _("Change the volume of your soundcard"));
 
   gtk_widget_set_size_request (GTK_WIDGET (button), 28, 28);
 
@@ -1818,9 +1815,8 @@
   gtk_widget_show (button);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), 
 		      GTK_TOOL_ITEM (item), -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (item), mw->tips,
-			     _("Change the color settings of your video device"), 
-			     NULL);
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
+			     _("Change the color settings of your video device"));
 
   g_signal_connect (G_OBJECT (button), "clicked",
 		    G_CALLBACK (show_window_cb),
@@ -1839,9 +1835,8 @@
   gtk_widget_show (mw->preview_button);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), 
 		      GTK_TOOL_ITEM (item), -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (item), mw->tips,
-			     _("Display images from your camera device"), 
-			     NULL);
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
+			     _("Display images from your camera device"));
 
   g_signal_connect (G_OBJECT (mw->preview_button), "toggled",
 		    G_CALLBACK (toolbar_toggle_button_changed_cb),
@@ -1860,8 +1855,8 @@
   gtk_widget_show (mw->hold_button);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), 
 		      GTK_TOOL_ITEM (item), -1);
-  gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (item), mw->tips,
-                             _("Hold the current call"), NULL);
+  gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
+                             _("Hold the current call"));
   gtk_widget_set_sensitive (GTK_WIDGET (mw->hold_button), FALSE);
 
   g_signal_connect (G_OBJECT (mw->hold_button), "clicked",
@@ -1955,8 +1950,8 @@
   mw = gm_mw_get_mw (main_window);
 
   gdk_threads_enter ();
-  gtk_tooltips_set_tip (mw->tips, mw->statusbar_ebox,
-                        (gchar *) data, NULL);
+  gtk_widget_set_tooltip_text (mw->statusbar_ebox,
+                        (gchar *) data);
   g_free ((gchar *) data);
   gdk_threads_leave ();
 
@@ -2481,7 +2476,7 @@
 
   tip_text = gtk_entry_get_text (GTK_ENTRY (e));
 
-  gtk_tooltips_set_tip (mw->tips, GTK_WIDGET (e), tip_text, NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (e), tip_text);
 }
 
 
@@ -3660,7 +3655,6 @@
 #endif
   
   /* Tooltips and accelerators */
-  mw->tips = gtk_tooltips_new ();
   mw->accel = gtk_accel_group_new ();
   gtk_window_add_accel_group (GTK_WINDOW (window), mw->accel);
 
@@ -4075,8 +4069,8 @@
   if (mw->statusbar_ebox) {
 
 #ifndef WIN32
-    gtk_tooltips_set_tip (mw->tips, GTK_WIDGET (mw->statusbar_ebox), 
-                          stats_msg, NULL);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (mw->statusbar_ebox), 
+                          stats_msg);
 #else
     g_idle_add (thread_safe_set_stats_tooltip, g_strdup (stats_msg));
 #endif
Index: lib/gui/gmpreferences.c
===================================================================
--- lib/gui/gmpreferences.c	(révision 5762)
+++ lib/gui/gmpreferences.c	(copie de travail)
@@ -57,7 +57,6 @@
   GtkWidget *section_label;
   GtkWidget *sections_tree_view;
   GtkTreeIter iter;
-  GtkTooltips *tips;
   int last_page;
   
 } GnomePrefsWindow;
@@ -188,7 +187,7 @@
 
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && tooltip)
-    gtk_tooltips_set_tip (gpw->tips, entry, tooltip, NULL);
+    gtk_widget_set_tooltip_text (entry, tooltip);
 
   gtk_widget_show_all (table);
   
@@ -230,7 +229,7 @@
 
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && tooltip)
-    gtk_tooltips_set_tip (gpw->tips, toggle, tooltip, NULL);
+    gtk_widget_set_tooltip_text (toggle, tooltip);
 
   g_signal_connect (G_OBJECT (toggle), "toggled",
 		    G_CALLBACK (toggle_changed), (gpointer) conf_key);
@@ -307,7 +306,7 @@
 
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && tooltip)
-    gtk_tooltips_set_tip (gpw->tips, hscale, tooltip, NULL);
+    gtk_widget_set_tooltip_text (hscale, tooltip);
 
   g_signal_connect (G_OBJECT (adj), "value-changed",
 		    G_CALLBACK (adjustment_changed),
@@ -403,7 +402,7 @@
 
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && tooltip)
-    gtk_tooltips_set_tip (gpw->tips, spin_button, tooltip, NULL);
+    gtk_widget_set_tooltip_text (spin_button, tooltip);
 
   g_signal_connect (G_OBJECT (adj), "value-changed",
 		    G_CALLBACK (adjustment_changed),
@@ -495,8 +494,8 @@
 
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && spin1_tooltip && spin2_tooltip) {
-    gtk_tooltips_set_tip (gpw->tips, spin_button1, spin1_tooltip, NULL);
-    gtk_tooltips_set_tip (gpw->tips, spin_button2, spin2_tooltip, NULL);
+    gtk_widget_set_tooltip_text (spin_button1, spin1_tooltip);
+    gtk_widget_set_tooltip_text (spin_button2, spin2_tooltip);
   }
   
 
@@ -570,7 +569,7 @@
 
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && tooltip)
-    gtk_tooltips_set_tip (gpw->tips, combo_box, tooltip, NULL);
+    gtk_widget_set_tooltip_text (combo_box, tooltip);
 
   g_signal_connect (GTK_COMBO_BOX (combo_box), 
 		    "changed", G_CALLBACK (int_option_menu_changed),
@@ -667,7 +666,7 @@
                                                                                
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (table), "gpw");
   if (gpw && tooltip)
-    gtk_tooltips_set_tip (gpw->tips, option_menu, tooltip, NULL);
+    gtk_widget_set_tooltip_text (option_menu, tooltip);
 
   g_signal_connect (GTK_COMBO_BOX (option_menu), 
 		    "changed", G_CALLBACK (string_option_menu_changed),
@@ -861,10 +860,6 @@
   gtk_container_add (GTK_CONTAINER (dialog_vbox), hbox);
 
 
-  /* The tooltips */
-  gpw->tips = gtk_tooltips_new ();
-
-
   /* Build the TreeView on the left */
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
Index: lib/engine/gui/gtk-frontend/addressbook-window.cpp
===================================================================
--- lib/engine/gui/gtk-frontend/addressbook-window.cpp	(révision 5762)
+++ lib/engine/gui/gtk-frontend/addressbook-window.cpp	(copie de travail)
@@ -345,7 +345,7 @@
   else {
 
     gtk_widget_set_sensitive (self->priv->menu_item_view, FALSE);
-    gtk_menu_item_remove_submenu (GTK_MENU_ITEM (self->priv->menu_item_view));
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (self->priv->menu_item_view), NULL);
   }
 }
 
@@ -456,7 +456,7 @@
 
   gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 0);
   gtk_widget_set_sensitive (self->priv->menu_item_view, FALSE);
-  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (self->priv->menu_item_view));
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (self->priv->menu_item_view), NULL);
 
   while (find_iter_for_book (self, book, &iter)) {
 
