Index: capplets/default-applications/gnome-default-applications.xml.in
===================================================================
--- capplets/default-applications/gnome-default-applications.xml.in	(revision 7399)
+++ capplets/default-applications/gnome-default-applications.xml.in	(working copy)
@@ -318,5 +318,38 @@
       <exec-flag>-e</exec-flag>
     </terminal>
   </terminals>
+  <media-players>
+    <media-player>
+	  <_name>Banshee Music Player</_name>
+	  <executable>banshee</executable>
+	  <command>banshee</command>
+	  <icon-name>music-player-banshee</icon-name>
+	  <run-in-terminal>false</run-in-terminal>
+	</media-player>
 
+    <media-player>
+	  <_name>Muine Music Player</_name>
+	  <executable>muine</executable>
+	  <command>muine</command>
+	  <icon-name>muine</icon-name>
+	  <run-in-terminal>false</run-in-terminal>
+	</media-player>
+
+	<media-player>
+	  <_name>Rhythmbox Music Player</_name>
+	  <executable>rhythmbox</executable>
+	  <command>rhythmbox</command>
+	  <icon-name>rhythmbox</icon-name>
+	  <run-in-terminal>false</run-in-terminal>
+	</media-player>
+
+	<media-player>
+	  <_name>Totem Movie Player</_name>
+	  <executable>totem</executable>
+	  <command>totem</command>
+	  <icon-name>totem</icon-name>
+	  <run-in-terminal>false</run-in-terminal>
+    </media-player>
+
+  </media-players>
 </default-apps>
Index: capplets/default-applications/gnome-default-applications-properties.glade
===================================================================
--- capplets/default-applications/gnome-default-applications-properties.glade	(revision 7399)
+++ capplets/default-applications/gnome-default-applications-properties.glade	(working copy)
@@ -293,7 +293,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">mail_reader_command_entry</property>
+				  <property name="mnemonic_widget">web_browser_command_entry</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -521,6 +521,8 @@
 
 	      <child>
 		<widget class="GtkVBox" id="messenger_vbox">
+ 		  <!-- Messenger has been disabled -->
+ 		  <property name="visible">False</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
@@ -731,13 +733,15 @@
 
 	  <child>
 	    <widget class="GtkVBox" id="multimedia_vbox">
+	      <property name="visible">True</property>
 	      <property name="border_width">12</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">18</property>
 
 	      <child>
 		<widget class="GtkVBox" id="image_vbox">
-		  <property name="visible">True</property>
+		  <!-- Image viewer has been disabled -->
+		  <property name="visible">False</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
@@ -918,15 +922,15 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="sound_vbox">
+		<widget class="GtkVBox" id="media_player_vbox">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="sound_label">
+		    <widget class="GtkLabel" id="media_player_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Audio Player&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Multimedia Player&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -949,13 +953,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="sound_hbox">
+		    <widget class="GtkHBox" id="media_player_hbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">12</property>
 
 		      <child>
-			<widget class="GtkImage" id="sound_image">
+			<widget class="GtkImage" id="media_player_image">
 			  <property name="visible">True</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0</property>
@@ -970,13 +974,13 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="sound_options_vbox">
+			<widget class="GtkVBox" id="media_player_options_vbox">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkComboBox" id="sound_combobox">
+			    <widget class="GtkComboBox" id="media_player_combobox">
 			      <property name="visible">True</property>
 			      <property name="add_tearoffs">False</property>
 			      <property name="focus_on_click">True</property>
@@ -989,7 +993,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkTable" id="sound_options_table">
+			    <widget class="GtkTable" id="media_player_options_table">
 			      <property name="visible">True</property>
 			      <property name="n_rows">1</property>
 			      <property name="n_columns">3</property>
@@ -998,7 +1002,7 @@
 			      <property name="column_spacing">12</property>
 
 			      <child>
-				<widget class="GtkLabel" id="sound_command_label">
+				<widget class="GtkLabel" id="media_player_command_label">
 				  <property name="visible">True</property>
 				  <property name="sensitive">False</property>
 				  <property name="label" translatable="yes">Co_mmand:</property>
@@ -1011,7 +1015,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">sound_command_entry</property>
+				  <property name="mnemonic_widget">media_player_command_entry</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -1028,7 +1032,7 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkEntry" id="sound_command_entry">
+				<widget class="GtkEntry" id="media_player_command_entry">
 				  <property name="visible">True</property>
 				  <property name="tooltip" translatable="yes">All %s occurrences will be replaced with actual link</property>
 				  <property name="can_focus">True</property>
@@ -1049,7 +1053,7 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkCheckButton" id="sound_terminal_checkbox">
+				<widget class="GtkCheckButton" id="media_player_terminal_checkbutton">
 				  <property name="visible">True</property>
 				  <property name="sensitive">False</property>
 				  <property name="can_focus">True</property>
@@ -1101,7 +1105,8 @@
 
 	      <child>
 		<widget class="GtkVBox" id="video_vbox">
-		  <property name="visible">True</property>
+		  <!-- Video player has been disabled -->
+		  <property name="visible">False</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
Index: capplets/default-applications/gnome-da-capplet.h
===================================================================
--- capplets/default-applications/gnome-da-capplet.h	(revision 7399)
+++ capplets/default-applications/gnome-da-capplet.h	(working copy)
@@ -58,6 +58,10 @@
 #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_MEDIA_PATH        "/desktop/gnome/applications/media"
+#define DEFAULT_APPS_KEY_MEDIA_EXEC        DEFAULT_APPS_KEY_MEDIA_PATH"/exec"
+#define DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM  DEFAULT_APPS_KEY_MEDIA_PATH"/needs_term"
+
 typedef struct _GnomeDACapplet GnomeDACapplet;
 
 struct _GnomeDACapplet {
@@ -70,6 +74,7 @@ struct _GnomeDACapplet {
     GtkWidget *web_combo_box;
     GtkWidget *mail_combo_box;
     GtkWidget *term_combo_box;
+    GtkWidget *media_combo_box;
 
     GtkWidget *web_browser_command_entry;
     GtkWidget *web_browser_command_label;
@@ -87,11 +92,16 @@ struct _GnomeDACapplet {
     GtkWidget *terminal_exec_flag_entry;
     GtkWidget *terminal_exec_flag_label;
 
+    GtkWidget *media_player_command_entry;
+    GtkWidget *media_player_command_label;
+    GtkWidget *media_player_terminal_checkbutton;
+
     GConfClient *gconf;
 
     GList *web_browsers;
     GList *mail_readers;
     GList *terminals;
+    GList *media_players;
 };
 
 #endif
Index: capplets/default-applications/gnome-da-item.c
===================================================================
--- capplets/default-applications/gnome-da-item.c	(revision 7399)
+++ capplets/default-applications/gnome-da-item.c	(working copy)
@@ -31,12 +31,12 @@ gnome_da_web_item_new (void)
     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 @@ gnome_da_web_item_free (GnomeDAWebItem *
 }
 
 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-xml.c
===================================================================
--- capplets/default-applications/gnome-da-xml.c	(revision 7399)
+++ capplets/default-applications/gnome-da-xml.c	(working copy)
@@ -130,7 +130,8 @@ gnome_da_xml_load_xml (GnomeDACapplet *c
     xmlNode *root, *section, *element;
     gchar *executable;
     GnomeDAWebItem *web_item;
-    GnomeDAMailItem *mail_item;
+    GnomeDASimpleItem *mail_item;
+    GnomeDASimpleItem *media_item;
     GnomeDATermItem *term_item;
 
     xml_doc = xmlParseFile (filename);
@@ -172,7 +173,7 @@ gnome_da_xml_load_xml (GnomeDACapplet *c
 		if (!xmlStrncmp (element->name, "mail-reader", 11)) {
 		    executable = gnome_da_xml_get_string (element, "executable");
 		    if (is_executable_valid (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 = executable;
@@ -209,6 +210,27 @@ gnome_da_xml_load_xml (GnomeDACapplet *c
 		}
 	    }
 	}
+	else if (!xmlStrncmp (section->name, "media-players", 13)) {
+	    for (element = section->children; element != NULL; element = element->next) {
+		if (!xmlStrncmp (element->name, "media-player", 12)) {
+		    executable = gnome_da_xml_get_string (element, "executable");
+		    if (is_executable_valid (executable)) {
+			media_item = gnome_da_simple_item_new ();
+
+			media_item->generic.name = gnome_da_xml_get_string (element, "name");
+			media_item->generic.executable = executable;
+			media_item->generic.command = gnome_da_xml_get_string (element, "command");
+			media_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
+
+			media_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal");
+
+			capplet->media_players = g_list_append (capplet->media_players, media_item);
+		    }
+		    else
+			g_free (executable);
+		}
+	    }
+	}
     }
 
     xmlFreeDoc (xml_doc);
@@ -236,11 +258,13 @@ void
 gnome_da_xml_free (GnomeDACapplet *capplet)
 {
     g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_web_item_free, NULL);
-    g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_mail_item_free, NULL);
+    g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_simple_item_free, NULL);
     g_list_foreach (capplet->terminals, (GFunc) gnome_da_term_item_free, NULL);
+    g_list_foreach (capplet->media_players, (GFunc) gnome_da_simple_item_free, NULL);
     g_list_free (capplet->web_browsers);
     g_list_free (capplet->mail_readers);
     g_list_free (capplet->terminals);
+    g_list_free (capplet->media_players);
 
     g_object_unref (capplet->xml);
     g_free (capplet);
Index: capplets/default-applications/gnome-da-item.h
===================================================================
--- capplets/default-applications/gnome-da-item.h	(revision 7399)
+++ capplets/default-applications/gnome-da-item.h	(working copy)
@@ -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 @@ struct _GnomeDAWebItem {
     gchar *win_command;
 };
 
-struct _GnomeDAMailItem {
+struct _GnomeDASimpleItem {
     GnomeDAItem generic;
     gboolean run_in_terminal;
 };
@@ -56,10 +56,10 @@ struct _GnomeDATermItem {
 };
 
 GnomeDAWebItem* gnome_da_web_item_new (void);
-GnomeDAMailItem* gnome_da_mail_item_new (void);
 GnomeDATermItem* gnome_da_term_item_new (void);
+GnomeDASimpleItem* gnome_da_simple_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-capplet.c
===================================================================
--- capplets/default-applications/gnome-da-capplet.c	(revision 7399)
+++ capplets/default-applications/gnome-da-capplet.c	(working copy)
@@ -72,6 +72,9 @@ entry_focus_out_event_cb (GtkWidget *wid
     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->media_player_command_entry) {
+	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_EXEC, text, &error);
+	}
 
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
@@ -96,6 +99,9 @@ terminal_checkbutton_toggled_cb (GtkTogg
     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->media_player_terminal_checkbutton) {
+	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, is_active, &error);
+	}
 
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
@@ -216,6 +222,7 @@ web_combo_changed_cb (GtkComboBox *combo
     gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
 }
 	
+/* FIXME: Refactor these two functions below into one... */
 static void
 mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
@@ -223,7 +230,7 @@ mail_combo_changed_cb (GtkComboBox *comb
     GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDAMailItem *item;
+    GnomeDASimpleItem *item;
     GConfChangeSet *cs;
     GError *error = NULL;
     char *mailer_cmd;
@@ -234,7 +241,7 @@ mail_combo_changed_cb (GtkComboBox *comb
     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 ();
@@ -268,6 +275,57 @@ mail_combo_changed_cb (GtkComboBox *comb
 }
 
 static void
+media_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;
+    char *media_cmd;
+    
+    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->media_players)) {
+	item = (GnomeDASimpleItem*) g_list_nth_data (capplet->media_players, current_index);
+	is_custom_active = FALSE;
+
+	cs = gconf_change_set_new ();
+
+	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_MEDIA_EXEC, item->generic.command);
+	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_MEDIA_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;
+    }
+
+    media_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_EXEC, NULL);
+    gtk_entry_set_text (GTK_ENTRY (capplet->media_player_command_entry), media_cmd);
+    g_free (media_cmd);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->media_player_terminal_checkbutton),
+				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, NULL));
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->media_player_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->media_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive (capplet->media_player_terminal_checkbutton, is_custom_active);
+}
+
+static void
 terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
     GtkTreeIter iter;
@@ -352,9 +410,9 @@ static struct {
 } icons[] = {
     { "web_browser_image", "web-browser"      },
     { "mail_reader_image", "stock_mail-open"  },
+    { "media_player_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"   }
@@ -373,6 +431,7 @@ theme_changed_cb (GtkIconTheme *theme, G
 
     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->media_combo_box), capplet->media_players);
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
 }
 
@@ -495,6 +554,7 @@ web_browser_update_radio_buttons (GnomeD
     gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
 }
 
+/* FIXME: Refactor these two functions below into single one... */
 static void
 mail_reader_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
 {
@@ -525,6 +585,35 @@ mail_reader_update_combo_box (GnomeDACap
 }
 
 static void
+media_player_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
+{
+    GList *entry;
+    gint index;
+    gboolean is_custom_active;
+
+    entry = g_list_find_custom (capplet->media_players, command, (GCompareFunc) generic_item_comp);
+
+    if (entry) {
+	index = g_list_position (capplet->media_players, entry);
+	is_custom_active = FALSE;
+    }
+    else {
+	/* index of 'Custom' combo box entry */
+	index = g_list_length (capplet->media_players) + 1;
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->media_player_command_entry), command);
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->media_player_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->media_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive (capplet->media_player_terminal_checkbutton, is_custom_active);
+
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->media_combo_box)) != index)
+	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->media_combo_box), index);
+}
+
+static void
 terminal_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
 {
     GList *entry;
@@ -631,6 +720,7 @@ web_gconf_changed_cb (GConfClient *clien
     }
 }
 
+/* FIXME: Refactor these two functions below into single one... */
 static void
 mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
 {
@@ -652,6 +742,26 @@ mail_gconf_changed_cb (GConfClient *clie
 }
 
 static void
+media_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_MEDIA_EXEC) == 0) {
+	media_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_MEDIA_NEEDS_TERM) == 0) {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->media_player_terminal_checkbutton),
+				      gconf_value_get_bool (value));
+    }
+}
+
+static void
 term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
 {
     GConfValue *value;
@@ -790,9 +900,14 @@ show_dialog (GnomeDACapplet *capplet)
     capplet->terminal_exec_flag_entry = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_entry");
     capplet->terminal_exec_flag_label = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_label");
 
+    capplet->media_player_command_entry = glade_xml_get_widget (capplet->xml, "media_player_command_entry");
+    capplet->media_player_command_label = glade_xml_get_widget (capplet->xml, "media_player_command_label");
+    capplet->media_player_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "media_player_terminal_checkbutton");
+
     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->term_combo_box = glade_xml_get_widget (capplet->xml, "terminal_combobox");
+    capplet->media_combo_box = glade_xml_get_widget (capplet->xml, "media_player_combobox");
 
     g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
     screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
@@ -800,6 +915,7 @@ show_dialog (GnomeDACapplet *capplet)
     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->term_combo_box), capplet->terminals);
+    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players);
 
     /* update ui to gconf content */
     value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
@@ -833,9 +949,9 @@ show_dialog (GnomeDACapplet *capplet)
 	gconf_value_free (value);
     }
 
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL);
     if (value)
     {
-	value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL);
 	terminal_update_combo_box (capplet, gconf_value_get_string (value));
 	gconf_value_free (value);
     }
@@ -848,21 +964,40 @@ show_dialog (GnomeDACapplet *capplet)
 	gconf_value_free (value);
     }
 
+	value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_EXEC, NULL);
+    if (value)
+    {
+	media_player_update_combo_box (capplet, gconf_value_get_string (value));
+	gconf_value_free (value);
+    }
+
+	value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, NULL);
+    if (value)
+    {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->media_player_terminal_checkbutton),
+				      gconf_value_get_bool (value));
+	gconf_value_free (value);
+    }
+
     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->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet);
+    g_signal_connect (capplet->media_combo_box, "changed", G_CALLBACK (media_combo_changed_cb), capplet);
 
     /* TODO: Remove when GConfPropertyEditor will be used */
     g_signal_connect (capplet->web_browser_terminal_checkbutton, "toggled",
 		      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->media_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->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);
+    g_signal_connect (capplet->media_player_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
 
     g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
     g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
@@ -898,6 +1033,7 @@ main (int argc, char **argv)
 
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/browser", 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/applications/media", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/url-handlers", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
     gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_HTTP_PATH,
@@ -909,6 +1045,9 @@ main (int argc, char **argv)
     gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_PATH,
 			     (GConfClientNotifyFunc) term_gconf_changed_cb,
 			     capplet, NULL, NULL);
+    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_PATH,
+			     (GConfClientNotifyFunc) media_gconf_changed_cb,
+			     capplet, NULL, NULL);
 
     gnome_da_xml_load_list (capplet);
 
