- merged from DEVEL

Changed files:
    control-center-capplet.patch -> 1.3
    control-center-def-apps-capplet-browsers.patch -> 1.4
    control-center-desktop.patch -> 1.3

diff --git a/control-center-capplet.patch b/control-center-capplet.patch
index 6d06e8c36d9d4b48bde8b5c63da35c4a6d869a5d..02b2df1b58e2542319212a9876002f1c7d7845f5 100644 (file)
--- a/control-center-capplet.patch
+++ b/control-center-capplet.patch
@@ -1,168 +1,168 @@
-diff -ur control-center-2.8.0.orig/capplets/accessibility/at-properties/at-properties.desktop.in control-center-2.8.0/capplets/accessibility/at-properties/at-properties.desktop.in
---- control-center-2.8.0.orig/capplets/accessibility/at-properties/at-properties.desktop.in    2003-12-16 22:38:05.000000000 +0100
-+++ control-center-2.8.0/capplets/accessibility/at-properties/at-properties.desktop.in 2004-09-16 22:40:26.432812736 +0200
+diff -ur control-center-2.8.0.orig/capplets/accessibility/at-properties/at-properties.desktop.in.in control-center-2.8.0/capplets/accessibility/at-properties/at-properties.desktop.in.in
+--- control-center-2.8.0.orig/capplets/accessibility/at-properties/at-properties.desktop.in.in 2003-12-16 22:38:05.000000000 +0100
++++ control-center-2.8.0/capplets/accessibility/at-properties/at-properties.desktop.in.in      2004-09-16 22:40:26.432812736 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Settings;Accessibility;
 +Categories=GTK;GNOME;Settings;Accessibility;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Assistive Technology Support
-diff -ur control-center-2.8.0.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in control-center-2.8.0/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in
---- control-center-2.8.0.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in        2003-12-16 22:38:05.000000000 +0100
-+++ control-center-2.8.0/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in     2004-09-16 22:40:37.486132376 +0200
+diff -ur control-center-2.8.0.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.8.0/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+--- control-center-2.8.0.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in     2003-12-16 22:38:05.000000000 +0100
++++ control-center-2.8.0/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in  2004-09-16 22:40:37.486132376 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;Accessibility;
 +Categories=GTK;GNOME;Settings;Accessibility;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Keyboard Accessibility
-diff -ur control-center-2.8.0.orig/capplets/background/background.desktop.in control-center-2.8.0/capplets/background/background.desktop.in
---- control-center-2.8.0.orig/capplets/background/background.desktop.in        2004-02-04 23:04:14.000000000 +0100
-+++ control-center-2.8.0/capplets/background/background.desktop.in     2004-09-16 22:40:49.479309136 +0200
+diff -ur control-center-2.8.0.orig/capplets/background/background.desktop.in.in control-center-2.8.0/capplets/background/background.desktop.in.in
+--- control-center-2.8.0.orig/capplets/background/background.desktop.in.in     2004-02-04 23:04:14.000000000 +0100
++++ control-center-2.8.0/capplets/background/background.desktop.in.in  2004-09-16 22:40:49.479309136 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Settings;Appearance;
 +Categories=GTK;GNOME;Settings;Appearance;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=background
-diff -ur control-center-2.8.0.orig/capplets/default-applications/default-applications.desktop.in control-center-2.8.0/capplets/default-applications/default-applications.desktop.in
---- control-center-2.8.0.orig/capplets/default-applications/default-applications.desktop.in    2003-12-16 22:38:07.000000000 +0100
-+++ control-center-2.8.0/capplets/default-applications/default-applications.desktop.in 2004-09-16 22:42:01.076424720 +0200
+diff -ur control-center-2.8.0.orig/capplets/default-applications/default-applications.desktop.in.in control-center-2.8.0/capplets/default-applications/default-applications.desktop.in.in
+--- control-center-2.8.0.orig/capplets/default-applications/default-applications.desktop.in.in 2003-12-16 22:38:07.000000000 +0100
++++ control-center-2.8.0/capplets/default-applications/default-applications.desktop.in.in      2004-09-16 22:42:01.076424720 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;AdvancedSettings;
 +Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=other capplets
-diff -ur control-center-2.8.0.orig/capplets/display/display-properties.desktop.in control-center-2.8.0/capplets/display/display-properties.desktop.in
---- control-center-2.8.0.orig/capplets/display/display-properties.desktop.in   2003-04-23 17:01:16.000000000 +0200
-+++ control-center-2.8.0/capplets/display/display-properties.desktop.in        2004-09-16 22:42:25.259748296 +0200
+diff -ur control-center-2.8.0.orig/capplets/display/display-properties.desktop.in.in control-center-2.8.0/capplets/display/display-properties.desktop.in.in
+--- control-center-2.8.0.orig/capplets/display/display-properties.desktop.in.in        2003-04-23 17:01:16.000000000 +0200
++++ control-center-2.8.0/capplets/display/display-properties.desktop.in.in     2004-09-16 22:42:25.259748296 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Settings;Appearance;
 +Categories=GTK;GNOME;Settings;Appearance;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=display properties
-diff -ur control-center-2.8.0.orig/capplets/font/font-properties.desktop.in control-center-2.8.0/capplets/font/font-properties.desktop.in
---- control-center-2.8.0.orig/capplets/font/font-properties.desktop.in 2003-12-16 22:38:11.000000000 +0100
-+++ control-center-2.8.0/capplets/font/font-properties.desktop.in      2004-09-16 22:47:31.484195104 +0200
+diff -ur control-center-2.8.0.orig/capplets/font/font-properties.desktop.in.in control-center-2.8.0/capplets/font/font-properties.desktop.in.in
+--- control-center-2.8.0.orig/capplets/font/font-properties.desktop.in.in      2003-12-16 22:38:11.000000000 +0100
++++ control-center-2.8.0/capplets/font/font-properties.desktop.in.in   2004-09-16 22:47:31.484195104 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Settings;Appearance;
 +Categories=GTK;GNOME;Settings;Appearance;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=font properties
-diff -ur control-center-2.8.0.orig/capplets/keybindings/keybinding.desktop.in control-center-2.8.0/capplets/keybindings/keybinding.desktop.in
---- control-center-2.8.0.orig/capplets/keybindings/keybinding.desktop.in       2003-12-16 22:38:13.000000000 +0100
-+++ control-center-2.8.0/capplets/keybindings/keybinding.desktop.in    2004-09-16 22:47:54.745658824 +0200
+diff -ur control-center-2.8.0.orig/capplets/keybindings/keybinding.desktop.in.in control-center-2.8.0/capplets/keybindings/keybinding.desktop.in.in
+--- control-center-2.8.0.orig/capplets/keybindings/keybinding.desktop.in.in    2003-12-16 22:38:13.000000000 +0100
++++ control-center-2.8.0/capplets/keybindings/keybinding.desktop.in.in 2004-09-16 22:47:54.745658824 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Keybinding
-diff -ur control-center-2.8.0.orig/capplets/keyboard/keyboard.desktop.in control-center-2.8.0/capplets/keyboard/keyboard.desktop.in
---- control-center-2.8.0.orig/capplets/keyboard/keyboard.desktop.in    2003-12-16 22:38:14.000000000 +0100
-+++ control-center-2.8.0/capplets/keyboard/keyboard.desktop.in 2004-09-16 22:48:42.817350816 +0200
+diff -ur control-center-2.8.0.orig/capplets/keyboard/keyboard.desktop.in.in control-center-2.8.0/capplets/keyboard/keyboard.desktop.in.in
+--- control-center-2.8.0.orig/capplets/keyboard/keyboard.desktop.in.in 2003-12-16 22:38:14.000000000 +0100
++++ control-center-2.8.0/capplets/keyboard/keyboard.desktop.in.in      2004-09-16 22:48:42.817350816 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Keyboard
-diff -ur control-center-2.8.0.orig/capplets/mouse/gnome-settings-mouse.desktop.in control-center-2.8.0/capplets/mouse/gnome-settings-mouse.desktop.in
---- control-center-2.8.0.orig/capplets/mouse/gnome-settings-mouse.desktop.in   2003-12-16 22:38:15.000000000 +0100
-+++ control-center-2.8.0/capplets/mouse/gnome-settings-mouse.desktop.in        2004-09-16 22:49:04.546047552 +0200
+diff -ur control-center-2.8.0.orig/capplets/mouse/gnome-settings-mouse.desktop.in.in control-center-2.8.0/capplets/mouse/gnome-settings-mouse.desktop.in.in
+--- control-center-2.8.0.orig/capplets/mouse/gnome-settings-mouse.desktop.in.in        2003-12-16 22:38:15.000000000 +0100
++++ control-center-2.8.0/capplets/mouse/gnome-settings-mouse.desktop.in.in     2004-09-16 22:49:04.546047552 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=mouse
-diff -ur control-center-2.8.0.orig/capplets/network/gnome-network-preferences.desktop.in control-center-2.8.0/capplets/network/gnome-network-preferences.desktop.in
---- control-center-2.8.0.orig/capplets/network/gnome-network-preferences.desktop.in    2004-04-15 20:32:22.000000000 +0200
-+++ control-center-2.8.0/capplets/network/gnome-network-preferences.desktop.in 2004-09-16 22:49:19.076838536 +0200
+diff -ur control-center-2.8.0.orig/capplets/network/gnome-network-preferences.desktop.in.in control-center-2.8.0/capplets/network/gnome-network-preferences.desktop.in.in
+--- control-center-2.8.0.orig/capplets/network/gnome-network-preferences.desktop.in.in 2004-04-15 20:32:22.000000000 +0200
++++ control-center-2.8.0/capplets/network/gnome-network-preferences.desktop.in.in      2004-09-16 22:49:19.076838536 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=network preferences
-diff -ur control-center-2.8.0.orig/capplets/sound/gnome-settings-sound.desktop.in control-center-2.8.0/capplets/sound/gnome-settings-sound.desktop.in
---- control-center-2.8.0.orig/capplets/sound/gnome-settings-sound.desktop.in   2003-12-16 22:38:50.000000000 +0100
-+++ control-center-2.8.0/capplets/sound/gnome-settings-sound.desktop.in        2004-09-16 22:50:00.206585864 +0200
+diff -ur control-center-2.8.0.orig/capplets/sound/gnome-settings-sound.desktop.in.in control-center-2.8.0/capplets/sound/gnome-settings-sound.desktop.in.in
+--- control-center-2.8.0.orig/capplets/sound/gnome-settings-sound.desktop.in.in        2003-12-16 22:38:50.000000000 +0100
++++ control-center-2.8.0/capplets/sound/gnome-settings-sound.desktop.in.in     2004-09-16 22:50:00.206585864 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=sound
-diff -ur control-center-2.8.0.orig/capplets/theme-switcher/gtk-theme-selector.desktop.in control-center-2.8.0/capplets/theme-switcher/gtk-theme-selector.desktop.in
---- control-center-2.8.0.orig/capplets/theme-switcher/gtk-theme-selector.desktop.in    2003-12-16 22:38:50.000000000 +0100
-+++ control-center-2.8.0/capplets/theme-switcher/gtk-theme-selector.desktop.in 2004-09-16 22:50:14.395428832 +0200
+diff -ur control-center-2.8.0.orig/capplets/theme-switcher/gtk-theme-selector.desktop.in.in control-center-2.8.0/capplets/theme-switcher/gtk-theme-selector.desktop.in.in
+--- control-center-2.8.0.orig/capplets/theme-switcher/gtk-theme-selector.desktop.in.in 2003-12-16 22:38:50.000000000 +0100
++++ control-center-2.8.0/capplets/theme-switcher/gtk-theme-selector.desktop.in.in      2004-09-16 22:50:14.395428832 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=theme-manager
-diff -ur control-center-2.8.0.orig/capplets/ui-properties/gnome-ui-properties.desktop.in control-center-2.8.0/capplets/ui-properties/gnome-ui-properties.desktop.in
---- control-center-2.8.0.orig/capplets/ui-properties/gnome-ui-properties.desktop.in    2003-12-16 22:38:51.000000000 +0100
-+++ control-center-2.8.0/capplets/ui-properties/gnome-ui-properties.desktop.in 2004-09-16 22:50:31.661803944 +0200
+diff -ur control-center-2.8.0.orig/capplets/ui-properties/gnome-ui-properties.desktop.in.in control-center-2.8.0/capplets/ui-properties/gnome-ui-properties.desktop.in.in
+--- control-center-2.8.0.orig/capplets/ui-properties/gnome-ui-properties.desktop.in.in 2003-12-16 22:38:51.000000000 +0100
++++ control-center-2.8.0/capplets/ui-properties/gnome-ui-properties.desktop.in.in      2004-09-16 22:50:31.661803944 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=other-capplets
-diff -ur control-center-2.8.0.orig/capplets/windows/window-properties.desktop.in control-center-2.8.0/capplets/windows/window-properties.desktop.in
---- control-center-2.8.0.orig/capplets/windows/window-properties.desktop.in    2003-12-16 22:38:52.000000000 +0100
-+++ control-center-2.8.0/capplets/windows/window-properties.desktop.in 2004-09-16 22:50:45.692670928 +0200
+diff -ur control-center-2.8.0.orig/capplets/windows/window-properties.desktop.in.in control-center-2.8.0/capplets/windows/window-properties.desktop.in.in
+--- control-center-2.8.0.orig/capplets/windows/window-properties.desktop.in.in 2003-12-16 22:38:52.000000000 +0100
++++ control-center-2.8.0/capplets/windows/window-properties.desktop.in.in      2004-09-16 22:50:45.692670928 +0200
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=Window preferences

diff --git a/control-center-def-apps-capplet-browsers.patch b/control-center-def-apps-capplet-browsers.patch
index b4cc73d3d470e484306488b418a568ba17628f78..927e4146677f54d39afef11c415fff5b82d48c4d 100644 (file)
--- a/control-center-def-apps-capplet-browsers.patch
+++ b/control-center-def-apps-capplet-browsers.patch
@@ -1,12 +1,11 @@
-diff -urN control-center-2.8.2.orig/capplets/default-applications/gnome-default-applications-properties-structs.c control-center-2.8.2/capplets/default-applications/gnome-default-applications-properties-structs.c
---- control-center-2.8.2.orig/capplets/default-applications/gnome-default-applications-properties-structs.c    2005-02-20 22:18:03.000000000 +0100
-+++ control-center-2.8.2/capplets/default-applications/gnome-default-applications-properties-structs.c 2005-02-25 13:50:29.483554672 +0100
+--- control-center-2.8.1/capplets/default-applications/gnome-default-applications-properties-structs.c.orig    2004-10-14 19:35:56.000000000 +0200
++++ control-center-2.8.1/capplets/default-applications/gnome-default-applications-properties-structs.c 2004-10-15 11:55:15.065483960 +0200
 @@ -10,7 +10,7 @@
          { N_("Galeon"),               "galeon",       "galeon %s",            FALSE, FALSE },
          { N_("Encompass"),            "encompass",    "encompass %s",         FALSE, FALSE },
-         { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
--        { N_("Firebird/FireFox"),  "mozilla-firefox", "mozilla-firebird %s",  FALSE, FALSE },
-+        { N_("Firebird/FireFox"),  "mozilla-firefox", "mozilla-firefox %s",  FALSE, FALSE },
-         { N_("Firebird/FireFox"),     "firefox",      "mozilla-firefox %s",   FALSE, FALSE },
-         { N_("Mozilla/Netscape 6"),   "mozilla-1.6",  "mozilla-1.6 %s",       FALSE, FALSE },
-         { N_("Mozilla/Netscape 6"),   "mozilla",      "mozilla %s",           FALSE, FALSE },
+         { N_("Firebird"),       "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
+-        { N_("Firefox"),      "firefox",      "firefox %s",   FALSE, FALSE },
++        { N_("Firefox"),      "mozilla-firefox",      "mozilla-firefox %s",   FALSE, FALSE },
+         { N_("Mozilla"),      "mozilla-1.6",  "mozilla-1.6 %s",       FALSE, FALSE },
+         { N_("Mozilla"),      "mozilla",      "mozilla %s",           FALSE, FALSE },
+         { N_("Netscape Communicator"),        "netscape",     "netscape %s",          FALSE, FALSE },

diff --git a/control-center-desktop.patch b/control-center-desktop.patch
index cc25bf94a2dca86071ec28e567e8a2eed0fec9ef..7b23ba8ecbe5ed24b57679de36a8c5e5a258b98b 100644 (file)
--- a/control-center-desktop.patch
+++ b/control-center-desktop.patch
@@ -1,12 +1,12 @@
-diff -urN control-center-2.8.1.orig/control-center/gnomecc.desktop.in control-center-2.8.1/control-center/gnomecc.desktop.in
---- control-center-2.8.1.orig/control-center/gnomecc.desktop.in        2004-11-17 13:20:05.575248376 +0100
-+++ control-center-2.8.1/control-center/gnomecc.desktop.in     2004-11-17 13:23:05.832845056 +0100
+diff -urN control-center-2.8.1.orig/control-center/gnomecc.desktop.in.in control-center-2.8.1/control-center/gnomecc.desktop.in.in
+--- control-center-2.8.1.orig/control-center/gnomecc.desktop.in.in     2004-11-17 13:20:05.575248376 +0100
++++ control-center-2.8.1/control-center/gnomecc.desktop.in.in  2004-11-17 13:23:05.832845056 +0100
 @@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;Application;Settings;
 +Categories=GTK;GNOME;Settings;
+ OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
- X-GNOME-Bugzilla-Component=shell