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

dnd: Introduce a helper to manage the weak pointer

Browse Source 
Introduce a setter that takes care of updating the weak ref
whenever we assign info->widget. Just a cleanup of the previous patch.
This commit is contained in:
Matthias Clasen
2015-03-22 11:13:08 -04:00
parent e7eaca9534
commit 37774928bd
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtkdnd.c
View File

@ -228,6 +228,8 @@ static gboolean gtk_drag_dest_drop (GtkWidget *widget,
gint x, gint x,
gint y, gint y,
guint time); guint time);
static void gtk_drag_dest_set_widget (GtkDragDestInfo *info,
GtkWidget *widget);
static GtkDragDestInfo * gtk_drag_get_dest_info (GdkDragContext *context, static GtkDragDestInfo * gtk_drag_get_dest_info (GdkDragContext *context,
gboolean create); gboolean create);
@ -1637,9 +1639,8 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
case GDK_DRAG_LEAVE: case GDK_DRAG_LEAVE:
if (info->widget) if (info->widget)
{ {
g_object_remove_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
gtk_drag_dest_leave (info->widget, context, event->dnd.time); gtk_drag_dest_leave (info->widget, context, event->dnd.time);
info->widget = NULL; gtk_drag_dest_set_widget (info, NULL);
} }
break; break;
@ -1658,9 +1659,8 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
*/ */
if (info->widget) if (info->widget)
{ {
g_object_remove_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
gtk_drag_dest_leave (info->widget, context, event->dnd.time); gtk_drag_dest_leave (info->widget, context, event->dnd.time);
info->widget = NULL; gtk_drag_dest_set_widget (info, NULL);
} }
} }
@ -1691,9 +1691,8 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
if (info->widget && !found) if (info->widget && !found)
{ {
g_object_remove_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
gtk_drag_dest_leave (info->widget, context, event->dnd.time); gtk_drag_dest_leave (info->widget, context, event->dnd.time);
info->widget = NULL; gtk_drag_dest_set_widget (info, NULL);
} }
/* Send a reply. /* Send a reply.
@ -1924,13 +1923,9 @@ gtk_drag_find_widget (GtkWidget *widget,
if (found && info->widget != widget) if (found && info->widget != widget)
{ {
if (info->widget) if (info->widget)
{
g_object_remove_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
gtk_drag_dest_leave (info->widget, context, time); gtk_drag_dest_leave (info->widget, context, time);
}
info->widget = widget; gtk_drag_dest_set_widget (info, widget);
g_object_add_weak_pointer (G_OBJECT (widget), (gpointer *) &info->widget);
} }
} }
@ -2012,14 +2007,26 @@ gtk_drag_proxy_begin (GtkWidget *widget,
dest_info->proxy_source = source_info; dest_info->proxy_source = source_info;
} }
static void
gtk_drag_dest_set_widget (GtkDragDestInfo *info,
GtkWidget *widget)
{
if (info->widget)
g_object_remove_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
info->widget = widget;
if (info->widget)
g_object_add_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
}
static void static void
gtk_drag_dest_info_destroy (gpointer data) gtk_drag_dest_info_destroy (gpointer data)
{ {
GtkDragDestInfo *info = (GtkDragDestInfo *)data; GtkDragDestInfo *info = (GtkDragDestInfo *)data;
if (info->widget)
{ gtk_drag_dest_set_widget (info, NULL);
g_object_remove_weak_pointer (G_OBJECT (info->widget), (gpointer *) &info->widget);
}
g_slice_free (GtkDragDestInfo, data); g_slice_free (GtkDragDestInfo, data);
} }