default applications: Remove selection of media player

This was only used to start the default media player on gnome-settings-daemon,
when the user presses the Media key. We just open the default for audio/ogg
there, so no need to ask the user for a default media player
This commit is contained in:
Rodrigo Moya 2010-10-13 15:28:33 +02:00
parent d7b59d3929
commit 556e483cf0
4 changed files with 10 additions and 483 deletions

View file

@ -129,7 +129,6 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename)
xmlDoc *xml_doc;
xmlNode *root, *section, *element;
gchar *executable;
GnomeDASimpleItem *media_item;
GnomeDATermItem *term_item;
GnomeDAVisualItem *visual_item;
GnomeDAMobilityItem *mobility_item;
@ -142,8 +141,8 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename)
root = xmlDocGetRootElement (xml_doc);
for (section = root->children; section != NULL; section = section->next) {
if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) {
for (element = section->children; element != NULL; element = element->next) {
if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) {
for (element = section->children; element != NULL; element = element->next) {
if (!xmlStrncmp (element->name, (const xmlChar *) "terminal", 8)) {
executable = gnome_da_xml_get_string (element, "executable");
if (is_executable_valid (executable)) {
@ -160,31 +159,10 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename)
}
else
g_free (executable);
}
}
}
}
else if (!xmlStrncmp (section->name, (const xmlChar *) "media-players", 13)) {
for (element = section->children; element != NULL; element = element->next) {
if (!xmlStrncmp (element->name, (const xmlChar *) "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);
}
}
}
else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) {
}
else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) {
for (element = section->children; element != NULL; element = element->next) {
if (!xmlStrncmp (element->name, (const xmlChar *) "visual", 6)) {
executable = gnome_da_xml_get_string (element,"executable");
@ -204,10 +182,10 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename)
g_free (executable);
}
}
}
else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) {
}
else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) {
for (element = section->children; element != NULL; element = element->next) {
if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) {
if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) {
executable = gnome_da_xml_get_string (element,"executable");
if (is_executable_valid (executable)) {
mobility_item = gnome_da_mobility_item_new ();
@ -225,7 +203,7 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename)
g_free (executable);
}
}
}
}
}
xmlFreeDoc (xml_doc);
@ -289,14 +267,12 @@ gnome_da_xml_free (GnomeDACapplet *capplet)
g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_url_item_free, NULL);
g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_url_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_foreach (capplet->visual_ats, (GFunc) gnome_da_visual_item_free, NULL);
g_list_foreach (capplet->mobility_ats, (GFunc) gnome_da_mobility_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_list_free (capplet->visual_ats);
g_list_free (capplet->mobility_ats);