[dia] No more GtkTooltips in "Sheets and Objects"

[Hans Breuer <hans src gnome org>]

commit 9e7493b1a008986d0939405d54a9e4a76bd9a3e0
Author: Hans Breuer <hans breuer org>
Date:   Sun May 24 15:00:49 2009 +0200

    No more GtkTooltips in "Sheets and Objects"
---
 app/sheets.c                  |   10 +---------
 app/sheets.h                  |    3 ---
 app/sheets_dialog_callbacks.c |    4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/sheets.c b/app/sheets.c
index 6360923..2347866 100644
--- a/app/sheets.c
+++ b/app/sheets.c
@@ -45,7 +45,6 @@
 
 GtkWidget *sheets_dialog = NULL;
 GSList *sheets_mods_list = NULL;
-GtkTooltips *sheets_dialog_tooltips = NULL;
 static gpointer custom_type_symbol = NULL;
 
 /* Given a SheetObject and a SheetMod, create a new SheetObjectMod
@@ -136,9 +135,6 @@ sheets_optionmenu_create(GtkWidget *option_menu, GtkWidget *wrapbox,
   gtk_container_foreach(GTK_CONTAINER(optionmenu_menu),
                         (GtkCallback)gtk_widget_destroy, NULL);
 
-  if (!sheets_dialog_tooltips)
-    sheets_dialog_tooltips = gtk_tooltips_new();
-
   for (sheets_list = sheets_mods_list; sheets_list;
        sheets_list = g_slist_next(sheets_list))
   {
@@ -163,8 +159,7 @@ sheets_optionmenu_create(GtkWidget *option_menu, GtkWidget *wrapbox,
       else
 	tip = g_strdup_printf(_("%s\nUser sheet"), sheet_mod->sheet.description);
       
-      gtk_tooltips_set_tip(GTK_TOOLTIPS(sheets_dialog_tooltips), menu_item, tip,
-			   NULL);
+      gtk_widget_set_tooltip_text(menu_item, tip);
       g_free(tip);
     }
 
@@ -232,9 +227,6 @@ sheets_dialog_create(void)
     g_signal_connect (GTK_OBJECT (sheets_dialog), "destroy",
 		      G_CALLBACK (gtk_widget_destroyed),
 			&sheets_dialog);
-    g_signal_connect (GTK_OBJECT (sheets_dialog), "destroy",
-		      G_CALLBACK (gtk_widget_destroyed),
-			&sheets_dialog_tooltips);
 
     sheet_left = NULL;
     sheet_right = NULL;
diff --git a/app/sheets.h b/app/sheets.h
index ab620e7..f494b67 100644
--- a/app/sheets.h
+++ b/app/sheets.h
@@ -72,9 +72,6 @@ struct _SheetMod
 
 extern GtkWidget *sheets_dialog;
 extern GtkWidget *sheets_dialog_optionmenu_menu;
-#ifndef GTK_DISABLE_DEPRECATED
-extern GtkTooltips *sheets_dialog_tooltips;
-#endif
 
 SheetObjectMod *sheets_append_sheet_object_mod(SheetObject *so, SheetMod *sm);
 SheetMod *sheets_append_sheet_mods(Sheet *sheet);
diff --git a/app/sheets_dialog_callbacks.c b/app/sheets_dialog_callbacks.c
index bfe9f75..55efbab 100644
--- a/app/sheets_dialog_callbacks.c
+++ b/app/sheets_dialog_callbacks.c
@@ -289,7 +289,7 @@ sheets_dialog_wrapbox_add_line_break(GtkWidget *wrapbox)
   gtk_wrap_box_pack(GTK_WRAP_BOX(wrapbox), button, FALSE, TRUE, FALSE, TRUE);
   gtk_widget_show(button);
 
-  gtk_tooltips_set_tip(sheets_dialog_tooltips, button, _("Line Break"), NULL);
+  gtk_widget_set_tooltip_text(button, _("Line Break"));
 
   g_signal_connect(GTK_OBJECT(button), "toggled",
 		   G_CALLBACK(on_sheets_dialog_object_button_toggled),
@@ -313,7 +313,7 @@ sheets_dialog_object_set_tooltip(SheetObjectMod *som, GtkWidget *button)
     break;
   }
 
-  gtk_tooltips_set_tip(sheets_dialog_tooltips, button, tip, NULL);
+  gtk_widget_set_tooltip_text(button, tip);
   g_free(tip);
 }