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

use a weak pointer to set last_window to NULL as soon as it's destroyed.

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

	* gtk/gtktooltip.c (gtk_tooltip_finalize),
	(gtk_tooltip_set_last_window): use a weak pointer to set last_window
	to NULL as soon as it's destroyed.  (#496546, patch from
	Benjamin Berg).


svn path=/trunk/; revision=19189
This commit is contained in:
Kristian Rietveld 2007-12-17 15:33:45 +00:00 committed by Kristian Rietveld
parent c3b2b3ed00
commit 239fd8ace2
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-17 Kristian Rietveld <kris@imendio.com>
* gtk/gtktooltip.c (gtk_tooltip_finalize),
(gtk_tooltip_set_last_window): use a weak pointer to set last_window
to NULL as soon as it's destroyed. (#496546, patch from
Benjamin Berg).
2007-12-17 Kristian Rietveld <kris@imendio.com> 2007-12-17 Kristian Rietveld <kris@imendio.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):

23
gtk/gtktooltip.c
View File

@ -92,6 +92,8 @@ static void gtk_tooltip_window_hide (GtkWidget *widget,
static void gtk_tooltip_display_closed (GdkDisplay *display, static void gtk_tooltip_display_closed (GdkDisplay *display,
gboolean was_error, gboolean was_error,
GtkTooltip *tooltip); GtkTooltip *tooltip);
static void gtk_tooltip_set_last_window (GtkTooltip *tooltip,
GdkWindow *window);
G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT); G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
@ -179,6 +181,8 @@ gtk_tooltip_finalize (GObject *object)
tooltip->browse_mode_timeout_id = 0; tooltip->browse_mode_timeout_id = 0;
} }
gtk_tooltip_set_last_window (tooltip, NULL);
if (tooltip->window) if (tooltip->window)
{ {
GdkDisplay *display; GdkDisplay *display;
@ -734,6 +738,21 @@ gtk_tooltip_display_closed (GdkDisplay *display,
g_object_set_data (G_OBJECT (display), "gdk-display-current-tooltip", NULL); g_object_set_data (G_OBJECT (display), "gdk-display-current-tooltip", NULL);
} }
static void
gtk_tooltip_set_last_window (GtkTooltip *tooltip,
GdkWindow *window)
{
if (tooltip->last_window)
g_object_remove_weak_pointer (G_OBJECT (tooltip->last_window),
(gpointer *) &tooltip->last_window);
tooltip->last_window = window;
if (window)
g_object_add_weak_pointer (G_OBJECT (tooltip->last_window),
(gpointer *) &tooltip->last_window);
}
static gboolean static gboolean
gtk_tooltip_run_requery (GtkWidget **widget, gtk_tooltip_run_requery (GtkWidget **widget,
GtkTooltip *tooltip, GtkTooltip *tooltip,
@ -1190,7 +1209,7 @@ _gtk_tooltip_handle_event (GdkEvent *event)
if (current_tooltip) if (current_tooltip)
{ {
current_tooltip->last_window = event->any.window; gtk_tooltip_set_last_window (current_tooltip, event->any.window);
gdk_event_get_root_coords (event, gdk_event_get_root_coords (event,
&current_tooltip->last_x, &current_tooltip->last_x,
&current_tooltip->last_y); &current_tooltip->last_y);
@ -1298,7 +1317,7 @@ _gtk_tooltip_handle_event (GdkEvent *event)
G_CALLBACK (gtk_tooltip_display_closed), G_CALLBACK (gtk_tooltip_display_closed),
current_tooltip); current_tooltip);
current_tooltip->last_window = event->any.window; gtk_tooltip_set_last_window (current_tooltip, event->any.window);
gdk_event_get_root_coords (event, gdk_event_get_root_coords (event,
&current_tooltip->last_x, &current_tooltip->last_x,
&current_tooltip->last_y); &current_tooltip->last_y);