--- a/ChangeLog Wed Dec 17 05:31:00 2003 +0000
+++ b/ChangeLog Wed Dec 17 06:06:21 2003 +0000
@@ -1,3 +1,27 @@
+2003-12-17 Glynn Foster <[email protected]>
+
+ * control-center.spec: Update to 2.5.0
+ * ext-sources/accessx-status-applet.png: Remove, we don't need it.
+ * ext-sources/gnome-cardgame.png: Remove, we don't need it.
+ * ext-sources/gnome-keyboard-layout.png: Remove, we don't need it.
+ * patches/control-center-01-gnome-keyboard-layout.diff: Remove.
+ * patches/control-center-01-window-icon-themes.diff: Rename.
+ * patches/control-center-02-filetypes-proxy-menu-icon.diff: Rename.
+ * patches/control-center-02-potfiles.diff: Remove.
+ * patches/control-center-03-settings-menu-reorder.diff: Rename.
+ * patches/control-center-03-window-icon-themes.diff: Remove.
+ * patches/control-center-04-capplet-titles.diff: Rename.
+ * patches/control-center-04-filetypes-menu-proxy-icon.diff:
+ * patches/control-center-05-keybindings-close.diff: Rename.
+ * patches/control-center-05-settings-menu-reorder.diff:
+ * patches/control-center-06-capplet-titles.diff: Remove.
+ * patches/control-center-06-help-links.diff: Rename.
+ * patches/control-center-07-ctrl-alt-del.diff: Rename.
+ * patches/control-center-07-window-help.diff: Merge.
+ * patches/control-center-08-keybindings-close.diff: Remove.
+ * patches/control-center-09-help-links.diff: Remove.
+ * patches/control-center-10-ctrl-alt-del.diff: Remove.
+
2003-12-17 Glynn Foster <[email protected]>
* libxklavier.spec: Initial release.
--- a/control-center.spec Wed Dec 17 05:31:00 2003 +0000
+++ b/control-center.spec Wed Dec 17 06:06:21 2003 +0000
@@ -1,23 +1,36 @@
Name: control-center
License: GPL
Group: System/GUI/GNOME
-Version: 2.4.0
-Release: 5
+Version: 2.5.0
+Release: 1
Distribution: Mercury
Vendor: Sun Microsystems, Inc.
Summary: The GNOME control center for GNOME 2.4
Source: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.4/control-center-%{version}.tar.bz2
-Source1: gnome-keyboard-layout.png
-Patch1: control-center-01-gnome-keyboard-layout.diff
-Patch2: control-center-02-potfiles.diff
-Patch3: control-center-03-window-icon-themes.diff
-Patch4: control-center-04-filetypes-menu-proxy-icon.diff
-Patch5: control-center-05-settings-menu-reorder.diff
-Patch6: control-center-06-capplet-titles.diff
-Patch7: control-center-07-window-help.diff
-Patch8: control-center-08-keybindings-close.diff
-Patch9: control-center-09-help-links.diff
-Patch10: control-center-10-ctrl-alt-del.diff
+Source1: control-center-l10n-po-0.6.tar.bz2
+Source2: gnome-accessibility-keyboard-properties.1.gz
+Source3: gnome-background-properties.1.gz
+Source4: gnome-control-center.1.gz
+Source5: gnome-default-applications-properties.1.gz
+Source6: gnome-file-types-properties.1.gz
+Source7: gnome-keybinding-properties.1.gz
+Source8: gnome-keyboard-properties.1.gz
+Source9: gnome-mouse-properties.1.gz
+Source10: gnome-network-preferences.1.gz
+Source11: gnome-font-properties.1.gz
+Source12: gnome-settings-daemon.1.gz
+Source13: gnome-sound-properties.1.gz
+Source14: gnome-ui-properties.1.gz
+Source15: gnome-desktop-prefs.1.gz
+Source16: gnome-theme-manager.1.gz
+Source17: gnome-window-properties.1.gz
+Patch1: control-center-01-window-icon-themes.diff
+Patch2: control-center-02-filetypes-proxy-menu-icon.diff
+Patch3: control-center-03-settings-menu-reorder.diff
+Patch4: control-center-04-capplet-titles.diff
+Patch5: control-center-05-keybindings-close.diff
+Patch6: control-center-06-help-links.diff
+Patch7: control-center-07-ctrl-alt-del.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/control-center2
@@ -31,16 +44,19 @@
%define metacity_version 2.4.34
%define nautilus_version 2.4.0
%define fontilus_version 2.4.0
+%define libxklavier_version 0.95
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: esound-devel >= %{esound_version}
BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
BuildRequires: metacity >= %{metacity_version}
BuildRequires: nautilus-devel >= %{nautilus_version}
+BuildRequires: libxklavier-devel >= %{libxklavier_version}
Requires: libgnomeui >= %{libgnomeui_version}
Requires: esound >= %{esound_version}
Requires: gnome-desktop >= %{gnome_desktop_version}
Requires: nautilus >= %{nautilus_version}
+Requires: libxklavier >= %{libxklavier_version}
Obsoletes: fontilus < %{fontilus_version}
Provides: fontilus = %{fontilus_version}
@@ -50,6 +66,7 @@
%prep
%setup -q
+tar jxvf %SOURCE1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -57,11 +74,6 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
-cp %SOURCE1 capplets/gnome-keyboard-layout
%build
libtoolize --force
@@ -79,6 +91,27 @@
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+install -d $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE10 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE11 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE12 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE13 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE14 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE15 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE16 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE17 $RPM_BUILD_ROOT/usr/share/man/man1
+#Copy zh_HK from zh_TW
+#Fixes bug 4930405
+install -d $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES
+install --mode=0644 $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -112,8 +145,12 @@
%{_libdir}/*.so*
%{_libdir}/bonobo/servers/*
%{_libdir}/window-manager-settings/*.so*
+%{_mandir}/man1/*
%changelog
+* Wed Dec 17 2003 - [email protected]
+- Bump to 2.5.0
+
* Fri Oct 31 2003 - [email protected]
- Remove the Sun Support keywords since
we're moving away from the Extras menu.
Binary file ext-sources/accessx-status-applet.png has changed
Binary file ext-sources/gnome-cardgame.png has changed
Binary file ext-sources/gnome-keyboard-layout.png has changed
--- a/patches/control-center-01-gnome-keyboard-layout.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-diff -uNr control-center-2.4.0.patched/capplets/gnome-keyboard-layout/Makefile.am control-center-2.4.0.keyboard/capplets/gnome-keyboard-layout/Makefile.am
-diff -uNr control-center-2.4.0.patched/capplets/gnome-keyboard-layout/gnome-keyboard-layout.desktop.in control-center-2.4.0.keyboard/capplets/gnome-keyboard-layout/gnome-keyboard-layout.desktop.in
---- control-center-2.4.0.patched/capplets/gnome-keyboard-layout/gnome-keyboard-layout.desktop.in 1970-01-01 01:00:00.000000000 +0100
-+++ control-center-2.4.0.keyboard/capplets/gnome-keyboard-layout/gnome-keyboard-layout.desktop.in 2003-07-09 18:40:45.000000000 +0100
-@@ -0,0 +1,9 @@
-+[Desktop Entry]
-+_Name=Layout
-+_Comment=Select Keyboard Layout
-+TryExec=gnome-keyboard-layout
-+Exec=gnome-keyboard-layout
-+Terminal=False
-+Icon=gnome-keyboard-layout.png
-+Type=Application
-+Categories=Application;Settings;Keyboard;
-diff -uNr control-center-2.4.0.patched/configure.in control-center-2.4.0.keyboard/configure.in
---- control-center-2.4.0.patched/configure.in 2003-07-09 18:39:24.000000000 +0100
-+++ control-center-2.4.0.keyboard/configure.in 2003-07-09 18:47:04.000000000 +0100
-@@ -276,6 +276,7 @@
- capplets/file-types/Makefile
- capplets/file-types/libuuid/Makefile
- capplets/font/Makefile
-+capplets/gnome-keyboard-layout/Makefile
- capplets/keybindings/Makefile
- capplets/keyboard/Makefile
- capplets/mouse/Makefile
---- /dev/null 2003-05-07 12:19:55.000000000 -0700
-+++ control-center-2.4.0-hacked/capplets/gnome-keyboard-layout/Makefile.am 2003-07-22 06:34:39.000000000 -0700
-@@ -0,0 +1,10 @@
-+@INTLTOOL_DESKTOP_RULE@
-+
-+pixmapsdir = $(datadir)/pixmaps
-+pixmaps_DATA = gnome-keyboard-layout.png
-+
-+desktopdir = $(GNOMECC_DESKTOP_DIR)
-+Desktop_in_files = gnome-keyboard-layout.desktop.in
-+desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-+
-+EXTRA_DIST = $(Desktop_in_files) $(pixmaps_DATA)
---- control-center-2.4.0/capplets/Makefile.am 2003-06-26 05:35:45.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/Makefile.am 2003-10-20 00:41:41.000000000 -1200
-@@ -3,7 +3,8 @@
- default-applications desktop-links font \
- background keyboard mouse sound \
- file-types theme-switcher ui-properties \
-- keybindings network windows
-+ keybindings network windows \
-+ gnome-keyboard-layout
-
- if HAVE_RANDR
- randr_SUBDIRS = display
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-01-window-icon-themes.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,46 @@
+--- control-center-2.4.0/capplets/common/capplet-util.c 2002-07-11 05:02:41.000000000 +1200
++++ control-center-2.4.0-hacked/capplets/common/capplet-util.c 2003-10-31 04:24:34.000000000 +1300
+@@ -353,12 +353,39 @@
+ capplet_set_icon (GtkWidget *window, char const *icon_file_name)
+ {
+ char *path;
+- GdkPixbuf *icon_pixbuf;
++ char *tmp;
++ char *p;
++ GdkPixbuf *icon_pixbuf = NULL;
++ GnomeIconTheme *icon_theme;
++
++ /* First look up from the icon theme */
++ icon_theme = gnome_icon_theme_new ();
++
++ tmp = g_strdup (icon_file_name);
++ p = strrchr (tmp, '.');
++ if (p)
++ p[0] = '\0';
++
++ path = gnome_icon_theme_lookup_icon (icon_theme, tmp, 48, NULL, NULL);
++
++ if (path != NULL) {
++ icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
++ g_free (path);
++ }
++
++ g_free (tmp);
++ g_object_unref (icon_theme);
++
++ if (icon_pixbuf == NULL) {
++ /* Then we fallback to the control center icon location */
++ path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
++
++ icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
++ g_free (path);
++ }
+
+- path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
+- icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
+- g_free (path);
+ if (icon_pixbuf == NULL) {
++ /* Then we fallback to the gnome program discovery stuff */
+ path = gnome_pixmap_file (icon_file_name);
+ if (path != NULL) {
+ icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-02-filetypes-proxy-menu-icon.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,60 @@
+--- control-center-2.4.0/capplets/file-types/file-types.desktop.in 2002-12-10 16:21:38.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/file-types/file-types.desktop.in 2003-07-17 09:02:03.000000000 -0700
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=File types and programs
++_Name=File Associations
+ _Comment=Specify which programs are used to open or view each type of file
+ Icon=gnome-ccmime.png
+ Exec=gnome-file-types-properties
+--- control-center-2.4.0/capplets/network/gnome-network-preferences.desktop.in 2002-12-10 16:32:08.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.desktop.in 2003-07-17 09:47:28.000000000 -0700
+@@ -3,7 +3,7 @@
+ _Name=Network proxy
+ _Comment=Network proxy preferences
+ Exec=gnome-network-preferences
+-Icon=gnome-globe.png
++Icon=gnome-proxy.png
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+--- control-center-2.4.0/capplets/file-types/file-types-properties.glade 2003-08-04 03:33:22.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/file-types/file-types-properties.glade 2003-10-20 00:43:04.000000000 -1200
+@@ -6,7 +6,7 @@
+
+ <widget class="GtkDialog" id="main_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">File Types and Programs</property>
++ <property name="title" translatable="yes">File Associations</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="modal">no</property>
+ <property name="default_width">500</property>
+--- control-center-2.4.0/capplets/network/gnome-network-preferences.c 2003-08-26 07:33:44.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.c 2003-10-20 01:46:43.000000000 -1200
+@@ -316,7 +316,7 @@
+
+ setup_dialog (dialog);
+ widget = WID ("network_dialog");
+- capplet_set_icon (widget, "gnome-network-capplet.png");
++ capplet_set_icon (widget, "gnome-proxy.png");
+ gtk_widget_show_all (widget);
+ gtk_main ();
+
+--- control-center-2.4.0/capplets/network/Makefile.am 2003-07-21 10:14:13.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/network/Makefile.am 2003-10-20 01:48:43.000000000 -1200
+@@ -9,13 +9,10 @@
+ gladedir = $(GNOMECC_GLADE_DIR)
+ glade_DATA = gnome-network-preferences.glade
+
+-iconsdir = $(GNOMECC_ICONS_DIR)
+-icons_DATA = gnome-network-capplet.png
+-
+ desktopdir = $(GNOMECC_DESKTOP_DIR)
+ desktop_in_files = gnome-network-preferences.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
+ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+-EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(desktop_in_files)
++EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
--- a/patches/control-center-02-potfiles.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
---- control-center-2.4.0/po/POTFILES.in 2003-08-01 07:21:31.000000000 -1200
-+++ control-center-2.4.0-hacked/po/POTFILES.in 2003-10-20 00:10:17.000000000 -1200
-@@ -21,18 +21,6 @@
- capplets/default-applications/gnome-default-applications-properties.glade
- capplets/desktop-links/Accessibility.directory.in.in
- capplets/desktop-links/Advanced.directory.in.in
--capplets/desktop-links/Sawfish/Sawfish.directory.in.in
--capplets/desktop-links/Sawfish/appearance-properties.desktop.in
--capplets/desktop-links/Sawfish/bindings-properties.desktop.in
--capplets/desktop-links/Sawfish/focus-properties.desktop.in
--capplets/desktop-links/Sawfish/match-properties.desktop.in
--capplets/desktop-links/Sawfish/maximize-properties.desktop.in
--capplets/desktop-links/Sawfish/meta-properties.desktop.in
--capplets/desktop-links/Sawfish/misc-properties.desktop.in
--capplets/desktop-links/Sawfish/move-properties.desktop.in
--capplets/desktop-links/Sawfish/placement-properties.desktop.in
--capplets/desktop-links/Sawfish/sound-properties.desktop.in
--capplets/desktop-links/Sawfish/workspace-properties.desktop.in
- capplets/desktop-links/legacy-applications.desktop.in.in
- capplets/display/display-properties.desktop.in
- capplets/display/main.c
-@@ -48,6 +36,7 @@
- capplets/file-types/service-info.c
- capplets/font/font-properties.desktop.in
- capplets/font/font-properties.glade
-+capplets/gnome-keyboard-layout/gnome-keyboard-layout.desktop.in
- capplets/keybindings/eggcellrendererkeys.c
- capplets/keybindings/gnome-keybinding-properties.c
- capplets/keybindings/gnome-keybinding-properties.glade
-@@ -64,8 +53,6 @@
- capplets/sound/sound-properties-capplet.c
- capplets/sound/sound-properties.glade
- capplets/sound/sound.desktop.in
--capplets/theme-switcher/control/GNOME_Theme_Preview.server.in
--capplets/theme-switcher/control/control.c
- capplets/theme-switcher/gnome-theme-details.c
- capplets/theme-switcher/gnome-theme-manager.c
- capplets/theme-switcher/gnome-theme-save.c
-@@ -74,7 +61,6 @@
- capplets/theme-switcher/theme-properties.glade
- capplets/theme-switcher/theme-switcher.c
- capplets/ui-properties/behavior.desktop.in
--capplets/ui-properties/behavior.desktop.in.in
- capplets/ui-properties/gnome-ui-properties.c
- capplets/ui-properties/gnome-ui-properties.glade
- capplets/windows/gnome-window-properties.c
-@@ -101,9 +87,6 @@
- libsounds/sound-view.c
- libwindow-settings/gnome-wm-manager.c
- libwindow-settings/metacity-window-manager.c
--schemas/apps_gnome_settings_daemon_default_editor.schemas.in
--schemas/apps_gnome_settings_daemon_screensaver.schemas.in
--schemas/desktop_gnome_font_rendering.schemas.in
- typing-break/drw-break-window.c
- typing-break/drwright.c
- typing-break/main.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-03-settings-menu-reorder.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,127 @@
+--- control-center-2.4.0/capplets/ui-properties/behavior.desktop.in 2002-12-10 16:32:10.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/ui-properties/behavior.desktop.in 2003-07-21 04:55:49.000000000 -0700
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;Application;Settings;
++Categories=GNOME;Application;Settings;Appearance;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+ X-GNOME-Bugzilla-Component=other-capplets
+--- control-center-2.4.0/capplets/theme-switcher/gtk-theme-selector.desktop.in 2002-12-10 16:32:10.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/theme-switcher/gtk-theme-selector.desktop.in 2003-07-21 04:56:03.000000000 -0700
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;Application;Settings;
++Categories=GNOME;Application;Settings;Appearance;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+ X-GNOME-Bugzilla-Component=theme-manager
+--- control-center-2.4.0/capplets/keyboard/keyboard.desktop.in 2002-12-10 16:32:07.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/keyboard/keyboard.desktop.in 2003-07-21 04:57:41.000000000 -0700
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Keyboard
+-_Comment=Set your keyboard preferences
++_Name=Behavior
++_Comment=Set your keyboard behavior
+ Exec=gnome-keyboard-properties
+ Icon=keyboard-capplet.png
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;Application;Settings;
++Categories=GNOME;Application;Settings;Keyboard;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+ X-GNOME-Bugzilla-Component=Keyboard
+--- /dev/null 2003-05-07 12:19:55.000000000 -0700
++++ control-center-2.4.0-hacked/capplets/desktop-links/Keyboard.directory.in.in 2003-07-21 05:34:21.000000000 -0700
+@@ -0,0 +1,5 @@
++[Desktop Entry]
++_Name=Keyboard
++_Comment=Keyboard Settings
++Type=Directory
++Icon=accessibility-keyboard-capplet.png
+--- /dev/null 2003-05-07 12:19:55.000000000 -0700
++++ control-center-2.4.0-hacked/capplets/desktop-links/Appearance.directory.in.in 2003-07-21 05:33:46.000000000 -0700
+@@ -0,0 +1,5 @@
++[Desktop Entry]
++_Name=Display
++_Comment=Display Settings
++Type=Directory
++Icon=display-capplet.png
+--- control-center-2.4.0/capplets/network/gnome-network-preferences.desktop.in 2002-12-10 16:32:08.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.desktop.in 2003-07-21 05:42:02.000000000 -0700
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Network Proxy
+-_Comment=Network proxy preferences
++_Name=Internet
++_Comment=Configure your internet settings
+ Exec=gnome-network-preferences
+ Icon=gnome-globe.png
+ Terminal=false
+--- control-center-2.4.0/capplets/keybindings/keybinding.desktop.in 2002-12-10 16:21:41.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/keybindings/keybinding.desktop.in 2003-07-21 06:25:36.000000000 -0700
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Keyboard Shortcuts
++_Name=Shortcuts
+ _Comment=Assign shortcut keys to commands
+ Exec=gnome-keybinding-properties
+ Icon=keyboard-shortcut.png
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;Application;Settings;
++Categories=GNOME;Application;Settings;Keyboard;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+ X-GNOME-Bugzilla-Component=Keybinding
+--- control-center-2.4.0/capplets/desktop-links/Makefile.am 2002-12-06 02:53:21.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/desktop-links/Makefile.am 2003-07-21 06:37:18.000000000 -0700
+@@ -5,7 +5,7 @@
+
+ pixmaps_pre = $(capplets:=-capplet.png)
+ pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
+-pixmapsdir = $(GNOMECC_ICONS_DIR)
++pixmapsdir = $(datadir)/pixmaps
+
+ ##
+ ## Desktop files
+@@ -37,7 +37,7 @@
+ ## foo.directory.in is merged with the translations to create foo.directory
+ ## foo.directory is installed and renamed
+ ##
+-groups = Advanced Accessibility
++groups = Advanced Accessibility Appearance Keyboard
+ groups_files = $(groups:=.directory)
+ groups_in_files = $(groups_files:.directory=.directory.in)
+ groups_in_in_files = $(groups_files:.directory=.directory.in.in)
+diff -urN control-center-2.4.0/capplets/windows/window-properties.desktop.in control-center-2.4.0-hacked/capplets/windows/window-properties.desktop.in
+--- control-center-2.4.0/capplets/windows/window-properties.desktop.in 2002-12-11 13:32:12.000000000 +1300
++++ control-center-2.4.0-hacked/capplets/windows/window-properties.desktop.in 2003-11-27 02:13:59.000000000 +1300
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Windows
+-_Comment=Window Properties
++_Name=Window Behavior
++_Comment=Window Behavior Preferences
+ Exec=gnome-window-properties
+ Icon=window-capplet.png
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;Application;Settings;
++Categories=GNOME;Application;Settings;Appearance;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+ X-GNOME-Bugzilla-Component=Window preferences
--- a/patches/control-center-03-window-icon-themes.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
---- control-center-2.4.0/capplets/common/capplet-util.c 2002-07-11 05:02:41.000000000 +1200
-+++ control-center-2.4.0-hacked/capplets/common/capplet-util.c 2003-10-31 04:24:34.000000000 +1300
-@@ -353,12 +353,39 @@
- capplet_set_icon (GtkWidget *window, char const *icon_file_name)
- {
- char *path;
-- GdkPixbuf *icon_pixbuf;
-+ char *tmp;
-+ char *p;
-+ GdkPixbuf *icon_pixbuf = NULL;
-+ GnomeIconTheme *icon_theme;
-+
-+ /* First look up from the icon theme */
-+ icon_theme = gnome_icon_theme_new ();
-+
-+ tmp = g_strdup (icon_file_name);
-+ p = strrchr (tmp, '.');
-+ if (p)
-+ p[0] = '\0';
-+
-+ path = gnome_icon_theme_lookup_icon (icon_theme, tmp, 48, NULL, NULL);
-+
-+ if (path != NULL) {
-+ icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
-+ g_free (path);
-+ }
-+
-+ g_free (tmp);
-+ g_object_unref (icon_theme);
-+
-+ if (icon_pixbuf == NULL) {
-+ /* Then we fallback to the control center icon location */
-+ path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
-+
-+ icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
-+ g_free (path);
-+ }
-
-- path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
-- icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
-- g_free (path);
- if (icon_pixbuf == NULL) {
-+ /* Then we fallback to the gnome program discovery stuff */
- path = gnome_pixmap_file (icon_file_name);
- if (path != NULL) {
- icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-04-capplet-titles.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,127 @@
+--- ../control-center-2.4.0/capplets/font/font-properties.glade 2003-02-05 13:37:48.000000000 -0800
++++ control-center-2.4.0/capplets/font/font-properties.glade 2003-07-22 08:43:49.000000000 -0700
+@@ -5,8 +5,8 @@
+ <requires lib="gnome"/>
+
+ <widget class="GtkDialog" id="font_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Font Preferences</property>
++ <property name="title" translatable="yes">Font</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- ../control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.glade 2002-12-03 22:41:33.000000000 -0800
++++ ./capplets/keybindings/gnome-keybinding-properties.glade 2003-07-22 08:44:13.000000000 -0700
+@@ -4,8 +4,8 @@
+ <glade-interface>
+
+ <widget class="GtkDialog" id="gnome-keybinding-dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Keyboard Shortcuts</property>
++ <property name="title" translatable="yes">Shortcuts</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- ../control-center-2.4.0/capplets/mouse/gnome-mouse-properties.glade 2002-08-08 00:13:31.000000000 -0700
++++ control-center-2.4.0/capplets/mouse/gnome-mouse-properties.glade 2003-07-22 08:44:47.000000000 -0700
+@@ -4,8 +4,8 @@
+ <glade-interface>
+
+ <widget class="GtkDialog" id="mouse_properties_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Mouse Preferences</property>
++ <property name="title" translatable="yes">Mouse</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- ../control-center-2.4.0/capplets/sound/sound-properties.glade 2002-10-11 02:55:25.000000000 -0700
++++ control-center-2.4.0/capplets/sound/sound-properties.glade 2003-07-22 08:45:32.000000000 -0700
+@@ -4,8 +4,8 @@
+ <glade-interface>
+
+ <widget class="GtkWindow" id="window1">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Sound Preferences</property>
++ <property name="title" translatable="yes">Sound</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- ../control-center-2.4.0/capplets/ui-properties/gnome-ui-properties.glade 2002-10-01 08:18:37.000000000 -0700
++++ control-center-2.4.0/capplets/ui-properties/gnome-ui-properties.glade 2003-07-22 08:46:03.000000000 -0700
+@@ -4,8 +4,8 @@
+ <glade-interface>
+
+ <widget class="GtkDialog" id="gnome_ui_properties_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Menu and Toolbar Preferences</property>
++ <property name="title" translatable="yes">Menus and Toolbars</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- ../control-center-2.4.0/capplets/windows/gnome-window-properties.glade 2002-12-01 17:14:14.000000000 -0800
++++ control-center-2.4.0/capplets/windows/gnome-window-properties.glade 2003-07-22 08:46:16.000000000 -0700
+@@ -5,7 +5,7 @@
+
+ <widget class="GtkDialog" id="main-dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Window Preferences</property>
++ <property name="title" translatable="yes">Windows</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- ../control-center-2.4.0/capplets/keyboard/gnome-keyboard-properties.glade 2002-12-12 21:06:34.000000000 -0800
++++ control-center-2.4.0/capplets/keyboard/gnome-keyboard-properties.glade 2003-07-22 08:44:32.000000000 -0700
+@@ -5,8 +5,8 @@
+ <requires lib="gnome"/>
+
+ <widget class="GtkDialog" id="keyboard_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Keyboard Preferences</property>
++ <property name="title" translatable="yes">Keyboard Behavior</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- control-center-2.4.0/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade 2003-08-04 03:33:20.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade 2003-10-20 00:57:35.000000000 -1200
+@@ -5,7 +5,7 @@
+
+ <widget class="GtkDialog" id="accessX_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Keyboard Accessibility Preferences (AccessX)</property>
++ <property name="title" translatable="yes">Keyboard Accessibility (AccessX)</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- control-center-2.4.0/capplets/theme-switcher/theme-properties.glade 2003-08-05 07:34:51.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/theme-switcher/theme-properties.glade 2003-10-20 00:56:58.000000000 -1200
+@@ -6,7 +6,7 @@
+
+ <widget class="GtkDialog" id="theme_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Theme Preferences</property>
++ <property name="title" translatable="yes">Theme</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- control-center-2.4.0/capplets/background/background-properties.glade 2003-08-04 03:33:21.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/background/background-properties.glade 2003-10-20 00:57:59.000000000 -1200
+@@ -5,7 +5,7 @@
+ <requires lib="gnome"/>
+
+ <widget class="GtkWindow" id="background_preference_window">
+- <property name="title" translatable="yes">Background Preferences</property>
++ <property name="title" translatable="yes">Background</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+--- control-center-2.4.0/capplets/network/gnome-network-preferences.glade 2003-08-26 05:42:33.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.glade 2003-10-20 00:58:29.000000000 -1200
+@@ -6,7 +6,7 @@
+
+ <widget class="GtkDialog" id="network_dialog">
+ <property name="border_width">5</property>
+- <property name="title" translatable="yes">Network Proxy Configuration</property>
++ <property name="title" translatable="yes">Internet</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
--- a/patches/control-center-04-filetypes-menu-proxy-icon.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
---- control-center-2.4.0/capplets/file-types/file-types.desktop.in 2002-12-10 16:21:38.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/file-types/file-types.desktop.in 2003-07-17 09:02:03.000000000 -0700
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=File types and programs
-+_Name=File Associations
- _Comment=Specify which programs are used to open or view each type of file
- Icon=gnome-ccmime.png
- Exec=gnome-file-types-properties
---- control-center-2.4.0/capplets/network/gnome-network-preferences.desktop.in 2002-12-10 16:32:08.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.desktop.in 2003-07-17 09:47:28.000000000 -0700
-@@ -3,7 +3,7 @@
- _Name=Network proxy
- _Comment=Network proxy preferences
- Exec=gnome-network-preferences
--Icon=gnome-globe.png
-+Icon=gnome-proxy.png
- Terminal=false
- Type=Application
- StartupNotify=true
---- control-center-2.4.0/capplets/file-types/file-types-properties.glade 2003-08-04 03:33:22.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/file-types/file-types-properties.glade 2003-10-20 00:43:04.000000000 -1200
-@@ -6,7 +6,7 @@
-
- <widget class="GtkDialog" id="main_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">File Types and Programs</property>
-+ <property name="title" translatable="yes">File Associations</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="modal">no</property>
- <property name="default_width">500</property>
---- control-center-2.4.0/capplets/network/gnome-network-preferences.c 2003-08-26 07:33:44.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.c 2003-10-20 01:46:43.000000000 -1200
-@@ -316,7 +316,7 @@
-
- setup_dialog (dialog);
- widget = WID ("network_dialog");
-- capplet_set_icon (widget, "gnome-network-capplet.png");
-+ capplet_set_icon (widget, "gnome-proxy.png");
- gtk_widget_show_all (widget);
- gtk_main ();
-
---- control-center-2.4.0/capplets/network/Makefile.am 2003-07-21 10:14:13.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/network/Makefile.am 2003-10-20 01:48:43.000000000 -1200
-@@ -9,13 +9,10 @@
- gladedir = $(GNOMECC_GLADE_DIR)
- glade_DATA = gnome-network-preferences.glade
-
--iconsdir = $(GNOMECC_ICONS_DIR)
--icons_DATA = gnome-network-capplet.png
--
- desktopdir = $(GNOMECC_DESKTOP_DIR)
- desktop_in_files = gnome-network-preferences.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
- INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(desktop_in_files)
-+EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-05-keybindings-close.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,11 @@
+diff -urN control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c control-center-2.4.0-hacked/capplets/keybindings/gnome-keybinding-properties.c
+--- control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c 2003-01-21 06:54:05.000000000 -0800
++++ control-center-2.4.0-hacked/capplets/keybindings/gnome-keybinding-properties.c 2003-08-07 04:24:10.000000000 -0700
+@@ -941,7 +941,6 @@
+ gtk_widget_show (widget);
+
+ g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK(cb_dialog_response), NULL);
+- g_signal_connect (G_OBJECT (widget), "close", gtk_main_quit, NULL);
+ }
+
+ int
--- a/patches/control-center-05-settings-menu-reorder.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
---- control-center-2.4.0/capplets/ui-properties/behavior.desktop.in 2002-12-10 16:32:10.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/ui-properties/behavior.desktop.in 2003-07-21 04:55:49.000000000 -0700
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Appearance;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=other-capplets
---- control-center-2.4.0/capplets/theme-switcher/gtk-theme-selector.desktop.in 2002-12-10 16:32:10.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/theme-switcher/gtk-theme-selector.desktop.in 2003-07-21 04:56:03.000000000 -0700
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Appearance;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=theme-manager
---- control-center-2.4.0/capplets/keyboard/keyboard.desktop.in 2002-12-10 16:32:07.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/keyboard/keyboard.desktop.in 2003-07-21 04:57:41.000000000 -0700
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Keyboard
--_Comment=Set your keyboard preferences
-+_Name=Behavior
-+_Comment=Set your keyboard behavior
- Exec=gnome-keyboard-properties
- Icon=keyboard-capplet.png
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Keyboard;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Keyboard
---- /dev/null 2003-05-07 12:19:55.000000000 -0700
-+++ control-center-2.4.0-hacked/capplets/desktop-links/Keyboard.directory.in.in 2003-07-21 05:34:21.000000000 -0700
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+_Name=Keyboard
-+_Comment=Keyboard Settings
-+Type=Directory
-+Icon=accessibility-keyboard-capplet.png
---- /dev/null 2003-05-07 12:19:55.000000000 -0700
-+++ control-center-2.4.0-hacked/capplets/desktop-links/Appearance.directory.in.in 2003-07-21 05:33:46.000000000 -0700
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+_Name=Display
-+_Comment=Display Settings
-+Type=Directory
-+Icon=display-capplet.png
---- control-center-2.4.0/capplets/network/gnome-network-preferences.desktop.in 2002-12-10 16:32:08.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.desktop.in 2003-07-21 05:42:02.000000000 -0700
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Network Proxy
--_Comment=Network proxy preferences
-+_Name=Internet
-+_Comment=Configure your internet settings
- Exec=gnome-network-preferences
- Icon=gnome-globe.png
- Terminal=false
---- control-center-2.4.0/capplets/keybindings/keybinding.desktop.in 2002-12-10 16:21:41.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/keybindings/keybinding.desktop.in 2003-07-21 06:25:36.000000000 -0700
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Keyboard Shortcuts
-+_Name=Shortcuts
- _Comment=Assign shortcut keys to commands
- Exec=gnome-keybinding-properties
- Icon=keyboard-shortcut.png
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Keyboard;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Keybinding
---- control-center-2.4.0/capplets/desktop-links/Makefile.am 2002-12-06 02:53:21.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/desktop-links/Makefile.am 2003-07-21 06:37:18.000000000 -0700
-@@ -5,7 +5,7 @@
-
- pixmaps_pre = $(capplets:=-capplet.png)
- pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
--pixmapsdir = $(GNOMECC_ICONS_DIR)
-+pixmapsdir = $(datadir)/pixmaps
-
- ##
- ## Desktop files
-@@ -37,7 +37,7 @@
- ## foo.directory.in is merged with the translations to create foo.directory
- ## foo.directory is installed and renamed
- ##
--groups = Advanced Accessibility
-+groups = Advanced Accessibility Appearance Keyboard
- groups_files = $(groups:=.directory)
- groups_in_files = $(groups_files:.directory=.directory.in)
- groups_in_in_files = $(groups_files:.directory=.directory.in.in)
-diff -urN control-center-2.4.0/capplets/windows/window-properties.desktop.in control-center-2.4.0-hacked/capplets/windows/window-properties.desktop.in
---- control-center-2.4.0/capplets/windows/window-properties.desktop.in 2002-12-11 13:32:12.000000000 +1300
-+++ control-center-2.4.0-hacked/capplets/windows/window-properties.desktop.in 2003-11-27 02:13:59.000000000 +1300
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Windows
--_Comment=Window Properties
-+_Name=Window Behavior
-+_Comment=Window Behavior Preferences
- Exec=gnome-window-properties
- Icon=window-capplet.png
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Appearance;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Window preferences
--- a/patches/control-center-06-capplet-titles.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
---- ../control-center-2.4.0/capplets/font/font-properties.glade 2003-02-05 13:37:48.000000000 -0800
-+++ control-center-2.4.0/capplets/font/font-properties.glade 2003-07-22 08:43:49.000000000 -0700
-@@ -5,8 +5,8 @@
- <requires lib="gnome"/>
-
- <widget class="GtkDialog" id="font_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Font Preferences</property>
-+ <property name="title" translatable="yes">Font</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- ../control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.glade 2002-12-03 22:41:33.000000000 -0800
-+++ ./capplets/keybindings/gnome-keybinding-properties.glade 2003-07-22 08:44:13.000000000 -0700
-@@ -4,8 +4,8 @@
- <glade-interface>
-
- <widget class="GtkDialog" id="gnome-keybinding-dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Keyboard Shortcuts</property>
-+ <property name="title" translatable="yes">Shortcuts</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- ../control-center-2.4.0/capplets/mouse/gnome-mouse-properties.glade 2002-08-08 00:13:31.000000000 -0700
-+++ control-center-2.4.0/capplets/mouse/gnome-mouse-properties.glade 2003-07-22 08:44:47.000000000 -0700
-@@ -4,8 +4,8 @@
- <glade-interface>
-
- <widget class="GtkDialog" id="mouse_properties_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Mouse Preferences</property>
-+ <property name="title" translatable="yes">Mouse</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- ../control-center-2.4.0/capplets/sound/sound-properties.glade 2002-10-11 02:55:25.000000000 -0700
-+++ control-center-2.4.0/capplets/sound/sound-properties.glade 2003-07-22 08:45:32.000000000 -0700
-@@ -4,8 +4,8 @@
- <glade-interface>
-
- <widget class="GtkWindow" id="window1">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Sound Preferences</property>
-+ <property name="title" translatable="yes">Sound</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- ../control-center-2.4.0/capplets/ui-properties/gnome-ui-properties.glade 2002-10-01 08:18:37.000000000 -0700
-+++ control-center-2.4.0/capplets/ui-properties/gnome-ui-properties.glade 2003-07-22 08:46:03.000000000 -0700
-@@ -4,8 +4,8 @@
- <glade-interface>
-
- <widget class="GtkDialog" id="gnome_ui_properties_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Menu and Toolbar Preferences</property>
-+ <property name="title" translatable="yes">Menus and Toolbars</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- ../control-center-2.4.0/capplets/windows/gnome-window-properties.glade 2002-12-01 17:14:14.000000000 -0800
-+++ control-center-2.4.0/capplets/windows/gnome-window-properties.glade 2003-07-22 08:46:16.000000000 -0700
-@@ -5,7 +5,7 @@
-
- <widget class="GtkDialog" id="main-dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Window Preferences</property>
-+ <property name="title" translatable="yes">Windows</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- ../control-center-2.4.0/capplets/keyboard/gnome-keyboard-properties.glade 2002-12-12 21:06:34.000000000 -0800
-+++ control-center-2.4.0/capplets/keyboard/gnome-keyboard-properties.glade 2003-07-22 08:44:32.000000000 -0700
-@@ -5,8 +5,8 @@
- <requires lib="gnome"/>
-
- <widget class="GtkDialog" id="keyboard_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Keyboard Preferences</property>
-+ <property name="title" translatable="yes">Keyboard Behavior</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- control-center-2.4.0/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade 2003-08-04 03:33:20.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade 2003-10-20 00:57:35.000000000 -1200
-@@ -5,7 +5,7 @@
-
- <widget class="GtkDialog" id="accessX_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Keyboard Accessibility Preferences (AccessX)</property>
-+ <property name="title" translatable="yes">Keyboard Accessibility (AccessX)</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- control-center-2.4.0/capplets/theme-switcher/theme-properties.glade 2003-08-05 07:34:51.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/theme-switcher/theme-properties.glade 2003-10-20 00:56:58.000000000 -1200
-@@ -6,7 +6,7 @@
-
- <widget class="GtkDialog" id="theme_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Theme Preferences</property>
-+ <property name="title" translatable="yes">Theme</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- control-center-2.4.0/capplets/background/background-properties.glade 2003-08-04 03:33:21.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/background/background-properties.glade 2003-10-20 00:57:59.000000000 -1200
-@@ -5,7 +5,7 @@
- <requires lib="gnome"/>
-
- <widget class="GtkWindow" id="background_preference_window">
-- <property name="title" translatable="yes">Background Preferences</property>
-+ <property name="title" translatable="yes">Background</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
---- control-center-2.4.0/capplets/network/gnome-network-preferences.glade 2003-08-26 05:42:33.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/network/gnome-network-preferences.glade 2003-10-20 00:58:29.000000000 -1200
-@@ -6,7 +6,7 @@
-
- <widget class="GtkDialog" id="network_dialog">
- <property name="border_width">5</property>
-- <property name="title" translatable="yes">Network Proxy Configuration</property>
-+ <property name="title" translatable="yes">Internet</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-06-help-links.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,61 @@
+diff -urN control-center-2.4.0/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c control-center-2.4.0-hacked/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
+--- control-center-2.4.0/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c 2003-05-04 10:49:13.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c 2003-10-20 02:36:23.000000000 -1200
+@@ -72,7 +72,7 @@
+ switch (response_id) {
+ case GTK_RESPONSE_HELP:
+ capplet_help (GTK_WINDOW (widget),
+- "wgoscustaccess.xml",
++ "wgoscustdesk.xml",
+ "goscustaccess-6");
+ break;
+ case GTK_RESPONSE_DELETE_EVENT:
+diff -urN control-center-2.4.0/capplets/default-applications/gnome-default-applications-properties.c control-center-2.4.0-hacked/capplets/default-applications/gnome-default-applications-properties.c
+--- control-center-2.4.0/capplets/default-applications/gnome-default-applications-properties.c 2003-08-01 07:45:43.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/default-applications/gnome-default-applications-properties.c 2003-10-20 02:36:43.000000000 -1200
+@@ -559,7 +559,7 @@
+ GladeXML *dialog)
+ {
+ if (response_id == GTK_RESPONSE_HELP)
+- capplet_help (GTK_WINDOW (widget), "wgoscustlookandfeel.xml", "goscustdoc-2");
++ capplet_help (GTK_WINDOW (widget), "wgoscustdesk.xml", "goscustdoc-2");
+ else
+ gtk_main_quit ();
+ }
+diff -urN control-center-2.4.0/capplets/display/main.c control-center-2.4.0-hacked/capplets/display/main.c
+--- control-center-2.4.0/capplets/display/main.c 2003-08-05 10:48:26.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/display/main.c 2003-10-20 02:37:10.000000000 -1200
+@@ -685,7 +685,7 @@
+ case GTK_RESPONSE_HELP:
+ /* FIXME: This needs to be changed to the right section
+ * when the docs have been written. */
+- capplet_help (GTK_WINDOW (dialog), "wgoscustdesk.xml", "goscustdesk-38");
++ capplet_help (GTK_WINDOW (dialog), "wgoscustdesk.xml", "goscustdesk-70");
+ break;
+ case GTK_RESPONSE_APPLY:
+ save_computer = info->per_computer_check != NULL && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (info->per_computer_check));
+diff -urN control-center-2.4.0/capplets/file-types/file-types-capplet.c control-center-2.4.0-hacked/capplets/file-types/file-types-capplet.c
+--- control-center-2.4.0/capplets/file-types/file-types-capplet.c 2002-10-02 22:18:55.000000000 -1200
++++ control-center-2.4.0-hacked/capplets/file-types/file-types-capplet.c 2003-10-20 02:35:33.000000000 -1200
+@@ -165,7 +165,7 @@
+ {
+ if (response_id == GTK_RESPONSE_HELP)
+ capplet_help (GTK_WINDOW (dialog),
+- "wgoscustlookandfeel.xml",
++ "wgoscustdesk.xml",
+ "goscustdoc-7");
+ else
+ gtk_main_quit ();
+--- control-center-2.4.0/capplets/windows/gnome-window-properties.c 2003-06-01 12:34:20.000000000 -0700
++++ control-center-2.4.0-hacked/capplets/windows/gnome-window-properties.c 2003-08-05 05:23:23.000000000 -0700
+@@ -354,7 +354,9 @@
+ {
+
+ if (response_id == GTK_RESPONSE_HELP) {
+-
++ capplet_help (GTK_WINDOW (dialog_win),
++ "wgoscustdesk.xml",
++ "goscustdesk-58");
+ } else {
+ gtk_widget_destroy (dialog_win);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-07-ctrl-alt-del.diff Wed Dec 17 06:06:21 2003 +0000
@@ -0,0 +1,10 @@
+--- control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c 2003-11-12 20:40:54.000000000 +1300
++++ control-center-2.4.0-hacked/capplets/keybindings/gnome-keybinding-properties.c 2003-11-12 20:41:31.000000000 +1300
+@@ -39,6 +39,7 @@
+ { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
+ { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
+ { "/apps/metacity/global_keybindings/run_command_window_screenshot", ALWAYS_VISIBLE, 0 },
++ { "/apps/metacity/global_keybindings/run_command_process_manager", ALWAYS_VISIBLE, 0 },
+ { NULL }
+ };
+
--- a/patches/control-center-07-window-help.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- control-center-2.4.0/capplets/windows/gnome-window-properties.c 2003-06-01 12:34:20.000000000 -0700
-+++ control-center-2.4.0-hacked/capplets/windows/gnome-window-properties.c 2003-08-05 05:23:23.000000000 -0700
-@@ -354,7 +354,9 @@
- {
-
- if (response_id == GTK_RESPONSE_HELP) {
--
-+ capplet_help (GTK_WINDOW (dialog_win),
-+ "wgoscustdesk.xml",
-+ "goscustdesk-58");
- } else {
- gtk_widget_destroy (dialog_win);
- }
--- a/patches/control-center-08-keybindings-close.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urN control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c control-center-2.4.0-hacked/capplets/keybindings/gnome-keybinding-properties.c
---- control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c 2003-01-21 06:54:05.000000000 -0800
-+++ control-center-2.4.0-hacked/capplets/keybindings/gnome-keybinding-properties.c 2003-08-07 04:24:10.000000000 -0700
-@@ -941,7 +941,6 @@
- gtk_widget_show (widget);
-
- g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK(cb_dialog_response), NULL);
-- g_signal_connect (G_OBJECT (widget), "close", gtk_main_quit, NULL);
- }
-
- int
--- a/patches/control-center-09-help-links.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-diff -urN control-center-2.4.0/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c control-center-2.4.0-hacked/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
---- control-center-2.4.0/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c 2003-05-04 10:49:13.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c 2003-10-20 02:36:23.000000000 -1200
-@@ -72,7 +72,7 @@
- switch (response_id) {
- case GTK_RESPONSE_HELP:
- capplet_help (GTK_WINDOW (widget),
-- "wgoscustaccess.xml",
-+ "wgoscustdesk.xml",
- "goscustaccess-6");
- break;
- case GTK_RESPONSE_DELETE_EVENT:
-diff -urN control-center-2.4.0/capplets/default-applications/gnome-default-applications-properties.c control-center-2.4.0-hacked/capplets/default-applications/gnome-default-applications-properties.c
---- control-center-2.4.0/capplets/default-applications/gnome-default-applications-properties.c 2003-08-01 07:45:43.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/default-applications/gnome-default-applications-properties.c 2003-10-20 02:36:43.000000000 -1200
-@@ -559,7 +559,7 @@
- GladeXML *dialog)
- {
- if (response_id == GTK_RESPONSE_HELP)
-- capplet_help (GTK_WINDOW (widget), "wgoscustlookandfeel.xml", "goscustdoc-2");
-+ capplet_help (GTK_WINDOW (widget), "wgoscustdesk.xml", "goscustdoc-2");
- else
- gtk_main_quit ();
- }
-diff -urN control-center-2.4.0/capplets/display/main.c control-center-2.4.0-hacked/capplets/display/main.c
---- control-center-2.4.0/capplets/display/main.c 2003-08-05 10:48:26.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/display/main.c 2003-10-20 02:37:10.000000000 -1200
-@@ -685,7 +685,7 @@
- case GTK_RESPONSE_HELP:
- /* FIXME: This needs to be changed to the right section
- * when the docs have been written. */
-- capplet_help (GTK_WINDOW (dialog), "wgoscustdesk.xml", "goscustdesk-38");
-+ capplet_help (GTK_WINDOW (dialog), "wgoscustdesk.xml", "goscustdesk-70");
- break;
- case GTK_RESPONSE_APPLY:
- save_computer = info->per_computer_check != NULL && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (info->per_computer_check));
-diff -urN control-center-2.4.0/capplets/file-types/file-types-capplet.c control-center-2.4.0-hacked/capplets/file-types/file-types-capplet.c
---- control-center-2.4.0/capplets/file-types/file-types-capplet.c 2002-10-02 22:18:55.000000000 -1200
-+++ control-center-2.4.0-hacked/capplets/file-types/file-types-capplet.c 2003-10-20 02:35:33.000000000 -1200
-@@ -165,7 +165,7 @@
- {
- if (response_id == GTK_RESPONSE_HELP)
- capplet_help (GTK_WINDOW (dialog),
-- "wgoscustlookandfeel.xml",
-+ "wgoscustdesk.xml",
- "goscustdoc-7");
- else
- gtk_main_quit ();
--- a/patches/control-center-10-ctrl-alt-del.diff Wed Dec 17 05:31:00 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c 2003-11-12 20:40:54.000000000 +1300
-+++ control-center-2.4.0-hacked/capplets/keybindings/gnome-keybinding-properties.c 2003-11-12 20:41:31.000000000 +1300
-@@ -39,6 +39,7 @@
- { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
- { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
- { "/apps/metacity/global_keybindings/run_command_window_screenshot", ALWAYS_VISIBLE, 0 },
-+ { "/apps/metacity/global_keybindings/run_command_process_manager", ALWAYS_VISIBLE, 0 },
- { NULL }
- };
- 
