[gnome-panel/wip/muktupavels/launcher: 4/6] panel: remove GdkDragContext and time from InitialSetupData



commit 25700790679f8ade1ed4326046dd038d863e3dc2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Apr 15 20:57:22 2020 +0300

    panel: remove GdkDragContext and time from InitialSetupData

 gnome-panel/panel.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index 931f7061e..65a862de8 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -896,14 +896,10 @@ drag_leave_cb (GtkWidget  *widget,
        panel_toplevel_queue_auto_hide (toplevel);
 }
 
-
 typedef struct
 {
        PanelWidget         *panel;
 
-       GdkDragContext      *context;
-       guint                time;
-
        PanelObjectPackType  pack_type;
        int                  pack_index;
        gchar               *iid;
@@ -911,8 +907,6 @@ typedef struct
 
 static InitialSetupData *
 initial_setup_data_new (PanelWidget         *panel,
-                        GdkDragContext      *context,
-                        guint                time,
                         PanelObjectPackType  pack_type,
                         int                  pack_index,
                         const gchar         *iid)
@@ -923,9 +917,6 @@ initial_setup_data_new (PanelWidget         *panel,
 
        data->panel = panel;
 
-       data->context = context;
-       data->time = time;
-
        data->pack_type = pack_type;
        data->pack_index = pack_index;
        data->iid = g_strdup (iid);
@@ -954,10 +945,8 @@ initial_setup_dialog_cb (GpInitialSetupDialog *dialog,
 
        data = (InitialSetupData *) user_data;
 
-       if (canceled) {
-               gtk_drag_finish (data->context, FALSE, FALSE, data->time);
+       if (canceled)
                return;
-       }
 
        initial_settings = gp_initital_setup_dialog_get_settings (dialog);
 
@@ -967,7 +956,6 @@ initial_setup_dialog_cb (GpInitialSetupDialog *dialog,
                                   data->iid,
                                   initial_settings);
 
-       gtk_drag_finish (data->context, TRUE, FALSE, data->time);
        g_variant_unref (initial_settings);
 }
 
@@ -1018,7 +1006,7 @@ panel_receive_dnd_data (PanelWidget         *panel,
                if (panel_layout_is_writable ()) {
                        InitialSetupData *initial_setup_data;
 
-                       initial_setup_data = initial_setup_data_new (panel, context, time_,
+                       initial_setup_data = initial_setup_data_new (panel,
                                                                     pack_type, pack_index,
                                                                     (char *) data);
 
@@ -1031,11 +1019,9 @@ panel_receive_dnd_data (PanelWidget         *panel,
                                panel_applet_frame_create (panel->toplevel,
                                                           pack_type, pack_index,
                                                           (char *) data, NULL);
-
-                               success = TRUE;
-                       } else {
-                               return;
                        }
+
+                       success = TRUE;
                } else {
                        success = FALSE;
                }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]