[Xfce4-commits] [xfce/xfce4-panel] 01/01: Drop the panel's welcome dialog (Bug #14388)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit 44164c17f43a620085424027edcb8a751e3ed97e
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Nov 17 00:01:57 2018 +0100

    Drop the panel's welcome dialog (Bug #14388)
    
    Instead of asking new users to choose between the default config and an
    empty panel we simply give them the default panel. Anybody knowing what
    they are doing can get an empty panel with a few clicks and those not
    knowing what they're doing should always get our default config.
---
 migrate/main.c | 45 ++-------------------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/migrate/main.c b/migrate/main.c
index 8da271b..72d1e7a 100644
--- a/migrate/main.c
+++ b/migrate/main.c
@@ -111,58 +111,17 @@ main (gint argc, gchar **argv)
             goto migrate_default;
         }
 
-      /* create question dialog */
-      dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
-                                       _("Welcome to the first start of the panel"));
-      gtk_window_set_title (GTK_WINDOW (dialog), _("Panel"));
-      gtk_window_set_icon_name (GTK_WINDOW (dialog), "preferences-system");
-      gtk_window_stick (GTK_WINDOW (dialog));
-      gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
-
       if (filename_46 != NULL)
         {
-          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s\n%s",
-              _("Because the panel moved to a new system for storing the "
-                "settings, it has to load a fresh initial configuration."),
-              _("Choose below which setup you want for the first startup."));
-
-          button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Migrate old config"), GTK_RESPONSE_OK);
-          gtk_widget_set_tooltip_text (button, _("Migrate the old 4.6 configuration to Xfconf"));
-          default_response = GTK_RESPONSE_OK;
-        }
-      else
-        {
-          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-              _("Choose below which setup you want for the first startup."));
-        }
-
-      if (filename_default != NULL)
-        {
-          button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Use default config"), GTK_RESPONSE_YES);
-          gtk_widget_set_tooltip_text (button, _("Load the default configuration"));
-
-          if (default_response == GTK_RESPONSE_CANCEL)
-            default_response = GTK_RESPONSE_YES;
-        }
-
-      button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("One empty panel"), GTK_RESPONSE_CANCEL);
-      gtk_widget_set_tooltip_text (button, _("Start with one empty panel"));
-
-      gtk_dialog_set_default_response (GTK_DIALOG (dialog), default_response);
-      result = gtk_dialog_run (GTK_DIALOG (dialog));
-      gtk_widget_destroy (dialog);
-
-      if (result == GTK_RESPONSE_OK && filename_46 != NULL)
-        {
           /* restore 4.6 config */
           if (!migrate_46 (filename_46, channel, &error))
             {
-              xfce_dialog_show_error (NULL, error, _("Failed to migrate the old panel configuration"));
+              xfce_dialog_show_error (NULL, error, _("Tried but failed to migrate your old panel configuration"));
               g_error_free (error);
               retval = EXIT_FAILURE;
             }
         }
-      else if (result == GTK_RESPONSE_YES && filename_default != NULL)
+      else if (filename_default != NULL)
         {
           migrate_default:
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.