File gtk-2.12+-gtktooltips-migration.patch of Package scim-canna

Overview Repositories Revisions Requests Users Attributes Meta

File gtk-2.12+-gtktooltips-migration.patch of Package scim-canna

diff -urN scim-canna-1.0.0.orig/src/scim_canna_imengine_setup.cpp scim-canna-1.0.0/src/scim_canna_imengine_setup.cpp
--- scim-canna-1.0.0.orig/src/scim_canna_imengine_setup.cpp	2012-06-12 16:00:29.119758108 +0800
+++ scim-canna-1.0.0/src/scim_canna_imengine_setup.cpp	2012-06-12 16:02:31.848223793 +0800
@@ -151,8 +151,6 @@
 // Internal data declaration.
 static bool __have_changed    = true;
 
-static GtkTooltips * __widget_tooltips = 0;
-
 static BoolConfigData __config_bool_common [] =
 {
     {
@@ -283,11 +281,9 @@
                       entry);
     gtk_widget_show (entry->widget);
 
-    if (!__widget_tooltips)
-        __widget_tooltips = gtk_tooltips_new();
     if (entry->tooltip)
-        gtk_tooltips_set_tip (__widget_tooltips, entry->widget,
-                              _(entry->tooltip), NULL);
+        gtk_widget_set_tooltip_text (entry->widget,
+                              _(entry->tooltip));
 
     return entry->widget;
 }
@@ -323,11 +319,9 @@
                       (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
 
-    if (!__widget_tooltips)
-        __widget_tooltips = gtk_tooltips_new();
     if (entry->tooltip)
-        gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
-                              _(entry->tooltip), NULL);
+        gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget),
+                              _(entry->tooltip));
 
     return GTK_WIDGET (entry->widget);
 }
@@ -370,11 +364,9 @@
                       G_CALLBACK (on_default_combo_changed),
                       entry);
 
-    if (!__widget_tooltips)
-        __widget_tooltips = gtk_tooltips_new();
     if (entry->tooltip)
-        gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
-                              _(entry->tooltip), NULL);
+        gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget),
+                              _(entry->tooltip));
 
     return GTK_WIDGET (entry->widget);
 }
@@ -405,9 +397,6 @@
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_widget_show (vbox);
 
-    if (!__widget_tooltips)
-        __widget_tooltips = gtk_tooltips_new();
-
     /* specify initialize file name */
     frame = gtk_frame_new ("");
     gtk_container_set_border_width (GTK_CONTAINER (frame), 4);

Places

File gtk-2.12+-gtktooltips-migration.patch of Package scim-canna

Places