Merge in some pending patches

29 files changed, 114 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index f5cb10d7b..7d636dda2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-19  Jody Goldberg <jody@gnome.org>
 
+	* gnome-settings-daemon/gnome-settings-gtk1theme.h : fix cut-n-paste-o
+
+2002-08-19  Jody Goldberg <jody@gnome.org>
+
 	* gnome-settings-daemon/gnome-settings-gtk1theme.c : new
 	  file from owen to manage gtk1 themes.
 
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index d60d35314..42c1d1e3c 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* accessibility-keyboard.desktop.in: Fix the desktop file so that
+	it validates.
+
 2002-08-05  Jody Goldberg <jody@gnome.org>
 
 	* gnome-accessibility-keyboard-properties.glade : Restore the master
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in
index f55c01688..cb8d6eee2 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Keyboard
 _Comment=Set your keyboard accessibility preferences
 Exec=gnome-accessibility-keyboard-properties
 Icon=accessibility-keyboard-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;Accessibility;
+Categories=GNOME;Application;Settings;Accessibility;
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 97c39ba4b..fe5eb1bf5 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* background.desktop.in: Fix the desktop file so that it
+	validates.
+
 2002-07-12  Jody Goldberg <jody@gnome.org>
 
 	* background-properties.glade : The last of the ui-review.
diff --git a/capplets/background/background.desktop.in b/capplets/background/background.desktop.in
index 7b7fffffa..f314af602 100644
--- a/capplets/background/background.desktop.in
+++ b/capplets/background/background.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Background
 _Comment=Customize your desktop background
 Exec=gnome-background-properties
 Icon=background-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Settings;Appearance;
+Categories=GNOME;Settings;Appearance;
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 1501a2757..72312a4fa 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* default-applications.desktop.in: Fix the desktop file so that it
+	validates.
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0
diff --git a/capplets/default-applications/default-applications.desktop.in b/capplets/default-applications/default-applications.desktop.in
index efc0efdd8..afb168950 100644
--- a/capplets/default-applications/default-applications.desktop.in
+++ b/capplets/default-applications/default-applications.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Preferred Applications
 _Comment=Select your default applications
 Exec=gnome-default-applications-properties
 Icon=default-applications-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;AdvancedSettings
+Categories=GNOME;Application;Settings;AdvancedSettings;
diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index aaa1b3d63..a0e4a5162 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* file-types.desktop.in: Fix the desktop file so that it
+	validates.
+
+2002-08-19  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=88354
+	* file-types.desktop.in : minor update
+
 2002-08-10  Jody Goldberg <jody@gnome.org>
 
 	* file-types-properties.glade : fix missed capitalization for the
diff --git a/capplets/file-types/file-types.desktop.in b/capplets/file-types/file-types.desktop.in
index 8a63165ed..498807bea 100644
--- a/capplets/file-types/file-types.desktop.in
+++ b/capplets/file-types/file-types.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
-_Name=File Types and Programs
-_Comment=Associate applications with file types
+Encoding=UTF-8
+_Name=File types and programs
+_Comment=Specify which programs are used to open or view each type of file
 Icon=gnome-ccmime.png
 Exec=gnome-file-types-properties
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;AdvancedSettings;
+Categories=GNOME;Application;Settings;AdvancedSettings;
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 43b16cc07..135c99c82 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* font-properties.desktop.in: Fix the desktop file so that it
+	validates.
+
 2002-08-19  Jody Goldberg <jody@gnome.org>
 
 	* font-properties.glade :
diff --git a/capplets/font/font-properties.desktop.in b/capplets/font/font-properties.desktop.in
index 451e59202..965a5cccf 100644
--- a/capplets/font/font-properties.desktop.in
+++ b/capplets/font/font-properties.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Font
 _Comment=Select fonts for the desktop
 Exec=gnome-font-properties
 Icon=font-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Settings;Appearance;
+Categories=GNOME;Settings;Appearance;
diff --git a/capplets/keybindings/gnome-keybinding-properties.glade b/capplets/keybindings/gnome-keybinding-properties.glade
index e7094e07b..22eead877 100644
--- a/capplets/keybindings/gnome-keybinding-properties.glade
+++ b/capplets/keybindings/gnome-keybinding-properties.glade
@@ -155,7 +155,7 @@
 		  <property name="can_focus">True</property>
 		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
 		  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
diff --git a/capplets/keybindings/keybinding.desktop.in b/capplets/keybindings/keybinding.desktop.in
index 4fa0a75f7..357013110 100644
--- a/capplets/keybindings/keybinding.desktop.in
+++ b/capplets/keybindings/keybinding.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Keyboard Shortcuts
 _Comment=Assign shortcut keys to commands
 Exec=gnome-keybinding-properties
 Icon=keyboard-shortcut.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 1a6927bf6..d9ad23abf 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* keyboard.desktop.in: Fix the desktop file so that it validates.
+
 2002-08-15  Jody Goldberg <jody@gnome.org>
 
 	* gnome-keyboard-properties.glade : fix label and make consistent with
diff --git a/capplets/keyboard/keyboard.desktop.in b/capplets/keyboard/keyboard.desktop.in
index b6d9c9324..50894afbe 100644
--- a/capplets/keyboard/keyboard.desktop.in
+++ b/capplets/keyboard/keyboard.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Keyboard
 _Comment=Set your keyboard preferences
 Exec=gnome-keyboard-properties
 Icon=keyboard-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index e74ac181a..8ab1d443d 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* mouse.desktop.in: Fix the desktop file so that it validates.
+
 2002-08-08  Seth Nickell  <snickell@stanford.edu>
 
 	* gnome-mouse-properties.glade:
diff --git a/capplets/mouse/mouse.desktop.in b/capplets/mouse/mouse.desktop.in
index 6acb18afa..bd97b9c8b 100644
--- a/capplets/mouse/mouse.desktop.in
+++ b/capplets/mouse/mouse.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Mouse
 _Comment=Set your mouse preferences
 Exec=gnome-mouse-properties
 Icon=mouse-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 54af80077..8206a8420 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* gnome-network-preferences.desktop.in: Fix the desktop file so
+	that it validates.
+
 2002-08-08  Seth Nickell  <snickell@stanford.edu>
 
 	* gnome-network-preferences.glade:
diff --git a/capplets/network/gnome-network-preferences.desktop.in b/capplets/network/gnome-network-preferences.desktop.in
index f681f179f..8b29a4625 100644
--- a/capplets/network/gnome-network-preferences.desktop.in
+++ b/capplets/network/gnome-network-preferences.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Network Proxy
 _Comment=Network Proxy Preferences
 Exec=gnome-network-preferences
 Icon=gnome-globe.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index b881cb141..cf421f6da 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* sound.desktop.in: Fix the desktop file so that it validates.
+
 2002-07-31  Federico Mena Quintero  <federico@ximian.com>
 
 	* sound-properties-capplet.c (main): Do not pass -1 for the dialog
diff --git a/capplets/sound/sound.desktop.in b/capplets/sound/sound.desktop.in
index 1eaeece09..86b4b35b2 100644
--- a/capplets/sound/sound.desktop.in
+++ b/capplets/sound/sound.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Sound
 _Comment=Enable sound and associate sounds with events
 Exec=gnome-sound-properties
 Icon=gnome-audio2.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 32220e98d..90ece487d 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* gtk-theme-selector.desktop.in: Fix the desktop file so that it
+	validates.
+
 2002-08-07  Jody Goldberg <jody@gnome.org>
 	Patch from JRB for 88443
 
diff --git a/capplets/theme-switcher/gtk-theme-selector.desktop.in b/capplets/theme-switcher/gtk-theme-selector.desktop.in
index 06d61a552..27560d8ef 100644
--- a/capplets/theme-switcher/gtk-theme-selector.desktop.in
+++ b/capplets/theme-switcher/gtk-theme-selector.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Theme
 _Comment=Select themes for various parts of the desktop
 Exec=gnome-theme-properties
 Icon=gnome-ccthemes.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index a5457eae6..5cc624dba 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* behavior.desktop.in: Fix the desktop file so that it validates.
+
 2002-07-17  Jody Goldberg <jody@gnome.org>
 
 	* gnome-ui-properties.glade :  Use stock names
diff --git a/capplets/ui-properties/behavior.desktop.in b/capplets/ui-properties/behavior.desktop.in
index fd50b1340..e836bcda3 100644
--- a/capplets/ui-properties/behavior.desktop.in
+++ b/capplets/ui-properties/behavior.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Menus & Toolbars
 _Comment=Customize the appearance of toolbars and menubars in applications
 Exec=gnome-ui-properties
 Icon=behavior-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 96c9be0b8..878fc8a72 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* window-properties.desktop.in: Fix the desktop file so it
+	validates.
+
 2002-08-08  jacob berkman  <jacob@ximian.com>
 
 	* metacity-window-manager.c (_MetacityWindowManagerPrivate): add
diff --git a/capplets/windows/window-properties.desktop.in b/capplets/windows/window-properties.desktop.in
index c9b980dfc..b416d5af5 100644
--- a/capplets/windows/window-properties.desktop.in
+++ b/capplets/windows/window-properties.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Windows
 _Comment=Window Properties
 Exec=gnome-window-properties
 Icon=window-capplet.png
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
\ No newline at end of file
+Categories=GNOME;Application;Settings;
diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index a638531b4..a2feca6e1 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-19  Ross Burton  <ross@burtonini.com>
+
+	* gnomecc.desktop.in: Fix the desktop file so that it validates.
+
 2002-06-18  Jody Goldberg <jody@gnome.org>
 
  	http://bugzilla.gnome.org/show_bug.cgi?id=85003
diff --git a/control-center/gnomecc.desktop.in b/control-center/gnomecc.desktop.in
index c83f24626..26e2b6bf8 100644
--- a/control-center/gnomecc.desktop.in
+++ b/control-center/gnomecc.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=GNOME Control Center
 _Comment=The GNOME configuration tool
 Icon=control-center2.png
 Exec=gnome-control-center
-Terminal=0
+Terminal=false
 Type=Application
-Categories=Application;Settings;
+Categories=GNOME;Application;Settings;