Hello community,
here is the log from the commit of package control-center2
checked in at Fri Sep 1 10:35:08 CEST 2006.
--------
--- GNOME/control-center2/control-center2.changes 2006-08-04 23:20:47.000000000 +0200
+++ STABLE/control-center2/control-center2.changes 2006-08-30 23:05:34.000000000 +0200
@@ -1,0 +2,28 @@
+Wed Aug 30 23:04:09 CEST 2006 - jhargadon@suse.de
+
+- update to version 2.15.92
+- fix "Background dialogue resizes when shown"
+- fix issues with the themes previews
+- free 'resolution' string after using it, not before
+- fix memory leak
+- patches from "generate visible previews first"
+- translation updates
+
+-------------------------------------------------------------------
+Mon Aug 21 21:57:51 CEST 2006 - jhargadon@suse.de
+
+- update to version 2.15.91
+- require libebook-1.2 1.7.90 for the new API
+- use orca screenreader when available
+- fixed X-GNOME-Bugzilla fields in .desktop file
+- using Unicode subscript for repeating descriptions
+- set "label for" and "labelled by" properties for the capplet
+- only include libhal if HAL is enabled
+- added support for locking down theme
+- don't attempt to load window manager theme name from an unknown window
+ manager
+- use GtkAboutDialog, not GtkDialog
+- use GtkStatusIcon instead of libegg
+- translation updates
+
+-------------------------------------------------------------------
Old:
----
control-center-2.12.2.tar.bz2
New:
----
control-center-2.15.92.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ control-center2.spec ++++++
--- /var/tmp/diff_new_pack.6OBxch/_old 2006-09-01 10:34:49.000000000 +0200
+++ /var/tmp/diff_new_pack.6OBxch/_new 2006-09-01 10:34:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package control-center2 (Version 2.12.2)
+# spec file for package control-center2 (Version 2.15.92)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
Autoreqprov: on
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
-Version: 2.12.2
-Release: 74
+Version: 2.15.92
+Release: 2
Summary: The GNOME Control Center for the GNOME 2.x Desktop
Source: %{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
@@ -67,7 +67,7 @@
Summary: The GNOME Control Center for the GNOME 2.x Desktop
Group: System/GUI/GNOME
Autoreqprov: on
-Requires: %{name} = %{version} gtk2-devel libgnomeui-devel gnome-desktop-devel libglade2-devel gnome-menus-devel
+Requires: %{name} = %{version} dbus-1-devel dbus-1-glib-devel glib2-devel gtk2-devel libgnomeui-devel gnome-desktop-devel libglade2-devel gnome-menus-devel
%description devel
This package contains the control-center for the GNOME 2.x Desktop.
@@ -80,16 +80,14 @@
%prep
%setup -q -n %{_name}-%{version} -a 1 -a 2 -b 4
-rm po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
-%patch100
+#%patch100
gnome-patch-translation-prepare
%patch
%patch1
%patch2 -p1
%patch3 -p1
%patch6
-%patch7
+#%patch7
%patch8 -p1
%patch10
#%patch11
@@ -97,13 +95,13 @@
%patch13
%patch14 -p0
cp %{S:3} capplets/passwd/change-password.png
-%patch15
-%patch16
-%patch17
-%patch18
-%patch19
+#%patch15
+#%patch16
+#%patch17
+#%patch18
+#%patch19
%patch20
-%patch21
+#%patch21
%patch22 -p1
gnome-patch-translation-update
@@ -152,7 +150,7 @@
%suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
-sed '/^OnlyShowIn/d;s/GNOME;Application;Settings;/GNOME;Application;DesktopSettings;/'\
+sed '/^OnlyShowIn/d;s/GNOME;GTK;Settings;/GNOME;Application;DesktopSettings;/'\
<$RPM_BUILD_ROOT/opt/gnome/share/applications/gnomecc.desktop\
$RPM_BUILD_ROOT/usr/share/applications/gnomecc.desktop
rm $RPM_BUILD_ROOT%{prefix}/share/applications/mimeinfo.cache
@@ -214,12 +212,12 @@
%{sysconfdir}/gconf/schemas/system_proxy.schemas
%{sysconfdir}/gnome-vfs-2.0/modules/*.conf
#%{prefix}/share/gnome-2.0/ui/*.xml
-%{prefix}/share/gnome/vfolders/*
+#%{prefix}/share/gnome/vfolders/*
%{prefix}/share/gnome/cursor-fonts
%{prefix}/share/icons/hicolor/48x48
%{prefix}/%_lib/nautilus/extensions-1.0/*
%{prefix}/%_lib/lib*.so.*
-%{prefix}/%_lib/bonobo/servers/*.server
+#%{prefix}/%_lib/bonobo/servers/*.server
%{prefix}/%_lib/gnome-vfs-2.0/modules/lib*.so
%dir %{prefix}/%_lib/window-manager-settings
%{prefix}/%_lib/window-manager-settings/*.so
@@ -232,7 +230,15 @@
%if %suse_version < 1000
/etc/permissions.d/*
%endif
-/opt/gnome/sbin/change-passwd
+%{prefix}/sbin/change-passwd
+%{prefix}/share/dbus-1/services/org.gnome.SettingsDaemon.service
+%{prefix}/share/desktop-directories/font-method.directory
+%{prefix}/share/desktop-directories/theme-method.directory
+%dir %{prefix}/share/gnome-default-applications
+%{prefix}/share/gnome-default-applications/gnome-default-applications.xml
+%dir %{prefix}/include/gnome-settings-daemon-2.0
+%dir %{prefix}/include/gnome-settings-daemon-2.0/gnome-settings-daemon
+%{prefix}/include/gnome-settings-daemon-2.0/gnome-settings-daemon/*
%files devel
%defattr (-, root, root)
@@ -243,6 +249,28 @@
%{prefix}/share/idl/*.idl
%changelog -n control-center2
+* Wed Aug 30 2006 - jhargadon@suse.de
+- update to version 2.15.92
+- fix "Background dialogue resizes when shown"
+- fix issues with the themes previews
+- free 'resolution' string after using it, not before
+- fix memory leak
+- patches from "generate visible previews first"
+- translation updates
+* Mon Aug 21 2006 - jhargadon@suse.de
+- update to version 2.15.91
+- require libebook-1.2 1.7.90 for the new API
+- use orca screenreader when available
+- fixed X-GNOME-Bugzilla fields in .desktop file
+- using Unicode subscript for repeating descriptions
+- set "label for" and "labelled by" properties for the capplet
+- only include libhal if HAL is enabled
+- added support for locking down theme
+- don't attempt to load window manager theme name from an unknown window
+ manager
+- use GtkAboutDialog, not GtkDialog
+- use GtkStatusIcon instead of libegg
+- translation updates
* Fri Aug 04 2006 - sreeves@suse.de
- Mark an existing string in
control-center2-soundupdate.patch for translation (185591)
++++++ control-center-2.12.2.tar.bz2 -> control-center-2.15.92.tar.bz2 ++++++
++++ 272723 lines of diff (skipped)
++++++ control-center-keybinding-workaround.patch ++++++
--- /var/tmp/diff_new_pack.6OBxch/_old 2006-09-01 10:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.6OBxch/_new 2006-09-01 10:34:54.000000000 +0200
@@ -1,20 +1,8 @@
- capplets/keybindings/gnome-keybinding-properties.c | 26 +++++++++++++++++++--
- 1 files changed, 24 insertions(+), 2 deletions(-)
-
-diff -urN control-center-2.6.1/capplets/keybindings/gnome-keybinding-properties.c control-center/capplets/keybindings/gnome-keybinding-properties.c
---- control-center-2.6.1/capplets/keybindings/gnome-keybinding-properties.c 2004-04-07 00:47:12.000000000 -0400
-+++ control-center/capplets/keybindings/gnome-keybinding-properties.c 2004-08-12 12:44:36.578789923 -0400
-@@ -64,7 +64,7 @@
- { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 },
- { "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 },
- { "/apps/gnome_settings_daemon/keybindings/volume_up", ALWAYS_VISIBLE, 0 },
-- /* Other ones that need keysyms bindings */
-+ /* With the next five actions, we need to not overwrite their keysym */
- { "/apps/gnome_settings_daemon/keybindings/play", ALWAYS_VISIBLE, 0 },
- { "/apps/gnome_settings_daemon/keybindings/pause", ALWAYS_VISIBLE, 0 },
- { "/apps/gnome_settings_daemon/keybindings/stop", ALWAYS_VISIBLE, 0 },
-@@ -700,7 +700,7 @@
+================================================================================
+--- control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c
++++ control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c
+@@ -614,7 +614,7 @@
GtkTreeIter iter;
KeyEntry *key_entry, tmp_key;
GError *err = NULL;
@@ -23,7 +11,7 @@
model = gtk_tree_view_get_model (view);
gtk_tree_model_get_iter (model, &iter, path);
-@@ -713,6 +713,28 @@
+@@ -627,6 +627,28 @@
if (key_entry == NULL)
return;
++++++ control-center2-backout-309558.patch ++++++
--- /var/tmp/diff_new_pack.6OBxch/_old 2006-09-01 10:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.6OBxch/_new 2006-09-01 10:34:54.000000000 +0200
@@ -6,6 +6,6 @@
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.6.0)
+ m4_define(gtk_minver, 2.8.12)
m4_define(libbonobo_minver, 2.0.0)
m4_define(libgnomeui_minver, 2.2.0)
++++++ control-center2-passwd-dialog.patch ++++++
--- /var/tmp/diff_new_pack.6OBxch/_old 2006-09-01 10:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.6OBxch/_new 2006-09-01 10:34:54.000000000 +0200
@@ -1,5 +1,5 @@
---- control-center-2.12.2/capplets/Makefile.am
-+++ control-center-2.12.2/capplets/Makefile.am
+--- control-center-2.15.91/capplets/Makefile.am
++++ control-center-2.15.91/capplets/Makefile.am
@@ -3,7 +3,8 @@
default-applications font \
background keyboard mouse sound \
@@ -10,13 +10,13 @@
SUBDIRS = $(always_built_SUBDIRS)
---- control-center-2.12.2/capplets/passwd/ChangeLog
-+++ control-center-2.12.2/capplets/passwd/ChangeLog
+--- control-center-2.15.91/capplets/passwd/ChangeLog
++++ control-center-2.15.91/capplets/passwd/ChangeLog
@@ -0,0 +1,2 @@
+2005-02-04 Shakti Sen
+ * Added the password change GUI utility
---- control-center-2.12.2/capplets/passwd/Makefile.am
-+++ control-center-2.12.2/capplets/passwd/Makefile.am
+--- control-center-2.15.91/capplets/passwd/Makefile.am
++++ control-center-2.15.91/capplets/passwd/Makefile.am
@@ -0,0 +1,28 @@
+SUBDIRS = pam
+bin_PROGRAMS = gnome-passwd
@@ -46,8 +46,8 @@
+
+install-exec-hook:
+ chmod o-r $(DESTDIR)$(bindir)/gnome-passwd
---- control-center-2.12.2/capplets/passwd/gnome-passwd.c
-+++ control-center-2.12.2/capplets/passwd/gnome-passwd.c
+--- control-center-2.15.91/capplets/passwd/gnome-passwd.c
++++ control-center-2.15.91/capplets/passwd/gnome-passwd.c
@@ -0,0 +1,214 @@
+/* gnome-passwd.c: password change capplet
+ *
@@ -263,8 +263,8 @@
+
+ return 0;
+}
---- control-center-2.12.2/capplets/passwd/gnome-passwd.desktop.in.in
-+++ control-center-2.12.2/capplets/passwd/gnome-passwd.desktop.in.in
+--- control-center-2.15.91/capplets/passwd/gnome-passwd.desktop.in.in
++++ control-center-2.15.91/capplets/passwd/gnome-passwd.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -281,8 +281,8 @@
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=password
+X-GNOME-Bugzilla-Version=@VERSION@
---- control-center-2.12.2/capplets/passwd/gnome-passwd.glade
-+++ control-center-2.12.2/capplets/passwd/gnome-passwd.glade
+--- control-center-2.15.91/capplets/passwd/gnome-passwd.glade
++++ control-center-2.15.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 +602,8 @@
+</widget>
+
+</glade-interface>
---- control-center-2.12.2/capplets/passwd/pam-passwd.c
-+++ control-center-2.12.2/capplets/passwd/pam-passwd.c
+--- control-center-2.15.91/capplets/passwd/pam-passwd.c
++++ control-center-2.15.91/capplets/passwd/pam-passwd.c
@@ -0,0 +1,255 @@
+/* pam-passwd.c: password change capplet
+ *
@@ -860,8 +860,8 @@
+ gtk_main_quit ();
+ }
+}
---- control-center-2.12.2/capplets/passwd/pam-passwd.h
-+++ control-center-2.12.2/capplets/passwd/pam-passwd.h
+--- control-center-2.15.91/capplets/passwd/pam-passwd.h
++++ control-center-2.15.91/capplets/passwd/pam-passwd.h
@@ -0,0 +1,48 @@
+/* pam-passwd.h: password change capplet
+ *
@@ -911,8 +911,8 @@
+cb_dialog_response (GtkDialog *dialog, gint response_id, gpointer data);
+
+#endif /* __PAM_PASSWD_H */
---- control-center-2.12.2/capplets/passwd/pam/Makefile.am
-+++ control-center-2.12.2/capplets/passwd/pam/Makefile.am
+--- control-center-2.15.91/capplets/passwd/pam/Makefile.am
++++ control-center-2.15.91/capplets/passwd/pam/Makefile.am
@@ -0,0 +1,15 @@
+sbin_PROGRAMS = change-passwd
+
@@ -929,8 +929,8 @@
+install-exec-hook:
+ chmod u+s $(DESTDIR)$(sbindir)/change-passwd
+
---- control-center-2.12.2/capplets/passwd/pam/gnome-passwd
-+++ control-center-2.12.2/capplets/passwd/pam/gnome-passwd
+--- control-center-2.15.91/capplets/passwd/pam/gnome-passwd
++++ control-center-2.15.91/capplets/passwd/pam/gnome-passwd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth include common-auth
@@ -938,8 +938,8 @@
+password include common-password
+session include common-session
+
---- control-center-2.12.2/capplets/passwd/pam/helper-passwd.c
-+++ control-center-2.12.2/capplets/passwd/pam/helper-passwd.c
+--- control-center-2.15.91/capplets/passwd/pam/helper-passwd.c
++++ control-center-2.15.91/capplets/passwd/pam/helper-passwd.c
@@ -0,0 +1,520 @@
+/* helper-passwd.c: password change capplet
+ *
@@ -1461,9 +1461,9 @@
+ }
+ return 0;
+}
---- control-center-2.12.2/configure.in
-+++ control-center-2.12.2/configure.in
-@@ -463,6 +463,19 @@
+--- control-center-2.15.91/configure.in
++++ control-center-2.15.91/configure.in
+@@ -553,6 +553,19 @@
dnl End: Define the main variables
dnl ==============================================
@@ -1480,10 +1480,10 @@
+AC_SUBST(PASSWD_PAM_INCLUDEDIR)
+
+
- GCONF_CONFIG_SOURCE=
- AC_ARG_ENABLE(gconf-source,
- AC_HELP_STRING([--enable-gconf-source=sourceaddress],
-@@ -551,6 +564,9 @@
+ ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
+ AC_SUBST(ORBIT_IDL)
+
+@@ -628,6 +641,9 @@
capplets/accessibility/keyboard/Makefile
capplets/accessibility/at-properties/Makefile
capplets/network/Makefile
@@ -1493,8 +1493,8 @@
capplets/windows/Makefile
capplets/about-me/Makefile
help/Makefile
---- control-center-2.12.2/po/POTFILES.in
-+++ control-center-2.12.2/po/POTFILES.in
+--- control-center-2.15.91/po/POTFILES.in
++++ control-center-2.15.91/po/POTFILES.in
@@ -51,6 +51,10 @@
capplets/network/gnome-network-preferences.c
capplets/network/gnome-network-preferences.desktop.in.in
++++++ control-center2-system-proxy-configuration.diff ++++++
--- /var/tmp/diff_new_pack.6OBxch/_old 2006-09-01 10:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.6OBxch/_new 2006-09-01 10:34:54.000000000 +0200
@@ -1,10 +1,7 @@
Index: capplets/network/gnome-network-preferences.c
-===================================================================
-RCS file: /cvs/gnome/gnome-control-center/capplets/network/gnome-network-preferences.c,v
-retrieving revision 1.19
-diff -u -r1.19 gnome-network-preferences.c
---- capplets/network/gnome-network-preferences.c 5 Feb 2005 13:19:38 -0000 1.19
-+++ capplets/network/gnome-network-preferences.c 17 Feb 2005 01:40:29 -0000
+================================================================================
+--- capplets/network/gnome-network-preferences.c
++++ capplets/network/gnome-network-preferences.c
@@ -32,19 +32,11 @@
#include "capplet-util.h"
#include "gconf-property-editor.h"
@@ -30,7 +27,7 @@
#define USE_PROXY_KEY "/system/http_proxy/use_http_proxy"
#define HTTP_PROXY_HOST_KEY "/system/http_proxy/host"
-@@ -273,26 +265,39 @@
+@@ -274,26 +266,39 @@
proxy_mode_radiobutton_clicked_cb (GtkWidget *widget,
GladeXML *dialog)
{
@@ -86,7 +83,7 @@
g_object_unref (client);
}
-@@ -307,35 +312,96 @@
+@@ -308,35 +313,96 @@
}
}
@@ -192,10 +189,9 @@
/* 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 2005-07-16 09:55:33.000000000 -0500
-+++ capplets/network/gnome-network-preferences.glade 2005-12-26 10:00:06.000000000 -0600
-@@ -84,6 +84,25 @@
+--- capplets/network/gnome-network-preferences.glade
++++ capplets/network/gnome-network-preferences.glade
+@@ -85,6 +85,25 @@
<property name="spacing">18</property>
<child>
@@ -221,7 +217,7 @@
<widget class="GtkRadioButton" id="none_radiobutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
-@@ -94,6 +113,7 @@
+@@ -95,6 +114,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -229,7 +225,7 @@
</widget>
<packing>
<property name="padding">0</property>
-@@ -125,7 +145,7 @@
+@@ -126,7 +146,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -238,7 +234,7 @@
</widget>
<packing>
<property name="padding">0</property>
-@@ -628,7 +648,7 @@
+@@ -653,7 +673,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -247,14 +243,8 @@
</widget>
<packing>
<property name="padding">0</property>
-
-Index: gnome-settings-daemon/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/Makefile.am,v
-retrieving revision 1.44
-diff -u -r1.44 Makefile.am
---- gnome-settings-daemon/Makefile.am 31 Jan 2005 15:31:44 -0000 1.44
-+++ gnome-settings-daemon/Makefile.am 17 Feb 2005 01:40:29 -0000
+--- gnome-settings-daemon/Makefile.am
++++ gnome-settings-daemon/Makefile.am
@@ -5,6 +5,7 @@
-DESD_SERVER="\"$(ESD_SERVER)\"" \
-DDATADIR="\"$(datadir)\"" \
@@ -263,8 +253,8 @@
$(FB_CFLAGS)
libexec_PROGRAMS=gnome-settings-daemon
-@@ -43,6 +44,8 @@
- gnome-settings-gtk1theme.h \
+@@ -45,6 +46,8 @@
+ gnome-settings-dbus.c \
gnome-settings-xrdb.c \
gnome-settings-xrdb.h \
+ gnome-settings-proxy.c \
@@ -272,42 +262,38 @@
xsettings-common.c \
xsettings-manager.c \
xsettings-common.h \
-@@ -97,13 +100,17 @@
+@@ -89,6 +92,11 @@
Gladedir = $(GNOMECC_GLADE_DIR)
Glade_DATA = modmap-dialog.glade
+helperdir = $(libexecdir)
+helperfile = novell-sysconfig-proxy-helper
+
- serverfile = GNOME_SettingsDaemon.server.in
- serverdir = $(libdir)/bonobo/servers
- install-data-hook :
- $(mkinstalldirs) $(DESTDIR)$(serverdir)
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(DESTDIR)$(serverdir)/$(serverfile:.in=)
++install-data-hook :
+ $(INSTALL_SCRIPT) $(srcdir)/$(helperfile) $(DESTDIR)$(libexecdir)/$(helperfile)
+ Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
+ Dbusapi_DATA = gnome-settings-client.h
--EXTRA_DIST = $(serverfile) $(Glade_DATA)
-+EXTRA_DIST = $(serverfile) $(Glade_DATA) $(helperfile)
- CLEANFILES = $(BUILT_SOURCES)
-
- uninstall-local:
-
-Index: gnome-settings-daemon/gnome-settings-daemon.c
-===================================================================
-RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-daemon.c,v
-retrieving revision 1.34
-diff -u -r1.34 gnome-settings-daemon.c
---- gnome-settings-daemon/gnome-settings-daemon.c 31 Jan 2005 15:31:44 -0000 1.34
-+++ gnome-settings-daemon/gnome-settings-daemon.c 17 Feb 2005 01:40:29 -0000
-@@ -57,6 +57,7 @@
+@@ -107,7 +115,7 @@
+ 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
+ CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
+
+--- gnome-settings-daemon/gnome-settings-daemon.c
++++ gnome-settings-daemon/gnome-settings-daemon.c
+@@ -58,6 +58,7 @@
#include "gnome-settings-gtk1theme.h"
#include "gnome-settings-xrdb.h"
#include "gnome-settings-typing-break.h"
+#include "gnome-settings-proxy.h"
- #include "GNOME_SettingsDaemon.h"
+ #include "clipboard-manager.h"
-@@ -290,6 +291,7 @@
+@@ -340,6 +341,7 @@
gnome_settings_gtk1_theme_init (client);
gnome_settings_xrdb_init (client);
gnome_settings_typing_break_init (client);
@@ -315,78 +301,16 @@
for (list = directories; list; list = list->next)
{
-@@ -344,6 +346,7 @@
+@@ -394,6 +396,7 @@
gnome_settings_gtk1_theme_load (client);
gnome_settings_xrdb_load (client);
gnome_settings_typing_break_load (client);
+ gnome_settings_proxy_load (client);
- return G_OBJECT (daemon);
- }
-
-
-Index: schemas/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-control-center/schemas/Makefile.am,v
-retrieving revision 1.18
-diff -u -r1.18 Makefile.am
---- schemas/Makefile.am 28 Nov 2004 08:14:05 -0000 1.18
-+++ schemas/Makefile.am 17 Feb 2005 01:40:29 -0000
-@@ -4,7 +4,8 @@
- apps_gnome_settings_daemon_default_editor.schemas.in \
- desktop_gnome_font_rendering.schemas \
- 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)
+ dbusServer = g_object_new (gnome_settings_server_get_type (), NULL);
---- /dev/null 2004-08-25 12:34:59.000000000 -0500
-+++ gnome-settings-daemon/gnome-settings-proxy.h 2005-02-11 13:14:50.000000000 -0600
-@@ -0,0 +1,17 @@
-+/* Proxy configuration for gnome-settings-daemon
-+ *
-+ * Copyright (C) 2005 Novell, Inc.
-+ *
-+ * Authors: Federico Mena-Quintero
-+ *
-+ */
-+
-+#ifndef GNOME_SETTINGS_PROXY_H
-+#define GNOME_SETTINGS_PROXY_H
-+
-+#include
-+
-+void gnome_settings_proxy_init (GConfClient *client);
-+void gnome_settings_proxy_load (GConfClient *client);
-+
-+#endif
-
---- /dev/null 2006-03-11 07:25:00.000000000 -0600
-+++ gnome-settings-daemon/novell-sysconfig-proxy-helper 2006-03-22 18:14:10.000000000 -0600
-@@ -0,0 +1,19 @@
-+#!/bin/sh
-+
-+if [ ! -f /etc/sysconfig/proxy ]
-+then
-+ exit 0
-+fi
-+
-+source /etc/sysconfig/proxy
-+
-+# This may look convoluted, but it's an easy way to let random shell
-+# script code appear in /etc/sysconfig/proxy and still let user code
-+# read the variables in it easily.
-+
-+echo "PROXY_ENABLED $PROXY_ENABLED"
-+echo "HTTP_PROXY $HTTP_PROXY"
-+echo "HTTPS_PROXY $HTTPS_PROXY"
-+echo "FTP_PROXY $FTP_PROXY"
-+echo "GOPHER_PROXY $GOPHER_PROXY"
-+echo "NO_PROXY $NO_PROXY"
---- /dev/null 2006-03-11 07:25:00.000000000 -0600
-+++ gnome-settings-daemon/gnome-settings-proxy.c 2006-03-22 18:15:03.000000000 -0600
+--- gnome-settings-daemon/gnome-settings-proxy.c
++++ gnome-settings-daemon/gnome-settings-proxy.c
@@ -0,0 +1,403 @@
+/* Proxy configuration for gnome-settings-daemon
+ *
@@ -791,8 +715,62 @@
+{
+ copy_system_values_if_needed (client);
+}
---- /dev/null 2004-08-25 12:34:59.000000000 -0500
-+++ schemas/system_proxy.schemas.in 2005-02-11 12:09:48.000000000 -0600
+--- gnome-settings-daemon/gnome-settings-proxy.h
++++ gnome-settings-daemon/gnome-settings-proxy.h
+@@ -0,0 +1,17 @@
++/* Proxy configuration for gnome-settings-daemon
++ *
++ * Copyright (C) 2005 Novell, Inc.
++ *
++ * Authors: Federico Mena-Quintero
++ *
++ */
++
++#ifndef GNOME_SETTINGS_PROXY_H
++#define GNOME_SETTINGS_PROXY_H
++
++#include
++
++void gnome_settings_proxy_init (GConfClient *client);
++void gnome_settings_proxy_load (GConfClient *client);
++
++#endif
+--- gnome-settings-daemon/novell-sysconfig-proxy-helper
++++ gnome-settings-daemon/novell-sysconfig-proxy-helper
+@@ -0,0 +1,19 @@
++#!/bin/sh
++
++if [ ! -f /etc/sysconfig/proxy ]
++then
++ exit 0
++fi
++
++source /etc/sysconfig/proxy
++
++# This may look convoluted, but it's an easy way to let random shell
++# script code appear in /etc/sysconfig/proxy and still let user code
++# read the variables in it easily.
++
++echo "PROXY_ENABLED $PROXY_ENABLED"
++echo "HTTP_PROXY $HTTP_PROXY"
++echo "HTTPS_PROXY $HTTPS_PROXY"
++echo "FTP_PROXY $FTP_PROXY"
++echo "GOPHER_PROXY $GOPHER_PROXY"
++echo "NO_PROXY $NO_PROXY"
+--- schemas/Makefile.am
++++ schemas/Makefile.am
+@@ -4,7 +4,8 @@
+ 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
++++ schemas/system_proxy.schemas.in
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<gconfschemafile>
++++++ desktop.patch ++++++
--- /var/tmp/diff_new_pack.6OBxch/_old 2006-09-01 10:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.6OBxch/_new 2006-09-01 10:34:54.000000000 +0200
@@ -1,15 +1,5 @@
---- control-center-2.12.2/capplets/accessibility/at-properties/at-properties.desktop.in.in
-+++ control-center-2.12.2/capplets/accessibility/at-properties/at-properties.desktop.in.in
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Assistive Technology Support
-+_Name=Assistive Technology
- _Comment=Enable support for GNOME assistive technologies at login
- Exec=gnome-at-properties
- Icon=gnome-settings-accessibility-technologies
---- control-center-2.12.2/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
-+++ control-center-2.12.2/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+--- 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
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -18,41 +8,41 @@
_Comment=Set your keyboard accessibility preferences
Exec=gnome-accessibility-keyboard-properties
Icon=gnome-settings-accessibility-keyboard
---- control-center-2.12.2/capplets/background/background.desktop.in.in
-+++ control-center-2.12.2/capplets/background/background.desktop.in.in
+--- 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 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Settings;Appearance;
-+Categories=GNOME;Application;Settings;
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GNOME;GTK;Settings;DesktopSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.12.2/capplets/default-applications/default-applications.desktop.in.in
-+++ control-center-2.12.2/capplets/default-applications/default-applications.desktop.in.in
+--- 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 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Application;Settings;AdvancedSettings;
-+Categories=GNOME;Application;Settings;DesktopSettings;AdvancedSettings;
+-Categories=GNOME;GTK;Settings;
++Categories=GNOME;GTK;Settings;Application;DesktopSettings;AdvancedSettings;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.12.2/capplets/display/display-properties.desktop.in.in
-+++ control-center-2.12.2/capplets/display/display-properties.desktop.in.in
+--- 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 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Settings;Appearance;
-+Categories=GNOME;Application;Settings;
+-Categories=GNOME;GTK;Settings;HardwareSettings;
++Categories=GNOME;GTK;Settings;HardwareSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.12.2/capplets/font/font-properties.desktop.in.in
-+++ control-center-2.12.2/capplets/font/font-properties.desktop.in.in
+--- control-center-2.15.91/capplets/font/font-properties.desktop.in.in
++++ control-center-2.15.91/capplets/font/font-properties.desktop.in.in
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
@@ -64,13 +54,13 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Settings;Appearance;
-+Categories=GNOME;Application;Settings;
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GNOME;GTK;Settings;DesktopSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.12.2/capplets/keybindings/keybinding.desktop.in.in
-+++ control-center-2.12.2/capplets/keybindings/keybinding.desktop.in.in
+--- control-center-2.15.91/capplets/keybindings/keybinding.desktop.in.in
++++ control-center-2.15.91/capplets/keybindings/keybinding.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -79,8 +69,8 @@
_Comment=Assign shortcut keys to commands
Exec=gnome-keybinding-properties
Icon=gnome-settings-keybindings
---- control-center-2.12.2/capplets/network/gnome-network-preferences.desktop.in.in
-+++ control-center-2.12.2/capplets/network/gnome-network-preferences.desktop.in.in
+--- 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
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
@@ -93,30 +83,30 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;AdvancedSettings;
+-Categories=GNOME;GTK;Settings;
++Categories=GNOME;GTK;Settings;AdvancedSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.12.2/capplets/sound/gnome-settings-sound.desktop.in.in
-+++ control-center-2.12.2/capplets/sound/gnome-settings-sound.desktop.in.in
+--- 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 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;AdvancedSettings;
+-Categories=GNOME;GTK;Settings;HardwareSettings;
++Categories=GNOME;GTK;Settings;HardwareSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
---- control-center-2.12.2/capplets/ui-properties/gnome-ui-properties.desktop.in.in
-+++ control-center-2.12.2/capplets/ui-properties/gnome-ui-properties.desktop.in.in
+--- 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 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;DesktopSettings;
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GNOME;GTK;Settings;DesktopSettings;Application;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org