pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 27606 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/gnome-control-center via accept of submit request 27606 revision 4.
Request was accepted with message:
accept

OBS-URL: https://build.opensuse.org/request/show/27606
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=57
This commit is contained in:
Vincent Untz 2009-12-24 15:27:00 +00:00 committed by Git OBS Bridge
parent 4c54e63d11
commit 626d1e4cbf
6 changed files with 123 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-control-center-2.28.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7e925a6247ff03b5c1bbb50aedc8bcf69e7497d6a47c42e1b867e5c6c3b1f54
size 2294617

3
gnome-control-center-2.29.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2dbf9f15b53663fb2839572b81ee5c52385b4228dc2034dfd962940547032eca
size 2876139

86
gnome-control-center-default-app-xterm.patch
View File

@ -1,86 +0,0 @@
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

28
gnome-control-center-shell-common-tasks-i18n.patch Normal file
View File

@ -0,0 +1,28 @@
Index: gnome-control-center-2.27.91/shell/control-center.c
===================================================================
--- gnome-control-center-2.27.91.orig/shell/control-center.c
+++ gnome-control-center-2.27.91/shell/control-center.c
@@ -35,6 +35,14 @@ static GSList *get_actions_list ();
#define CONTROL_CENTER_ACTIONS_SEPARATOR ";"
#define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action"
+#define COMMON_TASK_1 N_("Change Look and Feel")
+#define COMMON_TASK_2 N_("Set Preferred Applications")
+#define COMMON_TASK_3 N_("Configure Printer")
+#define COMMON_TASK_4 N_("Configure Network")
+#define COMMON_TASK_5 N_("Edit Personal Information")
+#define COMMON_TASK_6 N_("Add User")
+#define COMMON_TASK_7 N_("Open Administrator Settings")
+
static GSList *
get_actions_list (void)
{
@@ -57,7 +65,7 @@ get_actions_list (void)
action = g_new (AppAction, 1);
temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2);
- action->name = g_strdup (temp[0]);
+ action->name = g_strdup (_(temp[0]));
if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL)
{
g_warning ("get_actions_list() - PROBLEM - Can't load %s\n", temp[1]);

82
gnome-control-center.changes
View File

@ -1,3 +1,85 @@
-------------------------------------------------------------------
Thu Dec 24 14:58:02 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.4:
+ General:
- Drop obsolete check for HAL (bgo#595832)
- Use external libslab when available
- Add gthread-2.0 to common modules for linking (bgo#600589)
- Enable silent build rules
+ Common:
- Fix all the keybindings showing up when using compiz
(bgo#600021)
- Fix leak
- Fix warning
+ About-me:
- Fix crash when closing the window using the window button
(bgo#592348)
- Add missing PNG files
+ Appearance:
- Remove interface tab (bgo#592756)
- Add OnlyShowIn=GNOME to the .desktop file (bgo#594709)
- Update the background style option labels (bgo#411048)
- Fix tooltip in the background chooser (bgo#596369)
- Add support for per-monitor backgrounds (bgo#147808)
+ Default applications:
- Update the exec arg when changing terminal (bgo#597185)
- Be sure to add the gconf directories for monitoring
(bgo#597186)
- Return an empty string for the custom web item
+ Display:
- Don't assert when the current output doesn't have a
resolution set yet (bgo#593866)
- Automatically turn on outputs which support Mirror Screens
(bgo#590823)
- Sensitize 'Mirror Screens' depending on whether mirror mode
is actually supported
- Desensitize the on/off radio buttons if we are in Mirror
Screens mode
- Show 'Mirror Screens' in the monitor label, not a random
monitor's name
+ Font Viewer:
- Use pango_language_get_sample_string for sample text
(bgo#595107)
- Expand the Copyright display to get rid of unnecessary
scrollbar
- Don't use URI notation when installing fonts (bgo#603732)
+ Keybindings:
- Fix broken logic in keybinding tree model
- Fix zombie bindings appearing after deleting custom shortcuts
(bgo#596351)
- Show shortcuts for the active window manager (bgo#600531)
- Remove sleep key entry (bgo#170175)
+ Keyboard:
- Major UI reorganization
- Fix mnemonic conflict in mousekeys tab (bgo#586433)
+ Mouse:
- Disable two-finger scrolling/tapping based on touchpad
capabilities.
+ Network:
- Keep proxies in sync when "use same proxy" is selected
(bgo#589952)
+ Typing break:
- Increase delay for activating the postpone button to 5s
(bgo#597086)
- Reset timer after suspend (bgo#430797)
+ Windows:
- Don't allow Ctrl+Click as window movement modifier
(bgo#409405)
+ Updated translations.
- Drop gnome-control-center-default-app-xterm.patch: fixed
upstream.
- Add libslab-devel BuildRequires.
-------------------------------------------------------------------
Thu Dec 24 12:36:44 CET 2009 - vuntz@opensuse.org
- Add gnome-control-center-shell-common-tasks-i18n.patch to
translate favorite capplets, as set in gconf2-branding. This
patch needs to be kept in sync with the branding package.
- Add gnome-patch-translation BuildRequires, since we now have
custom strings.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 3 19:09:18 UTC 2009 - coolo@novell.com Tue Nov 3 19:09:18 UTC 2009 - coolo@novell.com

16
gnome-control-center.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-control-center (Version 2.28.0) # spec file for package gnome-control-center (Version 2.29.4)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -26,10 +26,12 @@ BuildRequires: gnome-common
BuildRequires: gnome-desktop-devel BuildRequires: gnome-desktop-devel
BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-menus-devel BuildRequires: gnome-menus-devel
BuildRequires: gnome-patch-translation
BuildRequires: gnome-settings-daemon-devel BuildRequires: gnome-settings-daemon-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libgnomekbd-devel BuildRequires: libgnomekbd-devel
BuildRequires: librsvg-devel BuildRequires: librsvg-devel
BuildRequires: libslab-devel
BuildRequires: libunique-devel BuildRequires: libunique-devel
BuildRequires: libxklavier-devel BuildRequires: libxklavier-devel
BuildRequires: metacity-devel BuildRequires: metacity-devel
@ -39,10 +41,12 @@ 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.28.0 Version: 2.29.4
Release: 3 Release: 1
Summary: The GNOME Control Center Summary: The GNOME Control Center
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-control-center-shell-common-tasks-i18n.patch vuntz@opensuse.org -- Translate favorite capplets in the code. This is needed for our gconf2-branding to really work for this setting, so keep in sync with gconf2-branding.
Patch0: gnome-control-center-shell-common-tasks-i18n.patch
# PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts. # PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts.
Patch1: gnome-control-center-bnc427745-force-dpi.patch Patch1: gnome-control-center-bnc427745-force-dpi.patch
# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
@ -53,8 +57,6 @@ 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}
@ -102,13 +104,15 @@ of window managers.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
gnome-patch-translation-prepare
%patch0 -p1
%patch1 -p1 %patch1 -p1
#NEEDS-REBASE #NEEDS-REBASE
#%patch14 -p1 #%patch14 -p1
%patch28 %patch28
%patch30 -p1 %patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1 gnome-patch-translation-update
%build %build
autoreconf -f -i autoreconf -f -i