[gnome-panel/wip/muktupavels/launcher: 3/6] applets-manager: add settings parameter to open_initial_setup_dialog



commit 75b62e0ca1bb6f0837a475b65ea40d3b143e0f1b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Apr 15 20:50:16 2020 +0300

    applets-manager: add settings parameter to open_initial_setup_dialog

 gnome-panel/gp-applet-manager.c     | 3 +++
 gnome-panel/gp-applet-manager.h     | 1 +
 gnome-panel/panel-addto-dialog.c    | 1 +
 gnome-panel/panel-applets-manager.c | 2 ++
 gnome-panel/panel-applets-manager.h | 1 +
 gnome-panel/panel.c                 | 1 +
 6 files changed, 9 insertions(+)
---
diff --git a/gnome-panel/gp-applet-manager.c b/gnome-panel/gp-applet-manager.c
index 91144f5e9..358cdcdea 100644
--- a/gnome-panel/gp-applet-manager.c
+++ b/gnome-panel/gp-applet-manager.c
@@ -370,6 +370,7 @@ gp_applet_manager_get_new_iid (GpAppletManager *self,
 gboolean
 gp_applet_manager_open_initial_setup_dialog (GpAppletManager        *self,
                                              const char             *iid,
+                                             GVariant               *settings,
                                              GtkWindow              *parent,
                                              GpInitialSetupCallback  callback,
                                              gpointer                user_data,
@@ -401,7 +402,9 @@ gp_applet_manager_open_initial_setup_dialog (GpAppletManager        *self,
     return FALSE;
 
   dialog = gp_initital_setup_dialog_new ();
+
   gp_initital_setup_dialog_add_callback (dialog, callback, user_data, free_func);
+  gp_initital_setup_dialog_set_settings (dialog, settings);
 
   info->initial_setup_dialog_func (dialog);
 
diff --git a/gnome-panel/gp-applet-manager.h b/gnome-panel/gp-applet-manager.h
index 7f36662ac..64c1793c2 100644
--- a/gnome-panel/gp-applet-manager.h
+++ b/gnome-panel/gp-applet-manager.h
@@ -48,6 +48,7 @@ char            *gp_applet_manager_get_new_iid               (GpAppletManager
 
 gboolean         gp_applet_manager_open_initial_setup_dialog (GpAppletManager             *self,
                                                               const char                  *iid,
+                                                              GVariant                    *settings,
                                                               GtkWindow                   *parent,
                                                               GpInitialSetupCallback       callback,
                                                               gpointer                     user_data,
diff --git a/gnome-panel/panel-addto-dialog.c b/gnome-panel/panel-addto-dialog.c
index 7d86d3ec6..b9515a82e 100644
--- a/gnome-panel/panel-addto-dialog.c
+++ b/gnome-panel/panel-addto-dialog.c
@@ -747,6 +747,7 @@ panel_addto_add_item (PanelAddtoDialog   *dialog,
                data = initial_setup_data_new (dialog, item_info->iid);
 
                if (!panel_applets_manager_open_initial_setup_dialog (item_info->iid,
+                                                                     NULL,
                                                                      GTK_WINDOW (dialog),
                                                                      initial_setup_dialog_cb,
                                                                      data, initial_setup_data_free)) {
diff --git a/gnome-panel/panel-applets-manager.c b/gnome-panel/panel-applets-manager.c
index 8f2a04ccb..0c89892bc 100644
--- a/gnome-panel/panel-applets-manager.c
+++ b/gnome-panel/panel-applets-manager.c
@@ -97,6 +97,7 @@ panel_applets_manager_get_new_iid (const gchar *old_iid)
 
 gboolean
 panel_applets_manager_open_initial_setup_dialog (const gchar            *iid,
+                                                 GVariant               *settings,
                                                  GtkWindow              *parent,
                                                  GpInitialSetupCallback  callback,
                                                  gpointer                user_data,
@@ -108,6 +109,7 @@ panel_applets_manager_open_initial_setup_dialog (const gchar            *iid,
 
        ret = gp_applet_manager_open_initial_setup_dialog (manager,
                                                           iid,
+                                                          settings,
                                                           parent,
                                                           callback,
                                                           user_data,
diff --git a/gnome-panel/panel-applets-manager.h b/gnome-panel/panel-applets-manager.h
index a5a590f4a..bf6826528 100644
--- a/gnome-panel/panel-applets-manager.h
+++ b/gnome-panel/panel-applets-manager.h
@@ -42,6 +42,7 @@ gboolean         panel_applets_manager_load_applet               (const gchar
 gchar           *panel_applets_manager_get_new_iid               (const gchar                 *old_iid);
 
 gboolean         panel_applets_manager_open_initial_setup_dialog (const gchar                 *iid,
+                                                                  GVariant                    *settings,
                                                                   GtkWindow                   *parent,
                                                                   GpInitialSetupCallback       callback,
                                                                   gpointer                     user_data,
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index b770b54bf..931f7061e 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -1023,6 +1023,7 @@ panel_receive_dnd_data (PanelWidget         *panel,
                                                                     (char *) data);
 
                        if (!panel_applets_manager_open_initial_setup_dialog ((char *) data,
+                                                                             NULL,
                                                                              NULL,
                                                                              initial_setup_dialog_cb,
                                                                              initial_setup_data,


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