Hello community,
here is the log from the commit of package gnome-control-center for openSUSE:Factory
checked in at Thu May 28 04:48:30 CEST 2009.
--------
--- GNOME/gnome-control-center/gnome-control-center.changes 2009-03-17 02:39:07.000000000 +0100
+++ gnome-control-center/gnome-control-center.changes 2009-05-27 17:13:18.000000000 +0200
@@ -1,0 +2,18 @@
+Wed May 27 16:49:10 CEST 2009 - vuntz@novell.com
+
+- Remove gnome-passwd and enable gnome-about-me instead (which
+ requires --enable-aboutme in configure).
+- Add PolicyKit-gnome-devel BuildRequires.
+- Remove gnome-patch-translation support.
+- Drop control-center-art.tar.bz2 which contains old icons.
+- Do not add DocPath to desktop files: it's not needed for yelp.
+- Rename gnome-control-center-system-proxy-configuration.diff to
+ gnome-control-center-system-proxy-configuration.patch
+
+-------------------------------------------------------------------
+Mon May 25 14:48:25 CDT 2009 - federico@novell.com
+
+- Updated and enabled gnome-control-center-system-proxy-configuration.patch
+ so that it builds with this version of gnome-control-center.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
change-password.png
control-center-art.tar.bz2
gnome-control-center-passwd-dialog.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.F12144/_old 2009-05-28 04:46:17.000000000 +0200
+++ /var/tmp/diff_new_pack.F12144/_new 2009-05-28 04:46:17.000000000 +0200
@@ -19,6 +19,7 @@
Name: gnome-control-center
+BuildRequires: PolicyKit-gnome-devel
BuildRequires: desktop-file-utils
BuildRequires: evolution-data-server-devel
BuildRequires: fdupes
@@ -27,7 +28,6 @@
BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-menus-devel
BuildRequires: gnome-panel-devel
-BuildRequires: gnome-patch-translation
BuildRequires: gnome-settings-daemon-devel
BuildRequires: gstreamer010-plugins-base-devel
BuildRequires: intltool
@@ -36,8 +36,6 @@
BuildRequires: librsvg-devel
BuildRequires: libxklavier-devel
BuildRequires: metacity-devel
-BuildRequires: pam-devel
-BuildRequires: scrollkeeper
BuildRequires: update-desktop-files
BuildRequires: xorg-x11
License: GPL v2 or later
@@ -45,16 +43,12 @@
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.26.0
-Release: 1
+Release: 2
Summary: The GNOME Control Center
Source: %{name}-%{version}.tar.bz2
-Source1: control-center-art.tar.bz2
-Source3: change-password.png
# 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
-# PATCH-FEATURE-OPENSUSE gnome-control-center-passwd-dialog.patch
-Patch8: gnome-control-center-passwd-dialog.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
+# PATCH-FEATURE-OPENSUSE 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-use-settings-menu.patch
Patch28: gnome-control-center-use-settings-menu.patch
@@ -99,15 +93,11 @@
%lang_package
%prep
-%setup -q -n %{name}-%{version} -a 1
-gnome-patch-translation-prepare
+%setup -q -n %{name}-%{version}
%patch1 -p1
-%patch8 -p1
-#%patch14 -p1
-cp %{S:3} capplets/passwd/change-password.png
+%patch14 -p1
%patch28
%patch30 -p1
-gnome-patch-translation-update
%build
autoreconf -f -i
@@ -115,7 +105,8 @@
--libexecdir=%{_prefix}/lib/control-center-2.0\
--disable-static\
--disable-scrollkeeper\
- --disable-update-mimedb
+ --disable-update-mimedb\
+ --enable-aboutme
make %{?jobs:-j%jobs}
%install
@@ -123,9 +114,9 @@
%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings
# capplets
%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal
-%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustdoc-2" default-applications X-SuSE-ControlCenter-System DesktopSettings AdvancedSettings
+%suse_update_desktop_file default-applications X-SuSE-ControlCenter-System DesktopSettings AdvancedSettings
%suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware
-%suse_update_desktop_file gnome-passwd X-SuSE-ControlCenter-Personal
+%suse_update_desktop_file gnome-about-me X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-network-properties X-SuSE-ControlCenter-System AdvancedSettings
%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-appearance-properties X-SuSE-ControlCenter-LookAndFeel
@@ -136,7 +127,6 @@
%suse_update_desktop_file gnome-font-viewer
%suse_update_desktop_file gnome-theme-installer
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
-cp control-center-art/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
%find_lang %{name}-2.0
%find_gconf_schemas
cat %{name}.schemas_list >gnome-%{name}.lst
@@ -182,9 +172,7 @@
%doc %{_datadir}/omf/control-center
%{_libdir}/*.so.*
%{_libdir}/window-manager-settings
-%verify (not mode) %attr (4755, root, root) %{_sbindir}/change-passwd
%{_sysconfdir}/xdg/menus/gnomecc.menu
-%{_sysconfdir}/pam.d/gnome-passwd
%files lang -f %{name}-2.0.lang
@@ -196,6 +184,18 @@
%{_datadir}/pkgconfig/*.pc
%changelog
+* Wed May 27 2009 vuntz@novell.com
+- Remove gnome-passwd and enable gnome-about-me instead (which
+ requires --enable-aboutme in configure).
+- Add PolicyKit-gnome-devel BuildRequires.
+- Remove gnome-patch-translation support.
+- Drop control-center-art.tar.bz2 which contains old icons.
+- Do not add DocPath to desktop files: it's not needed for yelp.
+- Rename gnome-control-center-system-proxy-configuration.diff to
+ gnome-control-center-system-proxy-configuration.patch
+* Mon May 25 2009 federico@novell.com
+- Updated and enabled gnome-control-center-system-proxy-configuration.patch
+ so that it builds with this version of gnome-control-center.
* Tue Mar 17 2009 vuntz@novell.com
- Update to version 2.26.0:
+ About me:
@@ -419,7 +419,7 @@
* Wed Aug 20 2008 sbrabec@suse.cz
- Require gnome-menus - gnome-control-center binary requires
/etc/xdg/menus/preferences.menu.
-* Mon Aug 18 2008 federico@novell.com
+* Tue Aug 19 2008 federico@novell.com
- Updated gnome-control-center-monitor-labeling.diff so that it applies cleanly.
* Fri Aug 15 2008 federico@novell.com
- Added gnome-control-center-monitor-labeling.diff to implement
@@ -459,12 +459,12 @@
* Fri Apr 25 2008 federico@novell.com
- Added gnome-control-center-randr-1.2.diff to integrate the new
functionality to configure RandR 1.2.
-* Mon Apr 14 2008 ro@suse.de
+* Tue Apr 15 2008 ro@suse.de
- added also provides for old name, not just obsoletes
* Mon Apr 14 2008 rodrigo@suse.de
- Renamed to gnome-control-center, like upstream
- Removed desktop-effects patch, moved to simple-ccsm
-* Thu Apr 10 2008 maw@suse.de
+* Fri Apr 11 2008 maw@suse.de
- Update to version 2.22.1:
+ appearance:
* Don't resize the font samples vertically when the window is
@@ -516,7 +516,7 @@
+ Updated translations.
* Thu Mar 13 2008 sbrabec@suse.cz
- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
-* Tue Mar 04 2008 maw@suse.de
+* Wed Mar 05 2008 maw@suse.de
- Update to version 2.21.92:
+ http://ftp.acc.umu.se/pub/GNOME/sources/gnome-control-center/2.21/gnome-control-center-2.21.9[12].news.
* Mon Feb 04 2008 rodrigo@suse.de
@@ -567,7 +567,7 @@
+ Updated translations.
* Mon Sep 10 2007 rodrigo@suse.de
- Remove workaround for upstream bug already fixed (#223798)
-* Wed Sep 05 2007 maw@suse.de
+* Thu Sep 06 2007 maw@suse.de
- Add control-center2-default-keybindings-thoenig-01.patch
(#297640).
* Fri Aug 31 2007 maw@suse.de
@@ -938,7 +938,7 @@
- Updated the passwd-dialog patch to pass through messages from PAM.
This is necessary for the PAM Winbind module, as it informs the
user of password policies and more complex error situations.
-* Thu Jan 12 2006 sreeves@suse.de
+* Fri Jan 13 2006 sreeves@suse.de
- Add X-Ximian-Settings to default-applications.desktop. Fix for Bug#141104
* Mon Dec 26 2005 federico@novell.com
- Added control-center2-system-proxy-configuration.diff. This was
@@ -975,9 +975,9 @@
* Mon Aug 22 2005 gekker@suse.de
- Update to 2.11.92
- Remove upstreamed theme-thumbnail patch
-* Sun Aug 21 2005 ro@suse.de
+* Mon Aug 22 2005 ro@suse.de
- added pangoxft to liblist
-* Thu Aug 18 2005 gekker@suse.de
+* Fri Aug 19 2005 gekker@suse.de
- Fix theme-thumbnail
* Tue Aug 16 2005 rodrigo@suse.de
- Added gnome-passwd patch from SP2.
@@ -1020,7 +1020,7 @@
directories.
* Tue Mar 15 2005 sbrabec@suse.cz
- Symlink desktop icon to standard location (#72818).
-* Thu Mar 10 2005 gekker@suse.de
+* Fri Mar 11 2005 gekker@suse.de
- Add new version of the system-proxy-configuration patch (71202).
* Thu Mar 10 2005 gekker@suse.de
- Update to version 2.10.0 (GNOME 2.10).
++++++ gnome-control-center-system-proxy-configuration.patch ++++++
--- /var/tmp/diff_new_pack.F12144/_old 2009-05-28 04:46:17.000000000 +0200
+++ /var/tmp/diff_new_pack.F12144/_new 2009-05-28 04:46:17.000000000 +0200
@@ -1,19 +1,24 @@
-From 4cb70bde30d3dacb45a0674aae6f22bd739a2e3b Mon Sep 17 00:00:00 2001
+From 067cc33aba6eeaffd4efe1d8a8e838aa1a89476a Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero
-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
+Date: Mon, 25 May 2009 14:38:52 -0500
+Subject: [PATCH] Integrate openSUSE's network proxy configuration with GNOME's.
+
+This is documented in http://en.opensuse.org/GNOME/Proxy_configuration
+
+We basically add a "use system settings" proxy mode. When it is active,
+gnome-settings-daemon will read /etc/sysconfig/proxy and mirror its values
+into GNOME's GConf space.
Signed-off-by: Federico Mena Quintero
---
- capplets/network/gnome-network-preferences.c | 149 ++++++++++++++++------
- capplets/network/gnome-network-preferences.glade | 24 +++-
- 2 files changed, 129 insertions(+), 44 deletions(-)
+ capplets/network/gnome-network-properties.c | 164 +++++++++++++++++------
+ capplets/network/gnome-network-properties.glade | 24 +++-
+ 2 files changed, 143 insertions(+), 45 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
+diff --git a/capplets/network/gnome-network-properties.c b/capplets/network/gnome-network-properties.c
+index f6ea0e6..0ea9945 100644
+--- a/capplets/network/gnome-network-properties.c
++++ b/capplets/network/gnome-network-properties.c
@@ -32,19 +32,11 @@
#include "capplet-util.h"
#include "gconf-property-editor.h"
@@ -37,16 +42,39 @@
+#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"
-@@ -363,29 +355,40 @@ static void
+ enum {
+ COL_NAME,
+@@ -1019,36 +1011,58 @@ 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)
{
- GSList *mode_group;
- int mode;
- GConfClient *client;
--
++ GConfClient *client;
+
- if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget)))
- return;
-
@@ -62,9 +90,6 @@
- mode == PROXYMODE_MANUAL);
- gtk_widget_set_sensitive (WID ("auto_box"),
- mode == PROXYMODE_AUTO);
-+ GConfClient *client;
-+ gboolean manual_box_sensitive, auto_box_sensitive;
-+
+ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget)))
+ return;
+
@@ -72,7 +97,6 @@
- gconf_client_set_bool (client, USE_PROXY_KEY,
- mode == PROXYMODE_AUTO || mode == PROXYMODE_MANUAL, NULL);
- g_object_unref (client);
-+ 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);
@@ -81,28 +105,27 @@
+ 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
-@@ -399,34 +402,96 @@ connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group)
+-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)
+ {
+@@ -1058,20 +1072,85 @@ connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group)
}
}
@@ -120,7 +143,7 @@
+ else
+ return WID ("none_radiobutton");
+}
-+
++
+static void
+mode_set_initial_value (GladeXML *dialog, GConfClient *client)
+{
@@ -165,8 +188,10 @@
+ radiobutton = get_radio_for_mode (dialog, gconf_value_get_string (mode_value));
+ }
+
-+ if (radiobutton)
-+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton), TRUE);
++ 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);
@@ -180,13 +205,17 @@
- GType mode_type = 0;
GConfClient *client;
gint port_value;
+ GtkWidget *location_box;
+ GtkCellRenderer *location_renderer;
+ GtkListStore *store;
- mode_type = g_enum_register_static ("NetworkPreferencesProxyType",
- proxytype_values);
/* There's a bug in peditors that cause them to not initialize the entry
* correctly. */
- client = gconf_client_get_default ();
+@@ -1100,17 +1179,16 @@ setup_dialog (GladeXML *dialog)
+ "style", COL_STYLE, NULL);
/* Hackety hack */
+ gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("system_radiobutton"))->child), TRUE);
@@ -196,9 +225,10 @@
/* Mode */
- mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("none_radiobutton")));
+- connect_sensitivity_signals (dialog, mode_group);
+ 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);
- peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_select_radio_with_enum (NULL,
- PROXY_MODE_KEY, mode_group, mode_type,
@@ -206,11 +236,11 @@
/* 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 @@
+diff --git a/capplets/network/gnome-network-properties.glade b/capplets/network/gnome-network-properties.glade
+index 656acb5..1147f17 100644
+--- a/capplets/network/gnome-network-properties.glade
++++ b/capplets/network/gnome-network-properties.glade
+@@ -130,6 +130,25 @@
<property name="spacing">18</property>
<child>
@@ -236,7 +266,7 @@
<widget class="GtkRadioButton" id="none_radiobutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
-@@ -95,6 +114,7 @@
+@@ -140,6 +159,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -244,7 +274,7 @@
</widget>
<packing>
<property name="padding">0</property>
-@@ -126,7 +146,7 @@
+@@ -171,7 +191,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -253,7 +283,7 @@
</widget>
<packing>
<property name="padding">0</property>
-@@ -669,7 +689,7 @@
+@@ -714,7 +734,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -263,139 +293,5 @@
<packing>
<property name="padding">0</property>
--
-1.5.4.5
-
-
-From ed0ada43be0102fbecc3d2a38cfb5ce69406581e Mon Sep 17 00:00:00 2001
-From: Federico Mena Quintero
-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
-
- 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
----
- 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
+1.6.0.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org