Release 2.6.0GNOME_CONTROL_CENTER_2_6_0

2004-03-23  Jody Goldberg <jody@gnome.org>

	* Release 2.6.0

22 files changed, 107 insertions, 12 deletions

diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog
index 40766ea4d..434a088e6 100644
--- a/capplets/accessibility/at-properties/ChangeLog
+++ b/capplets/accessibility/at-properties/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 57080611d..143854461 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 725d58156..8fa78e9b7 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index d21ab809a..2eacab041 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 881437471..509708ab4 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/desktop-links/ChangeLog b/capplets/desktop-links/ChangeLog
index c9712a722..c7f578bf4 100644
--- a/capplets/desktop-links/ChangeLog
+++ b/capplets/desktop-links/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog
index 547aaabff..0929c2a49 100644
--- a/capplets/display/ChangeLog
+++ b/capplets/display/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index e45c8245d..dde03d305 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index beb66ad95..f1dee77a8 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index c8d84e864..56e061a68 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
+2004-03-22  Jody Goldberg <jody@gnome.org>
+
+	* gnome-keybinding-properties.c (reload_key_entries) : split the
+	  obvious media keys into a distinct category.  Call it 'Sound' to
+	  avoid string freeze problems.
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index db851829a..e681ddcd2 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -19,7 +19,7 @@
 
 #define LABEL_DATA "gnome-keybinding-properties-label"
 #define KEY_THEME_KEY "/desktop/gnome/interface/gtk_key_theme"
-#define MAX_ELEMENTS_BEFORE_SCROLLING 8
+#define MAX_ELEMENTS_BEFORE_SCROLLING 10
 
 #if defined(__powerpc__) && defined (__linux__)
 #define USE_FBLEVEL
@@ -41,32 +41,36 @@ typedef struct
 
 const KeyListEntry desktop_key_list[] =
 {
-  { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
-  { "/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/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 },
+  { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 },
-  { "/apps/gnome_settings_daemon/keybindings/eject", ALWAYS_VISIBLE, 0 },
+  { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 },
+  { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
-  { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 },
-  { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 },
-  { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
+  { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
+  { "/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 },
 #ifdef USE_FBLEVEL
   { "/apps/gnome_settings_daemon/keybindings/brightness_down", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/brightness_up", ALWAYS_VISIBLE, 0 },
 #endif
+  { NULL }
+};
+const KeyListEntry sounds_key_list[] =
+{
+  { "/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 */
   { "/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 },
   { "/apps/gnome_settings_daemon/keybindings/previous", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/next", ALWAYS_VISIBLE, 0 },
+  { "/apps/gnome_settings_daemon/keybindings/eject", ALWAYS_VISIBLE, 0 },
   { NULL }
 };
 
@@ -594,6 +598,7 @@ reload_key_entries (gpointer wm_name, GladeXML *dialog)
   clear_old_model (dialog, WID ("shortcut_treeview"));
   
   append_keys_to_tree (dialog, _("Desktop"), desktop_key_list);
+  append_keys_to_tree (dialog, _("Sound"), sounds_key_list);
   
   if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0)
     {
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 48ff11eae..0e2c46282 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/mime-type/ChangeLog b/capplets/mime-type/ChangeLog
index d4752a985..c8f2e57de 100644
--- a/capplets/mime-type/ChangeLog
+++ b/capplets/mime-type/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index d1392478b..e8fae9b09 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 8942214f6..a8975fb41 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/rollback/ChangeLog b/capplets/rollback/ChangeLog
index e8664de3e..61542ec8b 100644
--- a/capplets/rollback/ChangeLog
+++ b/capplets/rollback/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 52800a934..9d9df9d8f 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 9eb2c5ab1..f68170267 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index 5e2fdc619..106d2203c 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/url-properties/ChangeLog b/capplets/url-properties/ChangeLog
index 344badcf0..f01180efc 100644
--- a/capplets/url-properties/ChangeLog
+++ b/capplets/url-properties/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 34e4ccaf1..aaeb8412a 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4
diff --git a/capplets/wm-properties/ChangeLog b/capplets/wm-properties/ChangeLog
index ff1102406..0080fb6d0 100644
--- a/capplets/wm-properties/ChangeLog
+++ b/capplets/wm-properties/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-23  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.6.0
+
 2004-03-11  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.4