Accepting request 21880 from GNOME:Factory
Copy from GNOME:Factory/gnome-control-center based on submit request 21880 from user vuntz OBS-URL: https://build.opensuse.org/request/show/21880 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=29
This commit is contained in:
OBS User autobuild
Git OBS Bridge
commit
da4a339c19
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ee217fc1a6acfc6f021b1466e003f9658f265deeb79b972819a9b60c5cec4f42
|
|
||||||
size 2301104
|
|
||||||
3
gnome-control-center-2.28.0.tar.bz2
Normal file
3
gnome-control-center-2.28.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d7e925a6247ff03b5c1bbb50aedc8bcf69e7497d6a47c42e1b867e5c6c3b1f54
|
||||||
|
size 2294617
|
||||||
86
gnome-control-center-default-app-xterm.patch
Normal file
86
gnome-control-center-default-app-xterm.patch
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
From f36a1c80f1b38a61cbee07e79462bddd41e0f996 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vincent Untz <vuntz@gnome.org>
|
||||||
|
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
|
||||||
|
|
||||||
@ -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
|
Fri Aug 28 23:54:49 CEST 2009 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -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.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -29,7 +29,6 @@ BuildRequires: gnome-menus-devel
|
|||||||
BuildRequires: gnome-settings-daemon-devel
|
BuildRequires: gnome-settings-daemon-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libgnomekbd-devel
|
BuildRequires: libgnomekbd-devel
|
||||||
BuildRequires: libgnomeui-devel
|
|
||||||
BuildRequires: librsvg-devel
|
BuildRequires: librsvg-devel
|
||||||
BuildRequires: libunique-devel
|
BuildRequires: libunique-devel
|
||||||
BuildRequires: libxklavier-devel
|
BuildRequires: libxklavier-devel
|
||||||
@ -40,7 +39,7 @@ License: GPL v2 or later
|
|||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Obsoletes: fontilus themus acme
|
Obsoletes: fontilus themus acme
|
||||||
Provides: fontilus themus acme
|
Provides: fontilus themus acme
|
||||||
Version: 2.27.91
|
Version: 2.28.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: The GNOME Control Center
|
Summary: The GNOME Control Center
|
||||||
Source: %{name}-%{version}.tar.bz2
|
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
|
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
|
# 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
|
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
|
Url: http://www.gnome.org
|
||||||
Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk
|
Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
@ -107,6 +108,7 @@ of window managers.
|
|||||||
%patch28
|
%patch28
|
||||||
%patch30 -p1
|
%patch30 -p1
|
||||||
%patch31 -p1
|
%patch31 -p1
|
||||||
|
%patch32 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -f -i
|
autoreconf -f -i
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user