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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=6

Browse Source
This commit is contained in:
OBS User unknown 2008-06-25 17:20:13 +00:00 committed by Git OBS Bridge
parent 609f327b8e
commit a8f1b2a3f1
5 changed files with 265 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

294
gnome-control-center-system-proxy-configuration.patch
View File

@ -1,64 +1,20 @@
Index: capplets/network/gnome-network-preferences.glade
===================================================================
--- capplets/network/gnome-network-preferences.glade (revision 7885)
+++ capplets/network/gnome-network-preferences.glade (working copy)
@@ -85,6 +85,25 @@
<property name="spacing">18</property>
<child>
+ <widget class="GtkRadioButton" id="system_radiobutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Use the s_ystem's proxy settings&lt;/b&gt;</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkRadioButton" id="none_radiobutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -95,6 +114,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+ <property name="group">system_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -126,7 +146,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">none_radiobutton</property>
+ <property name="group">system_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -669,7 +689,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">none_radiobutton</property>
+ <property name="group">system_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
Index: capplets/network/gnome-network-preferences.c
===================================================================
--- capplets/network/gnome-network-preferences.c (revision 7885)
+++ capplets/network/gnome-network-preferences.c (working copy)
@@ -32,20 +32,12 @@
From 4cb70bde30d3dacb45a0674aae6f22bd739a2e3b Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 13 Jun 2008 03:55:41 -0500
Subject: [PATCH 1/2] Integrate GNOME's proxy configuration with openSUSE's
This is documented in http://en.opensuse.org/GNOME/Proxy_configuration
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
capplets/network/gnome-network-preferences.c | 149 ++++++++++++++++------
capplets/network/gnome-network-preferences.glade | 24 +++-
2 files changed, 129 insertions(+), 44 deletions(-)
diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c
index 9176476..11fd88e 100644
--- a/capplets/network/gnome-network-preferences.c
+++ b/capplets/network/gnome-network-preferences.c
@@ -32,19 +32,11 @@
#include "capplet-util.h"
#include "gconf-property-editor.h"
@ -68,23 +24,22 @@ Index: capplets/network/gnome-network-preferences.c
- PROXYMODE_MANUAL,
- PROXYMODE_AUTO
-};
+/* Novell extension */
+#define KEY_USE_SYSTEM_SETTINGS "/system/proxy/use_system_settings" /* string */
+#define VAL_USE_SYSTEM_SETTINGS_ONLY_IF_NOT_SET "only_if_mode_not_set"
+#define VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES "system_values"
+#define VAL_USE_SYSTEM_SETTINGS_USER_VALUES "user_values"
-
-static GEnumValue proxytype_values[] = {
- { PROXYMODE_NONE, "PROXYMODE_NONE", "none"},
- { PROXYMODE_MANUAL, "PROXYMODE_MANUAL", "manual"},
- { PROXYMODE_AUTO, "PROXYMODE_AUTO", "auto"},
- { 0, NULL, NULL }
-};
-
+/* Novell extension */
+#define KEY_USE_SYSTEM_SETTINGS "/system/proxy/use_system_settings" /* string */
+#define VAL_USE_SYSTEM_SETTINGS_ONLY_IF_NOT_SET "only_if_mode_not_set"
+#define VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES "system_values"
+#define VAL_USE_SYSTEM_SETTINGS_USER_VALUES "user_values"
#define USE_PROXY_KEY "/system/http_proxy/use_http_proxy"
#define USE_SAME_PROXY_KEY "/system/http_proxy/use_same_proxy"
#define HTTP_PROXY_HOST_KEY "/system/http_proxy/host"
@@ -363,29 +355,40 @@
@@ -363,29 +355,40 @@ static void
proxy_mode_radiobutton_clicked_cb (GtkWidget *widget,
GladeXML *dialog)
{
@ -147,7 +102,7 @@ Index: capplets/network/gnome-network-preferences.c
}
static void
@@ -399,34 +401,96 @@
@@ -399,34 +402,96 @@ connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group)
}
}
@ -166,7 +121,7 @@ Index: capplets/network/gnome-network-preferences.c
+ return WID ("none_radiobutton");
+}
+
static void
+static void
+mode_set_initial_value (GladeXML *dialog, GConfClient *client)
+{
+ char *use_system_settings;
@ -217,7 +172,7 @@ Index: capplets/network/gnome-network-preferences.c
+ gconf_value_free (mode_value);
+}
+
+static void
static void
setup_dialog (GladeXML *dialog)
{
GConfPropertyEditor *peditor;
@ -251,3 +206,196 @@ Index: capplets/network/gnome-network-preferences.c
/* Use same proxy for all protocols */
peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_boolean (NULL,
diff --git a/capplets/network/gnome-network-preferences.glade b/capplets/network/gnome-network-preferences.glade
index 1ab334e..d37baec 100644
--- a/capplets/network/gnome-network-preferences.glade
+++ b/capplets/network/gnome-network-preferences.glade
@@ -85,6 +85,25 @@
<property name="spacing">18</property>
<child>
+ <widget class="GtkRadioButton" id="system_radiobutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Use the s_ystem's proxy settings&lt;/b&gt;</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkRadioButton" id="none_radiobutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -95,6 +114,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+ <property name="group">system_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -126,7 +146,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">none_radiobutton</property>
+ <property name="group">system_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -669,7 +689,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">none_radiobutton</property>
+ <property name="group">system_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
--
1.5.4.5
From ed0ada43be0102fbecc3d2a38cfb5ce69406581e Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 13 Jun 2008 04:23:41 -0500
Subject: [PATCH 2/2] bnc350513 - Manual config widgets are disabled at startup
2008-06-13 Federico Mena Quintero <federico@novell.com>
https://bugzilla.novell.com/show_bug.cgi?id=350513 - Widgets for
manual proxy configuration are disabled on startup, even if Manual
configuration was selected.
* gnome-network-preferences.c
(set_sensitivity_based_on_active_radiobutton): New function;
extract the sensitivity logic from proxy_mode_radiobutton_clicked_cb().
(mode_set_initial_value): Set the initial sensitivity of the data
widgets with the function above.
(proxy_mode_radiobutton_clicked_cb): Use
set_sensitivity_based_on_active_radiobutton() instead of setting
the sensitivity here directly.
(connect_mode_radiobuttons): Renamed from
connect_sensitivity_signals() as the callback doesn't really have
to do with sensitivity.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
capplets/network/gnome-network-preferences.c | 41 +++++++++++++++++---------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c
index 11fd88e..7c90181 100644
--- a/capplets/network/gnome-network-preferences.c
+++ b/capplets/network/gnome-network-preferences.c
@@ -352,17 +352,34 @@ extract_proxy_host (GConfPropertyEditor *peditor, const GConfValue *orig)
}
static void
+set_sensitivity_based_on_active_radiobutton (GladeXML *dialog, GtkWidget *active_radio)
+{
+ gboolean manual_box_sensitive, auto_box_sensitive;
+
+ g_assert (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (active_radio)));
+
+ manual_box_sensitive = auto_box_sensitive = FALSE;
+
+ if (active_radio == WID ("manual_radiobutton"))
+ manual_box_sensitive = TRUE;
+ else if (active_radio == WID ("auto_radiobutton"))
+ auto_box_sensitive = TRUE;
+
+ gtk_widget_set_sensitive (WID ("manual_box"), manual_box_sensitive);
+ gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"), manual_box_sensitive);
+ gtk_widget_set_sensitive (WID ("auto_box"), auto_box_sensitive);
+}
+
+static void
proxy_mode_radiobutton_clicked_cb (GtkWidget *widget,
GladeXML *dialog)
{
GConfClient *client;
- gboolean manual_box_sensitive, auto_box_sensitive;
-
+
if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget)))
return;
client = gconf_client_get_default ();
- manual_box_sensitive = auto_box_sensitive = FALSE;
if (widget == WID ("system_radiobutton")) {
gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES, NULL);
@@ -371,28 +388,22 @@ proxy_mode_radiobutton_clicked_cb (GtkWidget *widget,
gconf_client_set_string (client, PROXY_MODE_KEY, "none", NULL);
gconf_client_set_bool (client, USE_PROXY_KEY, FALSE, NULL);
} else if (widget == WID ("manual_radiobutton")) {
- manual_box_sensitive = TRUE;
-
gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL);
gconf_client_set_string (client, PROXY_MODE_KEY, "manual", NULL);
gconf_client_set_bool (client, USE_PROXY_KEY, TRUE, NULL);
} else if (widget == WID ("auto_radiobutton")) {
- auto_box_sensitive = TRUE;
-
gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL);
gconf_client_set_string (client, PROXY_MODE_KEY, "auto", NULL);
gconf_client_set_bool (client, USE_PROXY_KEY, TRUE, NULL);
}
- gtk_widget_set_sensitive (WID ("manual_box"), manual_box_sensitive);
- gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"), manual_box_sensitive);
- gtk_widget_set_sensitive (WID ("auto_box"), auto_box_sensitive);
+ set_sensitivity_based_on_active_radiobutton (dialog, widget);
g_object_unref (client);
}
static void
-connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group)
+connect_mode_radiobuttons (GladeXML *dialog, GSList *mode_group)
{
for (; mode_group != NULL; mode_group = mode_group->next)
{
@@ -416,7 +427,7 @@ get_radio_for_mode (GladeXML *dialog, const char *mode_str)
else
return WID ("none_radiobutton");
}
-
+
static void
mode_set_initial_value (GladeXML *dialog, GConfClient *client)
{
@@ -461,8 +472,10 @@ mode_set_initial_value (GladeXML *dialog, GConfClient *client)
radiobutton = get_radio_for_mode (dialog, gconf_value_get_string (mode_value));
}
- if (radiobutton)
+ if (radiobutton) {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton), TRUE);
+ set_sensitivity_based_on_active_radiobutton (dialog, radiobutton);
+ }
if (mode_value)
gconf_value_free (mode_value);
@@ -490,7 +503,7 @@ setup_dialog (GladeXML *dialog)
/* Mode */
mode_set_initial_value (dialog, client);
mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("system_radiobutton")));
- connect_sensitivity_signals (dialog, mode_group);
+ connect_mode_radiobuttons (dialog, mode_group);
/* Use same proxy for all protocols */
--
1.5.4.5

21
gnome-control-center.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Fri Jun 20 17:49:37 CEST 2008 - maw@suse.de
- Update to version 2.23.4:
+ Various fixes and improvements
+ Drop the gnome-vfs dependency
+ Bugs fixed: bgo#309629, bgo#532893, bgo#317835, bgo#515078,
bgo#526944, bgo#528196, bgo#519065, bgo#500276, bgo#524401,
bgo#524401, bgo#511065, bgo#528196, bgo#524813, bgo#521826,
bgo#529772, bgo#515078, bgo#527418, bgo#314883, bgo#523888,
bgo#525530, bgo#529720, bgo#134595, and bgo#329503
+ Updated translations.
-------------------------------------------------------------------
Fri Jun 13 11:58:10 CEST 2008 - federico@novell.com
- Updated gnome-control-center-system-proxy-configuration.patch to fix
https://bugzilla.novell.com/show_bug.cgi?id=350513 - the widgets for
manual proxy configuration were disabled at startup, even if Manual
mode was selected in the user's configuration.
-------------------------------------------------------------------
Thu May 29 20:40:32 CEST 2008 - federico@novell.com

25
gnome-control-center.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-control-center (Version 2.22.1)
# spec file for package gnome-control-center (Version 2.23.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -18,8 +18,8 @@ License: GPL v2 or later
Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.22.1
Release: 27
Version: 2.23.4
Release: 1
Summary: The GNOME Control Center
Source: gnome-%{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
@ -34,7 +34,7 @@ Patch6: gnome-control-center-backout-309558.patch
Patch8: gnome-control-center-passwd-dialog.patch
# PATCH-FIX-OPENSUSE gnome-control-center-docpath.patch
Patch13: gnome-control-center-docpath.patch
# PATCH-FIX-UPSTREAM gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream
# PATCH-FIX-UPSTREAM 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
Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-default-applications-ftp+news.patch bgo426638 sbrabec@suse.cz -- this has been rejected upstream
Patch15: gnome-control-center-default-applications-ftp+news.patch
@ -101,7 +101,7 @@ gnome-patch-translation-prepare
%patch6
%patch8 -p1
%patch13
%patch14 -p0
%patch14 -p1
cp %{S:3} capplets/passwd/change-password.png
%patch28
%patch29 -p1
@ -227,6 +227,21 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Fri Jun 20 2008 maw@suse.de
- Update to version 2.23.4:
+ Various fixes and improvements
+ Drop the gnome-vfs dependency
+ Bugs fixed: bgo#309629, bgo#532893, bgo#317835, bgo#515078,
bgo#526944, bgo#528196, bgo#519065, bgo#500276, bgo#524401,
bgo#524401, bgo#511065, bgo#528196, bgo#524813, bgo#521826,
bgo#529772, bgo#515078, bgo#527418, bgo#314883, bgo#523888,
bgo#525530, bgo#529720, bgo#134595, and bgo#329503
+ Updated translations.
* Fri Jun 13 2008 federico@novell.com
- Updated gnome-control-center-system-proxy-configuration.patch to fix
https://bugzilla.novell.com/show_bug.cgi?id=350513 - the widgets for
manual proxy configuration were disabled at startup, even if Manual
mode was selected in the user's configuration.
* Thu May 29 2008 federico@novell.com
- Updated gnome-control-center-randr-1.2.diff with the latest fixes from upstream.
* Tue May 13 2008 vuntz@suse.de