Hello community,
here is the log from the commit of package control-center2
checked in at Fri Mar 16 10:10:27 CET 2007.
--------
--- GNOME/control-center2/control-center2.changes 2007-03-08 17:13:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes 2007-03-16 00:44:26.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Mar 15 17:06:17 CST 2007 - maw@suse.de
+
+- Update to version 2.17.91
+- Refresh a number of patches.
+- Bug fixes include bugzilla.gnome.org #402797, #358106, #380991,
+ #395383, #401004, #397905...
+
+-------------------------------------------------------------------
Old:
----
control-center-2.16.1.tar.bz2
New:
----
control-center-2.17.91.tar.bz2
jhmfc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ control-center2.spec ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:52.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package control-center2 (Version 2.16.1)
+# spec file for package control-center2 (Version 2.17.91)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,13 +12,13 @@
Name: control-center2
%define _name control-center
-BuildRequires: desktop-file-utils docbook-xsl-stylesheets gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-patch-translation gstreamer010-plugins-base-devel intltool libglade2-devel libidl libxklavier-devel mDNSResponder-devel metacity-devel nautilus-devel pam-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files xorg-x11
+BuildRequires: desktop-file-utils docbook-xsl-stylesheets gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-panel-devel gnome-patch-translation gstreamer010-plugins-base-devel intltool libglade2-devel libgnomekbd-devel libidl librsvg-devel libxklavier-devel mDNSResponder-devel metacity-devel nautilus-devel pam-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files xorg-x11
License: GNU General Public License (GPL)
Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
-Version: 2.16.1
-Release: 47
+Version: 2.17.91
+Release: 1
Summary: The GNOME Control Center for the GNOME 2.x Desktop
Source: %{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
@@ -38,6 +38,7 @@
Patch20: control-center2-compiz-keybindings.patch
Patch22: control-center-2.12.2-beagle-search-hotkey.patch
Patch23: control-center2-217790-sanitize-dpi.diff
+Patch24: jhmfc.patch
Patch100: control-center2-po-update.patch
URL: http://www.gnome.org
Requires: nautilus
@@ -83,7 +84,8 @@
%prep
%setup -q -n %{_name}-%{version} -a 1 -a 2 -b 4
-%patch100
+# FIXME: fix these.
+# %patch100
gnome-patch-translation-prepare
%patch
%patch1
@@ -91,7 +93,8 @@
%patch3 -p1
%patch6
%patch8 -p1
-%patch12 -p1
+# FIXME: make this patch work again
+# %patch12 -p1
%patch13
%patch14 -p0
cp %{S:3} capplets/passwd/change-password.png
@@ -99,6 +102,7 @@
%patch20
%patch22 -p1
%patch23 -p1
+%patch24 -p1
gnome-patch-translation-update
%build
@@ -114,8 +118,8 @@
%install
%makeinstall
# DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime
-mkdir $RPM_BUILD_ROOT%{_datadir}/mime
-mkdir $RPM_BUILD_ROOT%{_datadir}/mime/packages
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
cp %{S:2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc Application DesktopSettings
# capplets
@@ -176,16 +180,27 @@
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_datadir}/applications/*.desktop
-%{_datadir}/control-center-2.0
+# %{_datadir}/control-center-2.0
%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome/cursor-fonts
%{_datadir}/gnome/help/control-center
%{_datadir}/gnome-background-properties
-%{_datadir}/gnome-default-applications
+%dir %{_datadir}/control-center/gnome-default-applications
+%{_datadir}/control-center/gnome-default-applications/gnome-default-applications.xml
%{_datadir}/icons/hicolor/48x48/*/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%dir %{_datadir}/control-center/icons
+%{_datadir}/control-center/icons/*.png
%{_datadir}/mime/packages/*.xml
%{_datadir}/omf/control-center
+%dir %{_datadir}/control-center
+%dir %{_datadir}/control-center/glade
+%{_datadir}/control-center/glade/*.glade
+%dir %{_datadir}/control-center/pixmaps
+%{_datadir}/control-center/pixmaps/*.png
+%dir %{_datadir}/control-center/xrdb
+%{_datadir}/control-center/xrdb/*.ad
%{_libdir}/*.so.*
%{_libdir}/gnome-vfs-2.0/modules/*.so
%{_libdir}/nautilus/extensions-1.0/*.so
@@ -194,6 +209,7 @@
%{_prefix}/lib/control-center-2.0
%verify (not mode) %attr (4755, root, root) %{_sbindir}/change-passwd
%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
+%{_sysconfdir}/xdg/menus/gnomecc.menu
/etc/pam.d/gnome-passwd
%if %suse_version <= 1020
/etc/permissions.d/*
@@ -201,14 +217,23 @@
%files devel
%defattr (-, root, root)
-%{_datadir}/idl/*.idl
+# %{_datadir}/idl/*.idl
%{_includedir}/gnome-settings-daemon-2.0
%{_includedir}/gnome-window-settings-2.0
+%dir %{_includedir}/slab
+%{_includedir}/slab/*.h
+# uhhh...
+%{_includedir}/slab/*.c
%{_libdir}/lib*.so
%{_libdir}/lib*.*a
%{_libdir}/pkgconfig/*.pc
%changelog
+* Thu Mar 15 2007 - maw@suse.de
+- Update to version 2.17.91
+- Refresh a number of patches.
+- Bug fixes include bugzilla.gnome.org #402797, #358106, #380991,
+ [#395383], #401004, #397905...
* Thu Mar 08 2007 - sbrabec@suse.cz
- Removed obsolete hicolor icon symlinks (#248676).
* Thu Mar 01 2007 - sbrabec@suse.cz
++++++ control-center-2.12.2-beagle-search-hotkey.patch ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:52.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:52.000000000 +0100
@@ -1,18 +1,19 @@
-diff -Nurp control-center-2.12.2-pre/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.12.2-post/gnome-settings-daemon/gnome-settings-multimedia-keys.c
---- control-center-2.12.2-pre/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2005-07-25 06:55:59.000000000 -0500
-+++ control-center-2.12.2-post/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-01 21:25:45.000000000 -0500
-@@ -45,6 +45,10 @@
- #include "actions/acme.h"
- #include "actions/acme-volume.h"
+Index: control-center-2.17.91/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+===================================================================
+--- control-center-2.17.91.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c
++++ control-center-2.17.91/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+@@ -41,6 +41,10 @@
+ #include "gsd-media-keys-window.h"
+ #include "gnome-settings-dbus.h"
+/* Potential search shortcut helpers */
+#define SEARCH_EXECUTABLE_BEAGLE "beagle-search"
+#define SEARCH_EXECUTABLE_GNOME_SEARCH_TOOL "gnome-search-tool"
+
- #define DIALOG_TIMEOUT 1000 /* dialog timeout in ms */
#define VOLUME_STEP 6 /* percents for one volume button press */
-
-@@ -822,7 +826,18 @@ do_action (Acme *acme, int type)
+
+ /* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what
+@@ -585,7 +589,18 @@ do_action (Acme *acme, int type)
execute ("nautilus", FALSE);
break;
case SEARCH_KEY:
++++++ control-center-2.16.1.tar.bz2 -> control-center-2.17.91.tar.bz2 ++++++
++++ 152109 lines of diff (skipped)
++++++ control-center2-217790-sanitize-dpi.diff ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:57.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:57.000000000 +0100
@@ -20,8 +20,10 @@
the value from the X server in a similar way to what we do in
gnome-settings-daemon.
---- control-center2/gnome-settings-daemon/gnome-settings-xsettings.c~ 2006-01-15 12:22:07.000000000 -0600
-+++ control-center2/gnome-settings-daemon/gnome-settings-xsettings.c 2006-11-22 18:50:19.000000000 -0600
+Index: control-center-2.17.91/gnome-settings-daemon/gnome-settings-xsettings.c
+===================================================================
+--- control-center-2.17.91.orig/gnome-settings-daemon/gnome-settings-xsettings.c
++++ control-center-2.17.91/gnome-settings-daemon/gnome-settings-xsettings.c
@@ -33,6 +33,20 @@ struct _TranslationEntry
};
@@ -133,8 +135,10 @@
if (rgba_order)
{
int i;
---- control-center2/capplets/font/main.c.orig 2006-11-22 19:54:59.000000000 -0600
-+++ control-center2/capplets/font/main.c 2006-11-22 20:07:54.000000000 -0600
+Index: control-center-2.17.91/capplets/font/main.c
+===================================================================
+--- control-center-2.17.91.orig/capplets/font/main.c
++++ control-center-2.17.91/capplets/font/main.c
@@ -41,6 +41,19 @@ static void cb_show_details (GtkWidget *
#define FONT_RGBA_ORDER_KEY FONT_RENDER_DIR "/rgba_order"
#define FONT_DPI_KEY FONT_RENDER_DIR "/dpi"
@@ -155,7 +159,7 @@
#endif /* HAVE_XFT2 */
static gboolean in_change = FALSE;
static gchar *old_font = NULL;
-@@ -760,6 +773,44 @@ enum_group_create (const gchar *
+@@ -772,6 +785,44 @@ enum_group_create (const gchar *
return group;
}
@@ -200,7 +204,7 @@
/*
* The font rendering details dialog
*/
-@@ -767,7 +818,16 @@ static void
+@@ -779,7 +830,16 @@ static void
dpi_load (GConfClient *client,
GtkSpinButton *spinner)
{
++++++ control-center2-backout-309558.patch ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:57.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:57.000000000 +0100
@@ -1,11 +1,13 @@
---- configure.in
+Index: configure.in
+===================================================================
+--- configure.in.orig
+++ configure.in
-@@ -23,7 +23,7 @@
+@@ -18,7 +18,7 @@ GNOME_DOC_INIT
m4_define(gnomevfs_minver, 2.0.0)
m4_define(fontconfig_minver, 1.0.0)
-m4_define(xft_minver, 2.1.2)
+m4_define(xft_minver, 2.0.0)
- m4_define(gtk_minver, 2.8.12)
+ m4_define(gtk_minver, 2.10.0)
m4_define(libbonobo_minver, 2.0.0)
m4_define(libgnomeui_minver, 2.2.0)
++++++ control-center2-passwd-dialog.patch ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:57.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:57.000000000 +0100
@@ -1,6 +1,8 @@
---- control-center-2.15.91/capplets/Makefile.am
-+++ control-center-2.15.91/capplets/Makefile.am
-@@ -3,7 +3,8 @@
+Index: control-center-2.17.91/capplets/Makefile.am
+===================================================================
+--- control-center-2.17.91.orig/capplets/Makefile.am
++++ control-center-2.17.91/capplets/Makefile.am
+@@ -3,7 +3,8 @@ always_built_SUBDIRS = \
default-applications font \
background keyboard mouse sound \
theme-switcher ui-properties \
@@ -10,14 +12,18 @@
SUBDIRS = $(always_built_SUBDIRS)
---- control-center-2.15.91/capplets/passwd/ChangeLog
-+++ control-center-2.15.91/capplets/passwd/ChangeLog
+Index: control-center-2.17.91/capplets/passwd/ChangeLog
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/ChangeLog
@@ -0,0 +1,2 @@
+2005-02-04 Shakti Sen
+ * Added the password change GUI utility
---- control-center-2.15.91/capplets/passwd/Makefile.am
-+++ control-center-2.15.91/capplets/passwd/Makefile.am
-@@ -0,0 +1,28 @@
+Index: control-center-2.17.91/capplets/passwd/Makefile.am
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/Makefile.am
+@@ -0,0 +1,37 @@
+SUBDIRS = pam
+bin_PROGRAMS = gnome-passwd
+
@@ -30,24 +36,35 @@
+
+@INTLTOOL_DESKTOP_RULE@
+
-+gladedir = $(GNOMECC_GLADE_DIR)
-+glade_DATA = gnome-passwd.glade
++Gladedir = $(pkgdatadir)/glade
++Glade_DATA = gnome-passwd.glade
+
-+pixmapdir = $(GNOMECC_PIXMAPS_DIR)
++pixmapdir = $(pkgdatadir)/pixmaps
+pixmap_DATA = change-password.png
+
+desktopdir = $(datadir)/applications
+desktop_in_files = gnome-passwd.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
-+INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(PASSWD_PAM_INCLUDEDIR)
++INCLUDES = \
++ $(GNOMECC_CAPPLETS_CFLAGS) \
++ $(PASSWD_PAM_INCLUDEDIR) \
++ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
++ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
++ -DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
++ -DINSTALL_PREFIX=\"$(prefix)\"
++
++
++
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
+EXTRA_DIST = $(glade_DATA) $(desktop_icons_DATA) $(desktop_in_files) $(desktop_DATA)
+
+install-exec-hook:
+ chmod o-r $(DESTDIR)$(bindir)/gnome-passwd
---- control-center-2.15.91/capplets/passwd/gnome-passwd.c
-+++ control-center-2.15.91/capplets/passwd/gnome-passwd.c
+Index: control-center-2.17.91/capplets/passwd/gnome-passwd.c
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/gnome-passwd.c
@@ -0,0 +1,214 @@
+/* gnome-passwd.c: password change capplet
+ *
@@ -263,8 +280,10 @@
+
+ return 0;
+}
---- control-center-2.15.91/capplets/passwd/gnome-passwd.desktop.in.in
-+++ control-center-2.15.91/capplets/passwd/gnome-passwd.desktop.in.in
+Index: control-center-2.17.91/capplets/passwd/gnome-passwd.desktop.in.in
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/gnome-passwd.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -281,8 +300,10 @@
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=password
+X-GNOME-Bugzilla-Version=@VERSION@
---- control-center-2.15.91/capplets/passwd/gnome-passwd.glade
-+++ control-center-2.15.91/capplets/passwd/gnome-passwd.glade
+Index: control-center-2.17.91/capplets/passwd/gnome-passwd.glade
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/gnome-passwd.glade
@@ -0,0 +1,318 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -602,8 +623,10 @@
+</widget>
+
+</glade-interface>
---- control-center-2.15.91/capplets/passwd/pam-passwd.c
-+++ control-center-2.15.91/capplets/passwd/pam-passwd.c
+Index: control-center-2.17.91/capplets/passwd/pam-passwd.c
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/pam-passwd.c
@@ -0,0 +1,255 @@
+/* pam-passwd.c: password change capplet
+ *
@@ -680,7 +703,7 @@
+ GString *snd_old_passwd;
+ GString *snd_new_passwd;
+ GString *snd_confirm_passwd;
-+ gchar* command[] = {PREFIX"/sbin/change-passwd", NULL};
++ gchar* command[] = {INSTALL_PREFIX "/sbin/change-passwd", NULL};
+ gchar output [OUTPUT_MAX];
+ gint output_i = 0;
+
@@ -860,8 +883,10 @@
+ gtk_main_quit ();
+ }
+}
---- control-center-2.15.91/capplets/passwd/pam-passwd.h
-+++ control-center-2.15.91/capplets/passwd/pam-passwd.h
+Index: control-center-2.17.91/capplets/passwd/pam-passwd.h
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/pam-passwd.h
@@ -0,0 +1,48 @@
+/* pam-passwd.h: password change capplet
+ *
@@ -911,8 +936,10 @@
+cb_dialog_response (GtkDialog *dialog, gint response_id, gpointer data);
+
+#endif /* __PAM_PASSWD_H */
---- control-center-2.15.91/capplets/passwd/pam/Makefile.am
-+++ control-center-2.15.91/capplets/passwd/pam/Makefile.am
+Index: control-center-2.17.91/capplets/passwd/pam/Makefile.am
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/pam/Makefile.am
@@ -0,0 +1,15 @@
+sbin_PROGRAMS = change-passwd
+
@@ -929,8 +956,10 @@
+install-exec-hook:
+ chmod u+s $(DESTDIR)$(sbindir)/change-passwd
+
---- control-center-2.15.91/capplets/passwd/pam/gnome-passwd
-+++ control-center-2.15.91/capplets/passwd/pam/gnome-passwd
+Index: control-center-2.17.91/capplets/passwd/pam/gnome-passwd
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/pam/gnome-passwd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth include common-auth
@@ -938,8 +967,10 @@
+password include common-password
+session include common-session
+
---- control-center-2.15.91/capplets/passwd/pam/helper-passwd.c
-+++ control-center-2.15.91/capplets/passwd/pam/helper-passwd.c
+Index: control-center-2.17.91/capplets/passwd/pam/helper-passwd.c
+===================================================================
+--- /dev/null
++++ control-center-2.17.91/capplets/passwd/pam/helper-passwd.c
@@ -0,0 +1,520 @@
+/* helper-passwd.c: password change capplet
+ *
@@ -1461,13 +1492,14 @@
+ }
+ return 0;
+}
---- control-center-2.15.91/configure.in
-+++ control-center-2.15.91/configure.in
-@@ -553,6 +553,19 @@
- dnl End: Define the main variables
+Index: control-center-2.17.91/configure.in
+===================================================================
+--- control-center-2.17.91.orig/configure.in
++++ control-center-2.17.91/configure.in
+@@ -531,6 +531,18 @@ dnl End: Define the main variables
dnl ==============================================
-+dnl =======================================
+ dnl =======================================
+dnl Required For PAM
+dnl =======================================
+
@@ -1479,11 +1511,11 @@
+AC_SUBST(PASSWD_PAM_LIBS)
+AC_SUBST(PASSWD_PAM_INCLUDEDIR)
+
-+
- ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
- AC_SUBST(ORBIT_IDL)
-
-@@ -628,6 +641,9 @@
++dnl =======================================
+ dnl Variables for config_archiverConf.sh.in
+ dnl =======================================
+ CONFIG_ARCHIVER_LIBDIR='-L${libdir}'
+@@ -587,6 +599,9 @@ capplets/accessibility/Makefile
capplets/accessibility/keyboard/Makefile
capplets/accessibility/at-properties/Makefile
capplets/network/Makefile
@@ -1493,9 +1525,11 @@
capplets/windows/Makefile
capplets/about-me/Makefile
help/Makefile
---- control-center-2.15.91/po/POTFILES.in
-+++ control-center-2.15.91/po/POTFILES.in
-@@ -51,6 +51,10 @@
+Index: control-center-2.17.91/po/POTFILES.in
+===================================================================
+--- control-center-2.17.91.orig/po/POTFILES.in
++++ control-center-2.17.91/po/POTFILES.in
+@@ -51,6 +51,10 @@ capplets/mouse/gnome-settings-mouse.desk
capplets/network/gnome-network-preferences.c
capplets/network/gnome-network-preferences.desktop.in.in
capplets/network/gnome-network-preferences.glade
@@ -1504,5 +1538,5 @@
+capplets/passwd/pam-passwd.c
+capplets/passwd/gnome-passwd.glade
capplets/sound/gnome-settings-sound.desktop.in.in
+ capplets/sound/mixer-support.c
capplets/sound/sound-properties-capplet.c
- capplets/sound/sound-properties.glade
++++++ control-center2-system-proxy-configuration.diff ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:57.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:57.000000000 +0100
@@ -1,6 +1,6 @@
Index: capplets/network/gnome-network-preferences.c
-================================================================================
---- capplets/network/gnome-network-preferences.c
+===================================================================
+--- capplets/network/gnome-network-preferences.c.orig
+++ capplets/network/gnome-network-preferences.c
@@ -32,19 +32,11 @@
#include "capplet-util.h"
@@ -26,8 +26,8 @@
+#define VAL_USE_SYSTEM_SETTINGS_USER_VALUES "user_values"
#define USE_PROXY_KEY "/system/http_proxy/use_http_proxy"
- #define HTTP_PROXY_HOST_KEY "/system/http_proxy/host"
-@@ -274,26 +266,39 @@
+ #define USE_SAME_PROXY_KEY "/system/http_proxy/use_same_proxy"
+@@ -363,28 +355,38 @@ static void
proxy_mode_radiobutton_clicked_cb (GtkWidget *widget,
GladeXML *dialog)
{
@@ -36,7 +36,7 @@
GConfClient *client;
-
+ gboolean manual_box_sensitive, auto_box_sensitive;
-+
++
if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget)))
return;
-
@@ -48,15 +48,17 @@
-
- gtk_widget_set_sensitive (WID ("manual_box"),
- mode == PROXYMODE_MANUAL);
+- gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"),
+- mode == PROXYMODE_MANUAL);
- gtk_widget_set_sensitive (WID ("auto_box"),
- mode == PROXYMODE_AUTO);
-+
- client = gconf_client_get_default ();
+- client = gconf_client_get_default ();
- gconf_client_set_bool (client, USE_PROXY_KEY,
- mode == PROXYMODE_AUTO || mode == PROXYMODE_MANUAL, NULL);
-+
-+ manual_box_sensitive = auto_box_sensitive = FALSE;
-+
++
++ 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);
+ } else if (widget == WID ("none_radiobutton")) {
@@ -71,22 +73,23 @@
+ 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 ("auto_box"), auto_box_sensitive);
+
g_object_unref (client);
}
-@@ -308,35 +313,96 @@
+@@ -399,34 +401,97 @@ connect_sensitivity_signals (GladeXML *d
}
}
++
+static GtkWidget *
+get_radio_for_mode (GladeXML *dialog, const char *mode_str)
+{
@@ -141,7 +144,7 @@
+
+ if (use_mode) {
+ if (!mode_value || mode_value->type != GCONF_VALUE_STRING)
-+ radiobutton = WID ("none_radiobutton");
++ radiobutton = WID ("none_radiobutton");
+ else
+ radiobutton = get_radio_for_mode (dialog, gconf_value_get_string (mode_value));
+ }
@@ -170,7 +173,7 @@
client = gconf_client_get_default ();
/* Hackety hack */
-+ gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("system_radiobutton"))->child), TRUE);
++ gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("system_radiobutton"))->child), TRUE);
gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("none_radiobutton"))->child), TRUE);
gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("manual_radiobutton"))->child), TRUE);
gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("auto_radiobutton"))->child), TRUE);
@@ -185,11 +188,12 @@
- peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_select_radio_with_enum (NULL,
- PROXY_MODE_KEY, mode_group, mode_type,
- TRUE, NULL));
--
- /* Http */
- port_value = gconf_client_get_int (client, HTTP_PROXY_PORT_KEY, NULL);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (WID ("http_port_spinbutton")), (gdouble) port_value);
---- capplets/network/gnome-network-preferences.glade
+
+ /* Use same proxy for all protocols */
+ peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_boolean (NULL,
+Index: capplets/network/gnome-network-preferences.glade
+===================================================================
+--- capplets/network/gnome-network-preferences.glade.orig
+++ capplets/network/gnome-network-preferences.glade
@@ -85,6 +85,25 @@
<property name="spacing">18</property>
@@ -234,7 +238,7 @@
</widget>
<packing>
<property name="padding">0</property>
-@@ -653,7 +673,7 @@
+@@ -673,7 +693,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -243,27 +247,31 @@
</widget>
<packing>
<property name="padding">0</property>
---- gnome-settings-daemon/Makefile.am
+Index: gnome-settings-daemon/Makefile.am
+===================================================================
+--- gnome-settings-daemon/Makefile.am.orig
+++ gnome-settings-daemon/Makefile.am
-@@ -5,6 +5,7 @@
- -DESD_SERVER="\"$(ESD_SERVER)\"" \
- -DDATADIR="\"$(datadir)\"" \
- -DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \
-+ -DLIBEXECDIR="\"$(libexecdir)\"" \
- $(FB_CFLAGS)
+@@ -11,7 +11,8 @@ INCLUDES= \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+ -DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
+- -DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
++ -DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\"" \
++ -DLIBEXECDIR="\"$(libexecdir)\""
libexec_PROGRAMS=gnome-settings-daemon
-@@ -45,6 +46,8 @@
- gnome-settings-dbus.c \
- gnome-settings-xrdb.c \
+
+@@ -54,6 +55,8 @@ gnome_settings_daemon_SOURCES = \
gnome-settings-xrdb.h \
+ gsd-media-keys-window.c \
+ gsd-media-keys-window.h \
+ gnome-settings-proxy.c \
+ gnome-settings-proxy.h \
xsettings-common.c \
xsettings-manager.c \
xsettings-common.h \
-@@ -89,6 +92,11 @@
- Gladedir = $(GNOMECC_GLADE_DIR)
+@@ -102,6 +105,11 @@ gnome_settings_daemon_SOURCES+=$(BUILT_S
+ Gladedir = $(pkgdatadir)/glade
Glade_DATA = modmap-dialog.glade
+helperdir = $(libexecdir)
@@ -274,16 +282,18 @@
Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
Dbusapi_DATA = gnome-settings-client.h
-@@ -107,7 +115,7 @@
+@@ -127,7 +135,7 @@ service_DATA = $(service_in_files:.servi
org.gnome.SettingsDaemon.service: org.gnome.SettingsDaemon.service.in Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = $(Glade_DATA) $(Dbusapi_DATA) \
+EXTRA_DIST = $(Glade_DATA) $(Dbusapi_DATA) $(helperfile) \
- gnome-settings-daemon.pc.in gsd-infos.xml org.gnome.SettingsDaemon.service.in
+ gnome-settings-daemon.pc.in gsd-infos.xml \
+ org.gnome.SettingsDaemon.service.in gnome-settings-marshal.list
CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
-
---- gnome-settings-daemon/gnome-settings-daemon.c
+Index: gnome-settings-daemon/gnome-settings-daemon.c
+===================================================================
+--- gnome-settings-daemon/gnome-settings-daemon.c.orig
+++ gnome-settings-daemon/gnome-settings-daemon.c
@@ -58,6 +58,7 @@
#include "gnome-settings-gtk1theme.h"
@@ -293,7 +303,7 @@
#include "clipboard-manager.h"
-@@ -340,6 +341,7 @@
+@@ -340,6 +341,7 @@ gnome_settings_daemon_new (void)
gnome_settings_gtk1_theme_init (client);
gnome_settings_xrdb_init (client);
gnome_settings_typing_break_init (client);
@@ -301,7 +311,7 @@
for (list = directories; list; list = list->next)
{
-@@ -394,6 +396,7 @@
+@@ -394,6 +396,7 @@ gnome_settings_daemon_new (void)
gnome_settings_gtk1_theme_load (client);
gnome_settings_xrdb_load (client);
gnome_settings_typing_break_load (client);
@@ -309,7 +319,9 @@
dbusServer = g_object_new (gnome_settings_server_get_type (), NULL);
---- gnome-settings-daemon/gnome-settings-proxy.c
+Index: gnome-settings-daemon/gnome-settings-proxy.c
+===================================================================
+--- /dev/null
+++ gnome-settings-daemon/gnome-settings-proxy.c
@@ -0,0 +1,403 @@
+/* Proxy configuration for gnome-settings-daemon
@@ -715,7 +727,9 @@
+{
+ copy_system_values_if_needed (client);
+}
---- gnome-settings-daemon/gnome-settings-proxy.h
+Index: gnome-settings-daemon/gnome-settings-proxy.h
+===================================================================
+--- /dev/null
+++ gnome-settings-daemon/gnome-settings-proxy.h
@@ -0,0 +1,17 @@
+/* Proxy configuration for gnome-settings-daemon
@@ -735,7 +749,9 @@
+void gnome_settings_proxy_load (GConfClient *client);
+
+#endif
---- gnome-settings-daemon/novell-sysconfig-proxy-helper
+Index: gnome-settings-daemon/novell-sysconfig-proxy-helper
+===================================================================
+--- /dev/null
+++ gnome-settings-daemon/novell-sysconfig-proxy-helper
@@ -0,0 +1,19 @@
+#!/bin/sh
@@ -757,19 +773,23 @@
+echo "FTP_PROXY $FTP_PROXY"
+echo "GOPHER_PROXY $GOPHER_PROXY"
+echo "NO_PROXY $NO_PROXY"
---- schemas/Makefile.am
+Index: schemas/Makefile.am
+===================================================================
+--- schemas/Makefile.am.orig
+++ schemas/Makefile.am
-@@ -4,7 +4,8 @@
+@@ -3,7 +3,8 @@ schema_in_files= \
+ apps_gnome_settings_daemon_screensaver.schemas.in \
apps_gnome_settings_daemon_default_editor.schemas.in \
desktop_gnome_font_rendering.schemas.in \
- desktop_gnome_peripherals_keyboard_xkb.schemas.in \
- apps_gnome_settings_daemon_keybindings.schemas.in
+ apps_gnome_settings_daemon_keybindings.schemas.in \
+ system_proxy.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
---- schemas/system_proxy.schemas.in
+Index: schemas/system_proxy.schemas.in
+===================================================================
+--- /dev/null
+++ schemas/system_proxy.schemas.in
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
++++++ desktop.patch ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:57.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:57.000000000 +0100
@@ -1,16 +1,20 @@
---- control-center-2.15.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
-+++ control-center-2.15.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+Index: control-center-2.17.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
++++ control-center-2.17.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
--_Name=Keyboard
+-_Name=Keyboard Accessibility
+_Name=Accessibility
_Comment=Set your keyboard accessibility preferences
Exec=gnome-accessibility-keyboard-properties
Icon=gnome-settings-accessibility-keyboard
---- control-center-2.15.91/capplets/background/background.desktop.in.in
-+++ control-center-2.15.91/capplets/background/background.desktop.in.in
-@@ -7,7 +7,7 @@
+Index: control-center-2.17.91/capplets/background/background.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/background/background.desktop.in.in
++++ control-center-2.17.91/capplets/background/background.desktop.in.in
+@@ -7,7 +7,7 @@ Icon=preferences-desktop-wallpaper
Terminal=false
Type=Application
StartupNotify=true
@@ -19,20 +23,24 @@
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.15.91/capplets/default-applications/default-applications.desktop.in.in
-+++ control-center-2.15.91/capplets/default-applications/default-applications.desktop.in.in
-@@ -7,7 +7,7 @@
+Index: control-center-2.17.91/capplets/default-applications/default-applications.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/default-applications/default-applications.desktop.in.in
++++ control-center-2.17.91/capplets/default-applications/default-applications.desktop.in.in
+@@ -7,7 +7,7 @@ Icon=gnome-settings-default-applications
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;GTK;Settings;
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
+Categories=GNOME;GTK;Settings;Application;DesktopSettings;AdvancedSettings;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.15.91/capplets/display/display-properties.desktop.in.in
-+++ control-center-2.15.91/capplets/display/display-properties.desktop.in.in
-@@ -7,7 +7,7 @@
+Index: control-center-2.17.91/capplets/display/display-properties.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/display/display-properties.desktop.in.in
++++ control-center-2.17.91/capplets/display/display-properties.desktop.in.in
+@@ -7,7 +7,7 @@ Icon=display-capplet.png
Terminal=false
Type=Application
StartupNotify=true
@@ -41,8 +49,10 @@
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.15.91/capplets/font/font-properties.desktop.in.in
-+++ control-center-2.15.91/capplets/font/font-properties.desktop.in.in
+Index: control-center-2.17.91/capplets/font/font-properties.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/font/font-properties.desktop.in.in
++++ control-center-2.17.91/capplets/font/font-properties.desktop.in.in
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
@@ -59,8 +69,10 @@
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.15.91/capplets/keybindings/keybinding.desktop.in.in
-+++ control-center-2.15.91/capplets/keybindings/keybinding.desktop.in.in
+Index: control-center-2.17.91/capplets/keybindings/keybinding.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/keybindings/keybinding.desktop.in.in
++++ control-center-2.17.91/capplets/keybindings/keybinding.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -69,8 +81,10 @@
_Comment=Assign shortcut keys to commands
Exec=gnome-keybinding-properties
Icon=gnome-settings-keybindings
---- control-center-2.15.91/capplets/network/gnome-network-preferences.desktop.in.in
-+++ control-center-2.15.91/capplets/network/gnome-network-preferences.desktop.in.in
+Index: control-center-2.17.91/capplets/network/gnome-network-preferences.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/network/gnome-network-preferences.desktop.in.in
++++ control-center-2.17.91/capplets/network/gnome-network-preferences.desktop.in.in
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
@@ -83,14 +97,16 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;GTK;Settings;
+-Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
+Categories=GNOME;GTK;Settings;AdvancedSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.15.91/capplets/sound/gnome-settings-sound.desktop.in.in
-+++ control-center-2.15.91/capplets/sound/gnome-settings-sound.desktop.in.in
-@@ -7,7 +7,7 @@
+Index: control-center-2.17.91/capplets/sound/gnome-settings-sound.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/sound/gnome-settings-sound.desktop.in.in
++++ control-center-2.17.91/capplets/sound/gnome-settings-sound.desktop.in.in
+@@ -7,7 +7,7 @@ Icon=gnome-settings-sound
Terminal=false
Type=Application
StartupNotify=true
@@ -99,9 +115,11 @@
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.15.91/capplets/ui-properties/gnome-ui-properties.desktop.in.in
-+++ control-center-2.15.91/capplets/ui-properties/gnome-ui-properties.desktop.in.in
-@@ -7,7 +7,7 @@
+Index: control-center-2.17.91/capplets/ui-properties/gnome-ui-properties.desktop.in.in
+===================================================================
+--- control-center-2.17.91.orig/capplets/ui-properties/gnome-ui-properties.desktop.in.in
++++ control-center-2.17.91/capplets/ui-properties/gnome-ui-properties.desktop.in.in
+@@ -7,7 +7,7 @@ Icon=gnome-settings-ui-behavior
Terminal=false
Type=Application
StartupNotify=true
++++++ gnomecc-docpath.patch ++++++
--- /var/tmp/diff_new_pack.cY3336/_old 2007-03-16 10:09:57.000000000 +0100
+++ /var/tmp/diff_new_pack.cY3336/_new 2007-03-16 10:09:57.000000000 +0100
@@ -1,12 +1,12 @@
-Index: control-center/gnomecc.desktop.in.in
+Index: shell/gnomecc.desktop.in.in
===================================================================
---- control-center/gnomecc.desktop.in.in.orig
-+++ control-center/gnomecc.desktop.in.in
+--- shell/gnomecc.desktop.in.in.orig
++++ shell/gnomecc.desktop.in.in
@@ -10,6 +10,7 @@ Type=Application
StartupNotify=true
- Categories=GNOME;Application;Settings;
+ Categories=GNOME;GTK;Settings;
OnlyShowIn=GNOME;
-+DocPath=control-center
++DocPath=control-cent
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
X-GNOME-Bugzilla-Component=shell
++++++ jhmfc.patch ++++++
Index: control-center-2.17.91/capplets/theme-switcher/Makefile.am
===================================================================
--- control-center-2.17.91.orig/capplets/theme-switcher/Makefile.am
+++ control-center-2.17.91/capplets/theme-switcher/Makefile.am
@@ -58,11 +58,11 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFIL
EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)
install-data-hook:
-if ENABLE_UPDATE_MIMEDB
- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-endif
+#if ENABLE_UPDATE_MIMEDB
+# $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+#endif
uninstall-hook:
-if ENABLE_UPDATE_MIMEDB
- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-endif
+#if ENABLE_UPDATE_MIMEDB
+# $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org