From d6dcb45df2cb5bc85618c03efb2a6aceb66498371c82c388f1cadfb7b75b804d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 25 Sep 2009 15:06:35 +0000 Subject: [PATCH 1/4] Accepting request 21111 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/gnome-control-center via accept of submit request 21111 revision 8. Request was accepted with message: Accepted OBS-URL: https://build.opensuse.org/request/show/21111 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=49 --- gnome-control-center-2.27.91.tar.bz2 | 3 --- gnome-control-center-2.28.0.tar.bz2 | 3 +++ gnome-control-center.changes | 26 ++++++++++++++++++++++++++ gnome-control-center.spec | 5 ++--- 4 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 gnome-control-center-2.27.91.tar.bz2 create mode 100644 gnome-control-center-2.28.0.tar.bz2 diff --git a/gnome-control-center-2.27.91.tar.bz2 b/gnome-control-center-2.27.91.tar.bz2 deleted file mode 100644 index ea2b18b..0000000 --- a/gnome-control-center-2.27.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee217fc1a6acfc6f021b1466e003f9658f265deeb79b972819a9b60c5cec4f42 -size 2301104 diff --git a/gnome-control-center-2.28.0.tar.bz2 b/gnome-control-center-2.28.0.tar.bz2 new file mode 100644 index 0000000..0f730b6 --- /dev/null +++ b/gnome-control-center-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7e925a6247ff03b5c1bbb50aedc8bcf69e7497d6a47c42e1b867e5c6c3b1f54 +size 2294617 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 85f0abd..b174312 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Sep 21 23:22:55 CEST 2009 - dimstar@opensuse.org + +- Update to version 2.28.0: + + Appearance: + - bgo#323323 - Add link buttons to get more themes/backgrounds + online + - bgo#592510 - Add/remove buttons should be the same size + - bgo#591375 - Make slideshows visually distinct + - Don't call gnome_wp_item_ensure_gnome_bg too early + - Rename some widget ids to make GtkBuilder happy + - Use XDG user and system data dirs to load backgrounds + - Fix compiler warnings + - bgo#584342 - Make the font DPI spin button work again + - Show correct default layout + - bgo#594718 - Update icon because the old one has been removed + from g-i-t + - bgo#594066 - Allow a window manager to inherit keybindings + from another window manager + - Force cursor slide to 100 px, in order to use it without + changing the window width + + Common: + - bgo#592920 - Drop check for libgnomeui + + Updated translations. +- Drop libgnomeui-devel BuildRequires. + ------------------------------------------------------------------- Fri Aug 28 23:54:49 CEST 2009 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index cc475b5..fcb8b7c 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-control-center (Version 2.27.91) +# spec file for package gnome-control-center (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,6 @@ BuildRequires: gnome-menus-devel BuildRequires: gnome-settings-daemon-devel BuildRequires: intltool BuildRequires: libgnomekbd-devel -BuildRequires: libgnomeui-devel BuildRequires: librsvg-devel BuildRequires: libunique-devel BuildRequires: libxklavier-devel @@ -40,7 +39,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.27.91 +Version: 2.28.0 Release: 1 Summary: The GNOME Control Center Source: %{name}-%{version}.tar.bz2 From 08ef5f3826866288fc7f37870331d7592adf9189c1a4ede5b26a35a25a58822d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 5 Oct 2009 22:28:07 +0000 Subject: [PATCH 2/4] Accepting request 21879 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-control-center via accept of submit request 21879 revision 30. OBS-URL: https://build.opensuse.org/request/show/21879 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=50 --- gnome-control-center-default-app-xterm.patch | 86 ++++++++++++++++++++ gnome-control-center.changes | 7 ++ gnome-control-center.spec | 3 + 3 files changed, 96 insertions(+) create mode 100644 gnome-control-center-default-app-xterm.patch diff --git a/gnome-control-center-default-app-xterm.patch b/gnome-control-center-default-app-xterm.patch new file mode 100644 index 0000000..f508c66 --- /dev/null +++ b/gnome-control-center-default-app-xterm.patch @@ -0,0 +1,86 @@ +From f36a1c80f1b38a61cbee07e79462bddd41e0f996 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Sat, 3 Oct 2009 10:14:24 +0200 +Subject: [PATCH] [defaultapplications] Update the exec arg when changing terminal + +When selecting a known terminal from the combo box, also update the exec +arg gconf key to the known value from the xml file. + +https://bugzilla.gnome.org/show_bug.cgi?id=597185 +--- + capplets/default-applications/gnome-da-capplet.c | 52 ++++++++++++++++++++++ + 1 files changed, 52 insertions(+), 0 deletions(-) + +diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c +index 38fb9db..eed2690 100644 +--- a/capplets/default-applications/gnome-da-capplet.c ++++ b/capplets/default-applications/gnome-da-capplet.c +@@ -573,6 +573,50 @@ combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) + } + } + ++static GConfValue* ++combo_conv_from_widget_term_flag (GConfPropertyEditor *peditor, const GConfValue *value) ++{ ++ GConfValue *ret; ++ GList *handlers; ++ gint index; ++ GnomeDATermItem *item; ++ ++ g_object_get (G_OBJECT (peditor), "data", &handlers, NULL); ++ index = gconf_value_get_int (value); ++ ++ item = g_list_nth_data (handlers, index); ++ ret = gconf_value_new (GCONF_VALUE_STRING); ++ ++ if (!item) ++ { ++ /* if item was not found, this is probably the "Custom" item */ ++ ++ /* XXX: returning "" as the value here is not ideal, but required to ++ * prevent the combo box from jumping back to the previous value if the ++ * user has selected Custom */ ++ gconf_value_set_string (ret, ""); ++ return ret; ++ } ++ else ++ { ++ gconf_value_set_string (ret, item->exec_flag); ++ return ret; ++ } ++} ++ ++static GConfValue* ++combo_conv_to_widget_term_flag (GConfPropertyEditor *peditor, const GConfValue *value) ++{ ++ GConfValue *ret; ++ GtkComboBox *combo; ++ ++ combo = GTK_COMBO_BOX (gconf_property_editor_get_ui_control (peditor)); ++ ++ ret = gconf_value_new (GCONF_VALUE_INT); ++ gconf_value_set_int (ret, gtk_combo_box_get_active (combo)); ++ return ret; ++} ++ + static gboolean + is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index) + { +@@ -814,6 +858,14 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) + "data", capplet->terminals, + NULL); + ++ gconf_peditor_new_combo_box (NULL, ++ DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, ++ capplet->term_combo_box, ++ "conv-from-widget-cb", combo_conv_from_widget_term_flag, ++ "conv-to-widget-cb", combo_conv_to_widget_term_flag, ++ "data", capplet->terminals, ++ NULL); ++ + gconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_TERMINAL_EXEC, + capplet->terminal_command_entry, +-- +1.6.4.2 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index b174312..f202f91 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Oct 3 10:20:28 CEST 2009 - vuntz@opensuse.org + +- Add gnome-control-center-default-app-xterm.patch to correctly set + the exec arg gconf key when changing the preferred terminal. Fix + bnc#544006. + ------------------------------------------------------------------- Mon Sep 21 23:22:55 CEST 2009 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index fcb8b7c..ac6bf10 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -53,6 +53,8 @@ Patch28: gnome-control-center-use-settings-menu.patch Patch30: gnome-control-center-bnc373197-layout-switch-keybinding.patch # PATCH-FIX-UPSTREAM gnome-control-center-bnc436206-add-to-default.patch bnc436206 sreeves@novell.com -- Add groupwise to defaults list Patch31: gnome-control-center-bnc436206-add-to-default.patch +# PATCH-FIX-UPSTREAM gnome-control-center-default-app-xterm.patch bnc544006 bgo597185 vuntz@opensuse.org -- exec_arg key wasn't set when changing the terminal +Patch32: gnome-control-center-default-app-xterm.patch Url: http://www.gnome.org Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk Requires: %{name}-lang = %{version} @@ -106,6 +108,7 @@ of window managers. %patch28 %patch30 -p1 %patch31 -p1 +%patch32 -p1 %build autoreconf -f -i From 8f68d1c568a2f1dbd91ae095b8d0af6da932c20d7adeff53c742cc6dbef160c8 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 6 Oct 2009 03:04:10 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=51 --- gnome-control-center-2.27.91.tar.bz2 | 3 + gnome-control-center-2.28.0.tar.bz2 | 3 - gnome-control-center-default-app-xterm.patch | 86 -------------------- gnome-control-center.changes | 33 -------- gnome-control-center.spec | 8 +- 5 files changed, 6 insertions(+), 127 deletions(-) create mode 100644 gnome-control-center-2.27.91.tar.bz2 delete mode 100644 gnome-control-center-2.28.0.tar.bz2 delete mode 100644 gnome-control-center-default-app-xterm.patch diff --git a/gnome-control-center-2.27.91.tar.bz2 b/gnome-control-center-2.27.91.tar.bz2 new file mode 100644 index 0000000..ea2b18b --- /dev/null +++ b/gnome-control-center-2.27.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee217fc1a6acfc6f021b1466e003f9658f265deeb79b972819a9b60c5cec4f42 +size 2301104 diff --git a/gnome-control-center-2.28.0.tar.bz2 b/gnome-control-center-2.28.0.tar.bz2 deleted file mode 100644 index 0f730b6..0000000 --- a/gnome-control-center-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7e925a6247ff03b5c1bbb50aedc8bcf69e7497d6a47c42e1b867e5c6c3b1f54 -size 2294617 diff --git a/gnome-control-center-default-app-xterm.patch b/gnome-control-center-default-app-xterm.patch deleted file mode 100644 index f508c66..0000000 --- a/gnome-control-center-default-app-xterm.patch +++ /dev/null @@ -1,86 +0,0 @@ -From f36a1c80f1b38a61cbee07e79462bddd41e0f996 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Sat, 3 Oct 2009 10:14:24 +0200 -Subject: [PATCH] [defaultapplications] Update the exec arg when changing terminal - -When selecting a known terminal from the combo box, also update the exec -arg gconf key to the known value from the xml file. - -https://bugzilla.gnome.org/show_bug.cgi?id=597185 ---- - capplets/default-applications/gnome-da-capplet.c | 52 ++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c -index 38fb9db..eed2690 100644 ---- a/capplets/default-applications/gnome-da-capplet.c -+++ b/capplets/default-applications/gnome-da-capplet.c -@@ -573,6 +573,50 @@ combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) - } - } - -+static GConfValue* -+combo_conv_from_widget_term_flag (GConfPropertyEditor *peditor, const GConfValue *value) -+{ -+ GConfValue *ret; -+ GList *handlers; -+ gint index; -+ GnomeDATermItem *item; -+ -+ g_object_get (G_OBJECT (peditor), "data", &handlers, NULL); -+ index = gconf_value_get_int (value); -+ -+ item = g_list_nth_data (handlers, index); -+ ret = gconf_value_new (GCONF_VALUE_STRING); -+ -+ if (!item) -+ { -+ /* if item was not found, this is probably the "Custom" item */ -+ -+ /* XXX: returning "" as the value here is not ideal, but required to -+ * prevent the combo box from jumping back to the previous value if the -+ * user has selected Custom */ -+ gconf_value_set_string (ret, ""); -+ return ret; -+ } -+ else -+ { -+ gconf_value_set_string (ret, item->exec_flag); -+ return ret; -+ } -+} -+ -+static GConfValue* -+combo_conv_to_widget_term_flag (GConfPropertyEditor *peditor, const GConfValue *value) -+{ -+ GConfValue *ret; -+ GtkComboBox *combo; -+ -+ combo = GTK_COMBO_BOX (gconf_property_editor_get_ui_control (peditor)); -+ -+ ret = gconf_value_new (GCONF_VALUE_INT); -+ gconf_value_set_int (ret, gtk_combo_box_get_active (combo)); -+ return ret; -+} -+ - static gboolean - is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index) - { -@@ -814,6 +858,14 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - "data", capplet->terminals, - NULL); - -+ gconf_peditor_new_combo_box (NULL, -+ DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, -+ capplet->term_combo_box, -+ "conv-from-widget-cb", combo_conv_from_widget_term_flag, -+ "conv-to-widget-cb", combo_conv_to_widget_term_flag, -+ "data", capplet->terminals, -+ NULL); -+ - gconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_TERMINAL_EXEC, - capplet->terminal_command_entry, --- -1.6.4.2 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index f202f91..85f0abd 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,36 +1,3 @@ -------------------------------------------------------------------- -Sat Oct 3 10:20:28 CEST 2009 - vuntz@opensuse.org - -- Add gnome-control-center-default-app-xterm.patch to correctly set - the exec arg gconf key when changing the preferred terminal. Fix - bnc#544006. - -------------------------------------------------------------------- -Mon Sep 21 23:22:55 CEST 2009 - dimstar@opensuse.org - -- Update to version 2.28.0: - + Appearance: - - bgo#323323 - Add link buttons to get more themes/backgrounds - online - - bgo#592510 - Add/remove buttons should be the same size - - bgo#591375 - Make slideshows visually distinct - - Don't call gnome_wp_item_ensure_gnome_bg too early - - Rename some widget ids to make GtkBuilder happy - - Use XDG user and system data dirs to load backgrounds - - Fix compiler warnings - - bgo#584342 - Make the font DPI spin button work again - - Show correct default layout - - bgo#594718 - Update icon because the old one has been removed - from g-i-t - - bgo#594066 - Allow a window manager to inherit keybindings - from another window manager - - Force cursor slide to 100 px, in order to use it without - changing the window width - + Common: - - bgo#592920 - Drop check for libgnomeui - + Updated translations. -- Drop libgnomeui-devel BuildRequires. - ------------------------------------------------------------------- Fri Aug 28 23:54:49 CEST 2009 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index ac6bf10..cc475b5 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-control-center (Version 2.28.0) +# spec file for package gnome-control-center (Version 2.27.91) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,6 +29,7 @@ BuildRequires: gnome-menus-devel BuildRequires: gnome-settings-daemon-devel BuildRequires: intltool BuildRequires: libgnomekbd-devel +BuildRequires: libgnomeui-devel BuildRequires: librsvg-devel BuildRequires: libunique-devel BuildRequires: libxklavier-devel @@ -39,7 +40,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.28.0 +Version: 2.27.91 Release: 1 Summary: The GNOME Control Center Source: %{name}-%{version}.tar.bz2 @@ -53,8 +54,6 @@ Patch28: gnome-control-center-use-settings-menu.patch Patch30: gnome-control-center-bnc373197-layout-switch-keybinding.patch # PATCH-FIX-UPSTREAM gnome-control-center-bnc436206-add-to-default.patch bnc436206 sreeves@novell.com -- Add groupwise to defaults list Patch31: gnome-control-center-bnc436206-add-to-default.patch -# PATCH-FIX-UPSTREAM gnome-control-center-default-app-xterm.patch bnc544006 bgo597185 vuntz@opensuse.org -- exec_arg key wasn't set when changing the terminal -Patch32: gnome-control-center-default-app-xterm.patch Url: http://www.gnome.org Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk Requires: %{name}-lang = %{version} @@ -108,7 +107,6 @@ of window managers. %patch28 %patch30 -p1 %patch31 -p1 -%patch32 -p1 %build autoreconf -f -i From 868dc0cd62ce7f1b27dc1f6f7db0a5fd7354992645a913060fadc680aba83ffe Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Oct 2009 03:04:11 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/gnome-control-center revision 29.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=905f09a3b52d5eca5465071a861d8eeb --- gnome-control-center-2.27.91.tar.bz2 | 3 - gnome-control-center-2.28.0.tar.bz2 | 3 + gnome-control-center-default-app-xterm.patch | 86 ++++++++++++++++++++ gnome-control-center.changes | 33 ++++++++ gnome-control-center.spec | 8 +- 5 files changed, 127 insertions(+), 6 deletions(-) delete mode 100644 gnome-control-center-2.27.91.tar.bz2 create mode 100644 gnome-control-center-2.28.0.tar.bz2 create mode 100644 gnome-control-center-default-app-xterm.patch diff --git a/gnome-control-center-2.27.91.tar.bz2 b/gnome-control-center-2.27.91.tar.bz2 deleted file mode 100644 index ea2b18b..0000000 --- a/gnome-control-center-2.27.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee217fc1a6acfc6f021b1466e003f9658f265deeb79b972819a9b60c5cec4f42 -size 2301104 diff --git a/gnome-control-center-2.28.0.tar.bz2 b/gnome-control-center-2.28.0.tar.bz2 new file mode 100644 index 0000000..0f730b6 --- /dev/null +++ b/gnome-control-center-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7e925a6247ff03b5c1bbb50aedc8bcf69e7497d6a47c42e1b867e5c6c3b1f54 +size 2294617 diff --git a/gnome-control-center-default-app-xterm.patch b/gnome-control-center-default-app-xterm.patch new file mode 100644 index 0000000..f508c66 --- /dev/null +++ b/gnome-control-center-default-app-xterm.patch @@ -0,0 +1,86 @@ +From f36a1c80f1b38a61cbee07e79462bddd41e0f996 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Sat, 3 Oct 2009 10:14:24 +0200 +Subject: [PATCH] [defaultapplications] Update the exec arg when changing terminal + +When selecting a known terminal from the combo box, also update the exec +arg gconf key to the known value from the xml file. + +https://bugzilla.gnome.org/show_bug.cgi?id=597185 +--- + capplets/default-applications/gnome-da-capplet.c | 52 ++++++++++++++++++++++ + 1 files changed, 52 insertions(+), 0 deletions(-) + +diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c +index 38fb9db..eed2690 100644 +--- a/capplets/default-applications/gnome-da-capplet.c ++++ b/capplets/default-applications/gnome-da-capplet.c +@@ -573,6 +573,50 @@ combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) + } + } + ++static GConfValue* ++combo_conv_from_widget_term_flag (GConfPropertyEditor *peditor, const GConfValue *value) ++{ ++ GConfValue *ret; ++ GList *handlers; ++ gint index; ++ GnomeDATermItem *item; ++ ++ g_object_get (G_OBJECT (peditor), "data", &handlers, NULL); ++ index = gconf_value_get_int (value); ++ ++ item = g_list_nth_data (handlers, index); ++ ret = gconf_value_new (GCONF_VALUE_STRING); ++ ++ if (!item) ++ { ++ /* if item was not found, this is probably the "Custom" item */ ++ ++ /* XXX: returning "" as the value here is not ideal, but required to ++ * prevent the combo box from jumping back to the previous value if the ++ * user has selected Custom */ ++ gconf_value_set_string (ret, ""); ++ return ret; ++ } ++ else ++ { ++ gconf_value_set_string (ret, item->exec_flag); ++ return ret; ++ } ++} ++ ++static GConfValue* ++combo_conv_to_widget_term_flag (GConfPropertyEditor *peditor, const GConfValue *value) ++{ ++ GConfValue *ret; ++ GtkComboBox *combo; ++ ++ combo = GTK_COMBO_BOX (gconf_property_editor_get_ui_control (peditor)); ++ ++ ret = gconf_value_new (GCONF_VALUE_INT); ++ gconf_value_set_int (ret, gtk_combo_box_get_active (combo)); ++ return ret; ++} ++ + static gboolean + is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index) + { +@@ -814,6 +858,14 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) + "data", capplet->terminals, + NULL); + ++ gconf_peditor_new_combo_box (NULL, ++ DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, ++ capplet->term_combo_box, ++ "conv-from-widget-cb", combo_conv_from_widget_term_flag, ++ "conv-to-widget-cb", combo_conv_to_widget_term_flag, ++ "data", capplet->terminals, ++ NULL); ++ + gconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_TERMINAL_EXEC, + capplet->terminal_command_entry, +-- +1.6.4.2 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 85f0abd..f202f91 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sat Oct 3 10:20:28 CEST 2009 - vuntz@opensuse.org + +- Add gnome-control-center-default-app-xterm.patch to correctly set + the exec arg gconf key when changing the preferred terminal. Fix + bnc#544006. + +------------------------------------------------------------------- +Mon Sep 21 23:22:55 CEST 2009 - dimstar@opensuse.org + +- Update to version 2.28.0: + + Appearance: + - bgo#323323 - Add link buttons to get more themes/backgrounds + online + - bgo#592510 - Add/remove buttons should be the same size + - bgo#591375 - Make slideshows visually distinct + - Don't call gnome_wp_item_ensure_gnome_bg too early + - Rename some widget ids to make GtkBuilder happy + - Use XDG user and system data dirs to load backgrounds + - Fix compiler warnings + - bgo#584342 - Make the font DPI spin button work again + - Show correct default layout + - bgo#594718 - Update icon because the old one has been removed + from g-i-t + - bgo#594066 - Allow a window manager to inherit keybindings + from another window manager + - Force cursor slide to 100 px, in order to use it without + changing the window width + + Common: + - bgo#592920 - Drop check for libgnomeui + + Updated translations. +- Drop libgnomeui-devel BuildRequires. + ------------------------------------------------------------------- Fri Aug 28 23:54:49 CEST 2009 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index cc475b5..ac6bf10 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-control-center (Version 2.27.91) +# spec file for package gnome-control-center (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,6 @@ BuildRequires: gnome-menus-devel BuildRequires: gnome-settings-daemon-devel BuildRequires: intltool BuildRequires: libgnomekbd-devel -BuildRequires: libgnomeui-devel BuildRequires: librsvg-devel BuildRequires: libunique-devel BuildRequires: libxklavier-devel @@ -40,7 +39,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.27.91 +Version: 2.28.0 Release: 1 Summary: The GNOME Control Center Source: %{name}-%{version}.tar.bz2 @@ -54,6 +53,8 @@ Patch28: gnome-control-center-use-settings-menu.patch Patch30: gnome-control-center-bnc373197-layout-switch-keybinding.patch # PATCH-FIX-UPSTREAM gnome-control-center-bnc436206-add-to-default.patch bnc436206 sreeves@novell.com -- Add groupwise to defaults list Patch31: gnome-control-center-bnc436206-add-to-default.patch +# PATCH-FIX-UPSTREAM gnome-control-center-default-app-xterm.patch bnc544006 bgo597185 vuntz@opensuse.org -- exec_arg key wasn't set when changing the terminal +Patch32: gnome-control-center-default-app-xterm.patch Url: http://www.gnome.org Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk Requires: %{name}-lang = %{version} @@ -107,6 +108,7 @@ of window managers. %patch28 %patch30 -p1 %patch31 -p1 +%patch32 -p1 %build autoreconf -f -i