callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new gdk_threads API.

Browse Source 
2007-04-04  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktooltip.c (tooltip_browse_mode_expired),
	(gtk_tooltip_hide_tooltip), (tooltip_popup_timeout),
	(gtk_tooltip_start_delay): use new gdk_threads API.


svn path=/trunk/; revision=17583
This commit is contained in:
Kristian Rietveld
2007-04-04 13:05:42 +00:00
committed by Kristian Rietveld
parent 166d3ff65b
commit e397ed56cc
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-04 Kristian Rietveld <kris@imendio.com>
* gtk/gtktooltip.c (tooltip_browse_mode_expired),
(gtk_tooltip_hide_tooltip), (tooltip_popup_timeout),
(gtk_tooltip_start_delay): use new gdk_threads API.
2007-04-03 Behdad Esfahbod <behdad@gnome.org> 2007-04-03 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtksettings.c (settings_update_font_options): Don't set * gtk/gtksettings.c (settings_update_font_options): Don't set

12
gtk/gtktooltip.c
View File

@ -526,8 +526,6 @@ tooltip_browse_mode_expired (gpointer data)
{ {
GtkTooltip *tooltip; GtkTooltip *tooltip;
GDK_THREADS_ENTER ();
tooltip = GTK_TOOLTIP (data); tooltip = GTK_TOOLTIP (data);
tooltip->browse_mode_enabled = FALSE; tooltip->browse_mode_enabled = FALSE;
@ -537,8 +535,6 @@ tooltip_browse_mode_expired (gpointer data)
g_object_set_data (G_OBJECT (gtk_widget_get_display (tooltip->window)), g_object_set_data (G_OBJECT (gtk_widget_get_display (tooltip->window)),
"gdk-display-current-tooltip", NULL); "gdk-display-current-tooltip", NULL);
GDK_THREADS_LEAVE ();
return FALSE; return FALSE;
} }
@ -763,7 +759,7 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
*/ */
if (!tooltip->browse_mode_timeout_id) if (!tooltip->browse_mode_timeout_id)
tooltip->browse_mode_timeout_id = tooltip->browse_mode_timeout_id =
g_timeout_add_full (0, timeout, gdk_threads_add_timeout_full (0, timeout,
tooltip_browse_mode_expired, tooltip_browse_mode_expired,
g_object_ref (tooltip), g_object_ref (tooltip),
g_object_unref); g_object_unref);
@ -790,8 +786,6 @@ tooltip_popup_timeout (gpointer data)
GdkDisplay *display; GdkDisplay *display;
GtkTooltip *tooltip; GtkTooltip *tooltip;
GDK_THREADS_ENTER ();
display = GDK_DISPLAY_OBJECT (data); display = GDK_DISPLAY_OBJECT (data);
gtk_tooltip_show_tooltip (display); gtk_tooltip_show_tooltip (display);
@ -800,8 +794,6 @@ tooltip_popup_timeout (gpointer data)
"gdk-display-current-tooltip"); "gdk-display-current-tooltip");
tooltip->timeout_id = 0; tooltip->timeout_id = 0;
GDK_THREADS_LEAVE ();
return FALSE; return FALSE;
} }
@ -828,7 +820,7 @@ gtk_tooltip_start_delay (GdkDisplay *display)
else else
g_object_get (settings, "gtk-tooltip-timeout", &timeout, NULL); g_object_get (settings, "gtk-tooltip-timeout", &timeout, NULL);
tooltip->timeout_id = g_timeout_add_full (0, timeout, tooltip->timeout_id = gdk_threads_add_timeout_full (0, timeout,
tooltip_popup_timeout, tooltip_popup_timeout,
g_object_ref (display), g_object_ref (display),
g_object_unref); g_object_unref);