packages: xfce4-panel/xfce4-panel-no-empty-panel.patch, xfce4-panel/xfce4-p...
baggins
baggins at pld-linux.org
Thu May 17 19:38:10 CEST 2012
Author: baggins Date: Thu May 17 17:38:10 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated patch to 4.10
---- Files affected:
packages/xfce4-panel:
xfce4-panel-no-empty-panel.patch (1.1 -> 1.2) , xfce4-panel.spec (1.94 -> 1.95)
---- Diffs:
================================================================
Index: packages/xfce4-panel/xfce4-panel-no-empty-panel.patch
diff -u packages/xfce4-panel/xfce4-panel-no-empty-panel.patch:1.1 packages/xfce4-panel/xfce4-panel-no-empty-panel.patch:1.2
--- packages/xfce4-panel/xfce4-panel-no-empty-panel.patch:1.1 Mon Oct 24 12:13:44 2011
+++ packages/xfce4-panel/xfce4-panel-no-empty-panel.patch Thu May 17 19:38:05 2012
@@ -1,71 +1,35 @@
--- xfce4-panel-4.8.6/migrate/main.c~ 2011-09-21 20:59:09.000000000 +0200
+++ xfce4-panel-4.8.6/migrate/main.c 2011-10-24 12:09:17.247228900 +0200
@@ -50,7 +50,6 @@
- gint result;
- gint retval = EXIT_SUCCESS;
- gboolean default_config_exists;
-- gint default_response = GTK_RESPONSE_CANCEL;
-
- /* set translation domain */
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-@@ -72,14 +71,27 @@
-
- /* lookup the old 4.6 config file */
- file = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, XFCE_46_CONFIG);
-+ default_config_exists = g_file_test (DEFAULT_CONFIG, G_FILE_TEST_IS_REGULAR);
-+ if (file == NULL)
-+ {
-+ /* apply default config */
-+ if (default_config_exists && !migrate_default (DEFAULT_CONFIG, &error))
-+ {
-+ xfce_dialog_show_error (NULL, error, _("Failed to load the default configuration"));
-+ g_error_free (error);
-+ retval = EXIT_FAILURE;
-+ }
-+ xfconf_shutdown ();
-+ return retval;
-+ }
-
- /* 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_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s%s%s",
-- file != NULL ? _("Because the panel moved to a new system for storing the "
-- "settings, it has to load a fresh initial configuration.") : "",
-- file != NULL ? " " : "",
-+ _("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."));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Panel"));
- gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES);
-@@ -88,26 +100,18 @@
-
- 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"));
-- gtk_widget_set_sensitive (button, file != NULL);
-- if (file != NULL)
-- default_response = GTK_RESPONSE_OK;
-+ gtk_widget_set_sensitive (button, TRUE);
-
- button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Use default config"), GTK_RESPONSE_YES);
- gtk_widget_set_tooltip_text (button, _("Load the default configuration"));
-- default_config_exists = g_file_test (DEFAULT_CONFIG, G_FILE_TEST_IS_REGULAR);
- gtk_widget_set_sensitive (button, default_config_exists);
-- if (default_config_exists && file == NULL)
-- default_response = GTK_RESPONSE_YES;
+ GtkWidget *button;
+ gint result;
+ gint retval = EXIT_SUCCESS;
+- gint default_response = GTK_RESPONSE_CANCEL;
+ XfconfChannel *channel;
+ gint configver;
+ gchar *filename_46;
+@@ -128,7 +128,6 @@
+
+ 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
+ {
+@@ -140,15 +140,9 @@
+ {
+ button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Use default config"), GTK_RESPONSE_YES);
+ gtk_widget_set_tooltip_text (button, _("Load the default configuration"));
-
-- 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);
-+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+- if (default_response == GTK_RESPONSE_CANCEL)
+- default_response = GTK_RESPONSE_YES;
+ }
- result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+- 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);
++ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
-- if (result == GTK_RESPONSE_OK && file != NULL)
-+ if (result == GTK_RESPONSE_OK)
- {
- /* restore 4.6 config */
- if (!migrate_46 (file, &error))
================================================================
Index: packages/xfce4-panel/xfce4-panel.spec
diff -u packages/xfce4-panel/xfce4-panel.spec:1.94 packages/xfce4-panel/xfce4-panel.spec:1.95
--- packages/xfce4-panel/xfce4-panel.spec:1.94 Thu May 17 13:55:08 2012
+++ packages/xfce4-panel/xfce4-panel.spec Thu May 17 19:38:05 2012
@@ -93,7 +93,7 @@
%prep
%setup -q
-#%patch0 -p1
+%patch0 -p1
%build
%configure \
@@ -187,6 +187,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.95 2012/05/17 17:38:05 baggins
+- updated patch to 4.10
+
Revision 1.94 2012/05/17 11:55:08 baggins
- 4.10.0
- empty-panel patch needs rewrite/update
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/xfce4-panel/xfce4-panel-no-empty-panel.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/xfce4-panel/xfce4-panel.spec?r1=1.94&r2=1.95
More information about the pld-cvs-commit
mailing list