diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-10 18:05:57 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-04-26 17:59:42 +0200 |
| commit | 1e6eb1f8b94ad10f30678285860dc24877bbbac3 (patch) | |
| tree | eef4b5f579a657072967e7f7dd047494af5add1d /gtk/gtklabel.c | |
| parent | bf82149271b4f6bf6379b22eeea191dffe6823dd (diff) | |
| download | gtk+-1e6eb1f8b94ad10f30678285860dc24877bbbac3.tar.gz | |
draggesture: Port to new API model
Diffstat (limited to 'gtk/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index c15cd69459..5cce92f33b 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -3177,7 +3177,6 @@ gtk_label_finalize (GObject *object) if (priv->select_info) { - g_object_unref (priv->select_info->drag_gesture); g_object_unref (priv->select_info->motion_controller); g_object_unref (priv->select_info->provider); } @@ -5016,12 +5015,13 @@ gtk_label_ensure_select_info (GtkLabel *label) if (gtk_widget_get_realized (GTK_WIDGET (label))) gtk_label_set_selectable_hint (label); - priv->select_info->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (label)); + priv->select_info->drag_gesture = gtk_gesture_drag_new (); g_signal_connect (priv->select_info->drag_gesture, "drag-begin", G_CALLBACK (gtk_label_drag_gesture_begin), label); g_signal_connect (priv->select_info->drag_gesture, "drag-update", G_CALLBACK (gtk_label_drag_gesture_update), label); gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->select_info->drag_gesture), TRUE); + gtk_widget_add_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (priv->select_info->drag_gesture)); priv->select_info->multipress_gesture = gtk_gesture_multi_press_new (); g_signal_connect (priv->select_info->multipress_gesture, "pressed", @@ -5053,7 +5053,7 @@ gtk_label_clear_select_info (GtkLabel *label) if (!priv->select_info->selectable && !priv->select_info->links) { - g_object_unref (priv->select_info->drag_gesture); + gtk_widget_remove_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (priv->select_info->drag_gesture)); gtk_widget_remove_controller (GTK_WIDGET (label), GTK_EVENT_CONTROLLER (priv->select_info->multipress_gesture)); g_object_unref (priv->select_info->motion_controller); GTK_LABEL_CONTENT (priv->select_info->provider)->label = NULL; |