Author: baggins Date: Mon Oct 24 10:13:49 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - asking lusers "complicated" existential questions how they want theirs panel is not a good idea - remove "one empty panel" answer from migrate program
---- Files affected: packages/xfce4-panel: xfce4-panel.spec (1.90 -> 1.91) , xfce4-panel-no-empty-panel.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfce4-panel/xfce4-panel.spec diff -u packages/xfce4-panel/xfce4-panel.spec:1.90 packages/xfce4-panel/xfce4-panel.spec:1.91 --- packages/xfce4-panel/xfce4-panel.spec:1.90 Wed Sep 28 13:18:02 2011 +++ packages/xfce4-panel/xfce4-panel.spec Mon Oct 24 12:13:44 2011 @@ -4,11 +4,12 @@ Summary(pl.UTF-8): Panel nowej generacji dla Xfce Name: xfce4-panel Version: 4.8.6 -Release: 1 +Release: 2 License: GPL v2, LGPL v2 Group: X11/Applications Source0: http://archive.xfce.org/src/xfce/xfce4-panel/4.8/%{name}-%{version}.tar.bz2 # Source0-md5: 9d7bf0503d5867c4044cef04bb5845b1 +Patch0: %{name}-no-empty-panel.patch URL: http://www.xfce.org/projects/xfce4-panel BuildRequires: dbus-glib-devel >= 0.73 BuildRequires: docbook-dtd412-xml @@ -92,6 +93,7 @@ %prep %setup -q +%patch0 -p1 %build %configure \ @@ -185,6 +187,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.91 2011/10/24 10:13:44 baggins +- rel 2 +- asking lusers "complicated" existential questions how they want theirs panel + is not a good idea - remove "one empty panel" answer from migrate program + Revision 1.90 2011/09/28 11:18:02 baggins - 4.8.6 ================================================================ Index: packages/xfce4-panel/xfce4-panel-no-empty-panel.patch diff -u /dev/null packages/xfce4-panel/xfce4-panel-no-empty-panel.patch:1.1 --- /dev/null Mon Oct 24 12:13:49 2011 +++ packages/xfce4-panel/xfce4-panel-no-empty-panel.patch Mon Oct 24 12:13:44 2011 @@ -0,0 +1,71 @@ +--- 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; +- +- 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); + + 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)) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-panel/xfce4-panel.spec?r1=1.90&r2=1.91&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
