? compile
? testpatch.diff
? capplets/default-applications/gnome-default-applications.xml
? capplets/default-applications/test.patch
? m4/intltool.m4
? po/stamp-it
Index: capplets/default-applications/gnome-da-capplet.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-capplet.c,v
retrieving revision 1.13
diff -u -r1.13 gnome-da-capplet.c
--- capplets/default-applications/gnome-da-capplet.c	9 May 2006 20:44:41 -0000	1.13
+++ capplets/default-applications/gnome-da-capplet.c	16 Oct 2006 11:57:49 -0000
@@ -72,6 +72,9 @@
     else if (widget == capplet->terminal_exec_flag_entry) {
 	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, text, &error);
     }
+    else if (widget == capplet->audio_player_command_entry) {
+	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_EXEC, text, &error);
+    }
 
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
@@ -96,6 +99,9 @@
     else if (GTK_WIDGET (togglebutton) == capplet->mail_reader_terminal_checkbutton) {
 	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, is_active, &error);
     }
+    else if (GTK_WIDGET (togglebutton) == capplet->audio_player_terminal_checkbutton) {
+	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_NEEDS_TERM, is_active, &error);
+    }
 
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
@@ -214,6 +220,7 @@
     gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
 }
 
+// FIXME: Merge two of these functions below...
 static void
 mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
@@ -221,7 +228,7 @@
     GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDAMailItem *item;
+    GnomeDASimpleItem *item;
     GConfChangeSet *cs;
     GError *error = NULL;
 
@@ -231,7 +238,7 @@
     gtk_tree_path_free (path);
 
     if (current_index < g_list_length (capplet->mail_readers)) {
-	item = (GnomeDAMailItem*) g_list_nth_data (capplet->mail_readers, current_index);
+	item = (GnomeDASimpleItem*) g_list_nth_data (capplet->mail_readers, current_index);
 	is_custom_active = FALSE;
 
 	cs = gconf_change_set_new ();
@@ -264,6 +271,55 @@
 }
 
 static void
+audio_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path;
+    guint current_index;
+    gboolean is_custom_active;
+    GnomeDASimpleItem *item;
+    GConfChangeSet *cs;
+    GError *error = NULL;
+
+    gtk_combo_box_get_active_iter (combo, &iter);
+    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
+    current_index = gtk_tree_path_get_indices (path)[0];
+    gtk_tree_path_free (path);
+
+    if (current_index < g_list_length (capplet->audio_players)) {
+	item = (GnomeDASimpleItem*) g_list_nth_data (capplet->audio_players, current_index);
+	is_custom_active = FALSE;
+
+	cs = gconf_change_set_new ();
+
+	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_AUDIO_EXEC, item->generic.command);
+	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_AUDIO_NEEDS_TERM, item->run_in_terminal);
+
+	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
+
+	if (error != NULL) {
+	    g_warning (_("Error saving configuration: %s"), error->message);
+	    g_error_free (error);
+	    error = NULL;
+	}
+
+	gconf_change_set_unref (cs);
+    }
+    else {
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->audio_player_command_entry),
+			gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_EXEC, NULL));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->audio_player_terminal_checkbutton),
+				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_NEEDS_TERM, NULL));
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->audio_player_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->audio_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive (capplet->audio_player_terminal_checkbutton, is_custom_active);
+}
+
+static void
 terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
     GtkTreeIter iter;
@@ -346,9 +402,9 @@
 } icons[] = {
     { "web_browser_image", "web-browser"      },
     { "mail_reader_image", "stock_mail-open"  },
+    { "sound_image",       "gnome-audio"      },
 /*    { "messenger_image",   "im"               },
  *    { "image_image",       "image-viewer"     },
- *    { "sound_image",       "gnome-audio"      },
  *    { "video_image",       "gnome-multimedia" },
  *    { "text_image",        "text-editor"      }, */
     { "terminal_image",    "gnome-terminal"   }
@@ -367,6 +423,7 @@
 
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
+    refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->audio_combo_box), capplet->audio_players);
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
 }
 
@@ -489,6 +546,7 @@
     gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
 }
 
+// FIXME: Merge two of the functions below
 static void
 mail_reader_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
 {
@@ -519,6 +577,35 @@
 }
 
 static void
+audio_player_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
+{
+    GList *entry;
+    gint index;
+    gboolean is_custom_active;
+
+    entry = g_list_find_custom (capplet->audio_players, command, (GCompareFunc) generic_item_comp);
+
+    if (entry) {
+	index = g_list_position (capplet->audio_players, entry);
+	is_custom_active = FALSE;
+    }
+    else {
+	/* index of 'Custom' combo box entry */
+	index = g_list_length (capplet->audio_players) + 1;
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->audio_player_command_entry), command);
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->audio_player_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->audio_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive (capplet->audio_player_terminal_checkbutton, is_custom_active);
+
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->audio_combo_box)) != index)
+	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->audio_combo_box), index);
+}
+
+static void
 terminal_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
 {
     GList *entry;
@@ -603,6 +690,7 @@
     }
 }
 
+// FIXME: Merge two functions below here...
 static void
 mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
 {
@@ -624,6 +712,26 @@
 }
 
 static void
+audio_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+{
+    GConfValue *value;
+
+    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+
+    if (!(value = gconf_entry_get_value (entry)))
+	return;
+
+    if (strcmp (entry->key, DEFAULT_APPS_KEY_AUDIO_EXEC) == 0) {
+	audio_player_update_combo_box (capplet, gconf_value_get_string (value));
+    }
+    /* TODO: Remove when GConfPropertyEditor will be used */
+    else if (strcmp (entry->key, DEFAULT_APPS_KEY_AUDIO_NEEDS_TERM) == 0) {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->audio_player_terminal_checkbutton),
+				      gconf_value_get_bool (value));
+    }
+}
+
+static void
 term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
 {
     GConfValue *value;
@@ -760,6 +868,12 @@
     capplet->mail_reader_command_label = glade_xml_get_widget (capplet->xml, "mail_reader_command_label");
     capplet->mail_reader_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "mail_reader_terminal_checkbutton");
 
+    /* Multimedia tab */
+    capplet->audio_player_command_entry = glade_xml_get_widget (capplet->xml, "sound_command_entry");
+    capplet->audio_player_command_label = glade_xml_get_widget (capplet->xml, "sound_command_label");
+    capplet->audio_player_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "sound_terminal_checkbutton");
+
+    /* System tab */
     capplet->terminal_command_entry = glade_xml_get_widget (capplet->xml, "terminal_command_entry");
     capplet->terminal_command_label = glade_xml_get_widget (capplet->xml, "terminal_command_label");
     capplet->terminal_exec_flag_entry = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_entry");
@@ -767,6 +881,7 @@
 
     capplet->web_combo_box = glade_xml_get_widget (capplet->xml, "web_browser_combobox");
     capplet->mail_combo_box = glade_xml_get_widget (capplet->xml, "mail_reader_combobox");
+    capplet->audio_combo_box = glade_xml_get_widget (capplet->xml, "sound_combobox");
     capplet->term_combo_box = glade_xml_get_widget (capplet->xml, "terminal_combobox");
 
     g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
@@ -774,6 +889,7 @@
 
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
+    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->audio_combo_box), capplet->audio_players);
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
 
     /* update ui to gconf content */
@@ -792,6 +908,13 @@
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mail_reader_terminal_checkbutton),
 				  gconf_value_get_bool (value));
 
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_EXEC, NULL);
+    audio_player_update_combo_box (capplet, gconf_value_get_string (value));
+
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_NEEDS_TERM, NULL);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->audio_player_terminal_checkbutton),
+				  gconf_value_get_bool (value));
+
     value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL);
     terminal_update_combo_box (capplet, gconf_value_get_string (value));
 
@@ -801,6 +924,7 @@
 
     g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet);
     g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet);
+    g_signal_connect (capplet->audio_combo_box, "changed", G_CALLBACK (audio_combo_changed_cb), capplet);
     g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet);
 
     /* TODO: Remove when GConfPropertyEditor will be used */
@@ -808,10 +932,13 @@
 		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
     g_signal_connect (capplet->mail_reader_terminal_checkbutton, "toggled",
 		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
+    g_signal_connect (capplet->audio_player_terminal_checkbutton, "toggled",
+		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
 
     /* TODO: Remove when GConfPropertyEditor will be used */
     g_signal_connect (capplet->web_browser_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
     g_signal_connect (capplet->mail_reader_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
+    g_signal_connect (capplet->audio_player_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
     g_signal_connect (capplet->terminal_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
     g_signal_connect (capplet->terminal_exec_flag_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
 
@@ -847,6 +974,7 @@
     capplet->gconf = gconf_client_get_default ();
 
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/browser", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/audio", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/terminal", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/url-handlers", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
@@ -855,6 +983,9 @@
 			     capplet, NULL, NULL);
     gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_MAILER_PATH,
 			     (GConfClientNotifyFunc) mail_gconf_changed_cb,
+			     capplet, NULL, NULL);
+    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_AUDIO_PATH,
+			     (GConfClientNotifyFunc) audio_gconf_changed_cb,
 			     capplet, NULL, NULL);
     gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_PATH,
 			     (GConfClientNotifyFunc) term_gconf_changed_cb,
Index: capplets/default-applications/gnome-da-capplet.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-capplet.h,v
retrieving revision 1.2
diff -u -r1.2 gnome-da-capplet.h
--- capplets/default-applications/gnome-da-capplet.h	28 Feb 2006 21:02:55 -0000	1.2
+++ capplets/default-applications/gnome-da-capplet.h	16 Oct 2006 11:57:49 -0000
@@ -53,6 +53,9 @@
 #define DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG DEFAULT_APPS_KEY_TERMINAL_PATH"/exec_arg"
 #define DEFAULT_APPS_KEY_TERMINAL_EXEC     DEFAULT_APPS_KEY_TERMINAL_PATH"/exec"
 
+#define DEFAULT_APPS_KEY_AUDIO_PATH        "/desktop/gnome/applications/audio"
+#define DEFAULT_APPS_KEY_AUDIO_NEEDS_TERM  DEFAULT_APPS_KEY_AUDIO_PATH"/needs_terminal"
+#define DEFAULT_APPS_KEY_AUDIO_EXEC        DEFAULT_APPS_KEY_AUDIO_PATH"/command"
 typedef struct _GnomeDACapplet GnomeDACapplet;
 
 struct _GnomeDACapplet {
@@ -65,6 +68,7 @@
     GtkWidget *web_combo_box;
     GtkWidget *mail_combo_box;
     GtkWidget *term_combo_box;
+    GtkWidget *audio_combo_box;
 
     GtkWidget *web_browser_command_entry;
     GtkWidget *web_browser_command_label;
@@ -82,11 +86,16 @@
     GtkWidget *terminal_exec_flag_entry;
     GtkWidget *terminal_exec_flag_label;
 
+    GtkWidget *audio_player_command_entry;
+    GtkWidget *audio_player_command_label;
+    GtkWidget *audio_player_terminal_checkbutton;
+
     GConfClient *gconf;
 
     GList *web_browsers;
     GList *mail_readers;
     GList *terminals;
+    GList *audio_players;
 };
 
 #endif
Index: capplets/default-applications/gnome-da-item.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-item.c,v
retrieving revision 1.2
diff -u -r1.2 gnome-da-item.c
--- capplets/default-applications/gnome-da-item.c	28 Feb 2006 21:02:55 -0000	1.2
+++ capplets/default-applications/gnome-da-item.c	16 Oct 2006 11:57:49 -0000
@@ -31,12 +31,12 @@
     return item;
 }
 
-GnomeDAMailItem*
-gnome_da_mail_item_new (void)
+GnomeDASimpleItem*
+gnome_da_simple_item_new (void)
 {
-    GnomeDAMailItem *item = NULL;
+    GnomeDASimpleItem *item = NULL;
 
-    item = g_new0 (GnomeDAMailItem, 1);
+    item = g_new0 (GnomeDASimpleItem, 1);
 
     return item;
 }
@@ -69,7 +69,7 @@
 }
 
 void
-gnome_da_mail_item_free (GnomeDAMailItem *item)
+gnome_da_simple_item_free (GnomeDASimpleItem *item)
 {
     g_return_if_fail (item != NULL);
 
Index: capplets/default-applications/gnome-da-item.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-item.h,v
retrieving revision 1.2
diff -u -r1.2 gnome-da-item.h
--- capplets/default-applications/gnome-da-item.h	28 Feb 2006 21:02:55 -0000	1.2
+++ capplets/default-applications/gnome-da-item.h	16 Oct 2006 11:57:49 -0000
@@ -26,8 +26,8 @@
 typedef struct _GnomeDAItem GnomeDAItem;
 
 typedef struct _GnomeDAWebItem GnomeDAWebItem;
-typedef struct _GnomeDAMailItem GnomeDAMailItem;
 typedef struct _GnomeDATermItem GnomeDATermItem;
+typedef struct _GnomeDASimpleItem GnomeDASimpleItem;
 
 struct _GnomeDAItem {
     gchar *name;
@@ -45,7 +45,7 @@
     gchar *win_command;
 };
 
-struct _GnomeDAMailItem {
+struct _GnomeDASimpleItem {
     GnomeDAItem generic;
     gboolean run_in_terminal;
 };
@@ -56,10 +56,10 @@
 };
 
 GnomeDAWebItem* gnome_da_web_item_new (void);
-GnomeDAMailItem* gnome_da_mail_item_new (void);
+GnomeDASimpleItem* gnome_da_simple_item_new (void);
 GnomeDATermItem* gnome_da_term_item_new (void);
 void gnome_da_web_item_free (GnomeDAWebItem *item);
-void gnome_da_mail_item_free (GnomeDAMailItem *item);
 void gnome_da_term_item_free (GnomeDATermItem *item);
+void gnome_da_simple_item_free (GnomeDASimpleItem *item);
 
 #endif
Index: capplets/default-applications/gnome-da-xml.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-xml.c,v
retrieving revision 1.4
diff -u -r1.4 gnome-da-xml.c
--- capplets/default-applications/gnome-da-xml.c	8 Feb 2006 16:47:49 -0000	1.4
+++ capplets/default-applications/gnome-da-xml.c	16 Oct 2006 11:57:50 -0000
@@ -129,8 +129,8 @@
     xmlDoc *xml_doc;
     xmlNode *root, *section, *element;
     GnomeDAWebItem *web_item;
-    GnomeDAMailItem *mail_item;
     GnomeDATermItem *term_item;
+    GnomeDASimpleItem *mail_item;
 
     xml_doc = xmlParseFile (filename);
 
@@ -163,11 +163,29 @@
 		}
 	    }
 	}
+	else if (!xmlStrncmp (section->name, "audio-players", 13)) {
+	    for (element = section->children; element != NULL; element = element->next) {
+		if (!xmlStrncmp (element->name, "audio-player", 12)) {
+		    if (is_executable_valid (gnome_da_xml_get_string (element, "executable"))) {
+			mail_item = gnome_da_simple_item_new ();
+
+			mail_item->generic.name = gnome_da_xml_get_string (element, "name");
+			mail_item->generic.executable = gnome_da_xml_get_string (element, "executable");
+			mail_item->generic.command = gnome_da_xml_get_string (element, "command");
+			mail_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
+
+			mail_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal");
+
+			capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item);
+		    }
+		}
+	    }
+	}
 	else if (!xmlStrncmp (section->name, "mail-readers", 12)) {
 	    for (element = section->children; element != NULL; element = element->next) {
 		if (!xmlStrncmp (element->name, "mail-reader", 11)) {
 		    if (is_executable_valid (gnome_da_xml_get_string (element, "executable"))) {
-			mail_item = gnome_da_mail_item_new ();
+			mail_item = gnome_da_simple_item_new ();
 
 			mail_item->generic.name = gnome_da_xml_get_string (element, "name");
 			mail_item->generic.executable = gnome_da_xml_get_string (element, "executable");
Index: capplets/default-applications/gnome-default-applications.xml.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in,v
retrieving revision 1.8
diff -u -r1.8 gnome-default-applications.xml.in
--- capplets/default-applications/gnome-default-applications.xml.in	9 May 2006 20:32:37 -0000	1.8
+++ capplets/default-applications/gnome-default-applications.xml.in	16 Oct 2006 11:57:50 -0000
@@ -294,5 +294,22 @@
       <exec-flag>-e</exec-flag>
     </terminal>
   </terminals>
+  <audio-players>
+      <audio-player>
+      <_name>Banshee Music Player</_name>
+      <executable>banshee</executable>
+      <command>banshee</command>
+      <icon-name>gnome-mime-application-x-executable</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+      </audio-player>
+
+      <audio-player>
+      <_name>Muine Music Player</_name>
+      <executable>muine</executable>
+      <command>muine</command>
+      <icon-name>gnome-mime-application-x-executable</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+      </audio-player>
+  </audio-players>
 
 </default-apps>
Index: gnome-settings-daemon/gnome-settings-multimedia-keys.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-multimedia-keys.c,v
retrieving revision 1.21
diff -u -r1.21 gnome-settings-multimedia-keys.c
--- gnome-settings-daemon/gnome-settings-multimedia-keys.c	24 Aug 2006 14:44:43 -0000	1.21
+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	16 Oct 2006 11:57:51 -0000
@@ -601,6 +601,26 @@
 }
 
 static void
+do_media_action (Acme *acme)
+{
+	char *string, *command;
+
+	string = gconf_client_get_string (acme->conf_client,
+			"/desktop/gnome/url-handlers/media/command",
+			NULL);
+
+	if (string == NULL || strcmp (string, "") == 0)
+		return;
+
+	command = g_strdup_printf (string, "");
+
+	execute (command, FALSE);
+
+	g_free (command);
+	g_free (string);
+}
+
+static void
 do_mail_action (Acme *acme)
 {
 	char *string, *command;
@@ -768,6 +788,9 @@
 		break;
 	case SEARCH_KEY:
 		execute ("gnome-search-tool", FALSE);
+		break;
+	case MEDIA_KEY:
+		do_media_action (acme);
 		break;
 	case EMAIL_KEY:
 		do_mail_action (acme);
Index: gnome-settings-daemon/actions/acme.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/actions/acme.h,v
retrieving revision 1.6
diff -u -r1.6 acme.h
--- gnome-settings-daemon/actions/acme.h	27 Apr 2006 09:50:42 -0000	1.6
+++ gnome-settings-daemon/actions/acme.h	16 Oct 2006 11:57:51 -0000
@@ -32,6 +32,7 @@
 	POWER_KEY,
 	EJECT_KEY,
 	HOME_KEY,
+	MEDIA_KEY,
 	SEARCH_KEY,
 	EMAIL_KEY,
 	SLEEP_KEY,
@@ -63,6 +64,7 @@
 	{ POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
 	{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
 	{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
+	{ MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL },
 	{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
 	{ EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL },
 	{ SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL },
Index: schemas/apps_gnome_settings_daemon_keybindings.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/schemas/apps_gnome_settings_daemon_keybindings.schemas.in,v
retrieving revision 1.7
diff -u -r1.7 apps_gnome_settings_daemon_keybindings.schemas.in
--- schemas/apps_gnome_settings_daemon_keybindings.schemas.in	27 Apr 2006 09:50:43 -0000	1.7
+++ schemas/apps_gnome_settings_daemon_keybindings.schemas.in	16 Oct 2006 11:57:52 -0000
@@ -84,6 +84,16 @@
             </locale>
         </schema>
 
+        <schema>
+            <key>/schemas/apps/gnome_settings_daemon/keybindings/media</key>
+            <applyto>/apps/gnome_settings_daemon/keybindings/media</applyto>
+            <type>string</type>
+            <default></default>
+            <locale name="C">
+                <short>Media player</short>
+                <long>Media player's shortcut.</long>
+            </locale>
+        </schema>
 
         <schema>
             <key>/schemas/apps/gnome_settings_daemon/keybindings/search</key>
