fixing xdg issue with web browsers and email clients on default applications.\n Adding useless file-manager,instant-message, text-editor tabs for future use.

author: Perberos <[email protected]> 2011-12-05 06:31:39 -0300
committer: Perberos <[email protected]> 2011-12-05 06:31:39 -0300
commit: efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b (patch)
tree: a57782c02659983e2d5f76af4b358c57fb2e5069
parent: 12eae9fdc68e3186b290b3779842d313aed89454 (diff)
download: mate-control-center-efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b.tar.bz2
mate-control-center-efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b.tar.xz
6 files changed, 2331 insertions, 2109 deletions
diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index 37a01359..0f2950c2 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -3,6 +3,7 @@
 *
 * Copyright 2005-2006 Luca Cavalli
 * Copyright 2008 Thomas Wood <[email protected]>
+ * Copyright 2010 Perberos <[email protected]>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License
@@ -20,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+ #include <config.h>
 #endif
 
 #include <string.h>
@@ -52,11 +53,11 @@ static void close_cb(GtkWidget* window, gint response, gpointer user_data)
 }
 }
 
-static void set_icon (GtkImage* image, GtkIconTheme* theme, const char* name)
+static void set_icon(GtkImage* image, GtkIconTheme* theme, const char* name)
 {
- GdkPixbuf* pixbuf;
+ GdkPixbuf* pixbuf = gtk_icon_theme_load_icon(theme, name, 48, 0, NULL);
 
- if ((pixbuf = gtk_icon_theme_load_icon(theme, name, 48, 0, NULL)))
+ if (pixbuf)
 {
 gtk_image_set_from_pixbuf(image, pixbuf);
 g_object_unref(pixbuf);
@@ -65,38 +66,80 @@ static void set_icon (GtkImage* image, GtkIconTheme* theme, const char* name)
 
 static void web_radiobutton_toggled_cb(GtkWidget* togglebutton, MateDACapplet* capplet)
 {
- gint index;
- MateDAWebItem *item;
- const gchar *command;
- GError *error = NULL;
+ gint index;
+ MateDAWebItem* item;
+ const gchar* command;
+ GError* error = NULL;
 
- index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box));
+ index = gtk_combo_box_get_active(GTK_COMBO_BOX(capplet->web_combo_box));
 
- if (index == -1)
- return;
+ if (index == -1)
+ {
+ return;
+ }
 
- item = (MateDAWebItem *) g_list_nth_data (capplet->web_browsers, index);
- if (item == NULL)
- return;
+ item = (MateDAWebItem*) g_list_nth_data(capplet->web_browsers, index);
 
- if (togglebutton == capplet->new_win_radiobutton) {
- command = item->win_command;
- }
- else if (togglebutton == capplet->new_tab_radiobutton) {
- command = item->tab_command;
- }
- else {
- command = item->generic.command;
- }
+ if (item == NULL)
+ {
+ return;
+ }
 
- mateconf_client_set_string (capplet->mateconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
+ if (togglebutton == capplet->new_win_radiobutton)
+ {
+ command = item->win_command;
+ }
+ else if (togglebutton == capplet->new_tab_radiobutton)
+ {
+ command = item->tab_command;
+ }
+ else
+ {
+ command = item->generic.command;
+ }
 
- gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command);
+ mateconf_client_set_string(capplet->mateconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
 
- if (error != NULL) {
- g_warning (_("Error saving configuration: %s"), error->message);
- g_error_free (error);
- }
+ if (error != NULL)
+ {
+ g_warning(_("Error saving configuration: %s"), error->message);
+ g_error_free(error);
+ }
+
+ /* Para obtener la lista de elementos, y si está en la lista, agregar ese
+ * item.
+ * De lo contrario, se crea un elemento especial. */
+ GList* recommended = g_app_info_get_recommended_for_type("x-scheme-handler/http");
+
+ if (recommended!= NULL)
+ {
+ GList* app;
+
+ for (app = recommended; app != NULL; app = app->next)
+ {
+ /* nice hack bro */
+ if (strcmp(item->generic.executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+ {
+ /* establecemos el item */
+ g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/http", NULL);
+ g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/https", NULL);
+
+ /* about:config es usado por mozilla firefox y algunos otros con
+ * webtoolkit */
+ g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/about", NULL);
+ }
+ }
+
+ g_list_free_full(recommended, g_object_unref);
+ }
+
+ gtk_entry_set_text(GTK_ENTRY(capplet->web_browser_command_entry), command);
+
+ if (error != NULL)
+ {
+ g_warning(_("Error saving configuration: %s"), error->message);
+ g_error_free(error);
+ }
 }
 
 static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -104,41 +147,48 @@ static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 guint current_index;
 gboolean is_custom_active;
 gboolean has_net_remote;
- MateDAWebItem *item;
- GtkWidget *active = NULL;
-
- current_index = gtk_combo_box_get_active (combo);
-
- if (current_index < g_list_length (capplet->web_browsers)) {
+ MateDAWebItem* item;
+ GtkWidget* active = NULL;
 
- item = (MateDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index);
- has_net_remote = item->netscape_remote;
- is_custom_active = FALSE;
+ current_index = gtk_combo_box_get_active(combo);
 
+ if (current_index < g_list_length(capplet->web_browsers))
+ {
+ item = (MateDAWebItem*) g_list_nth_data(capplet->web_browsers, current_index);
+ has_net_remote = item->netscape_remote;
+ is_custom_active = FALSE;
 }
- else {
+ else
+ {
 has_net_remote = FALSE;
 is_custom_active = TRUE;
 }
- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
 
- gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active);
- gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
- gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
+ gtk_widget_set_sensitive(capplet->default_radiobutton, has_net_remote);
+ gtk_widget_set_sensitive(capplet->new_win_radiobutton, has_net_remote);
+ gtk_widget_set_sensitive(capplet->new_tab_radiobutton, has_net_remote);
 
- if (has_net_remote) {
+ gtk_widget_set_sensitive(capplet->web_browser_command_entry, is_custom_active);
+ gtk_widget_set_sensitive(capplet->web_browser_command_label, is_custom_active);
+ gtk_widget_set_sensitive(capplet->web_browser_terminal_checkbutton, is_custom_active);
 
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)))
+ if (has_net_remote)
+ {
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(capplet->new_win_radiobutton)))
+ {
 active = capplet->new_win_radiobutton;
- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)))
+ }
+ else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(capplet->new_tab_radiobutton)))
+ {
 active = capplet->new_tab_radiobutton;
+ }
 else
+ {
 active = capplet->default_radiobutton;
+ }
 }
 
- web_radiobutton_toggled_cb (active, capplet);
+ web_radiobutton_toggled_cb(active, capplet);
 }
 
 /* FIXME: Refactor these two functions below into one... */
@@ -147,12 +197,42 @@ static void mail_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 guint current_index;
 gboolean is_custom_active;
 
- current_index = gtk_combo_box_get_active (combo);
- is_custom_active = (current_index >= g_list_length (capplet->mail_readers));
+ current_index = gtk_combo_box_get_active(combo);
+ is_custom_active = (current_index >= g_list_length(capplet->mail_readers));
 
- gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active);
- gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active);
- gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active);
+ if (current_index != -1)
+ {
+ MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->mail_readers, current_index);
+
+ if (item != NULL)
+ {
+ /* Para obtener la lista de elementos, y si está en la lista, agregar ese
+ * item.
+ * De lo contrario, se crea un elemento especial. */
+ GList* recommended = g_app_info_get_recommended_for_type("x-scheme-handler/mailto");
+
+ if (recommended!= NULL)
+ {
+ GList* app;
+
+ for (app = recommended; app != NULL; app = app->next)
+ {
+ /* nice hack bro */
+ if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+ {
+ /* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+ g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/mailto", NULL);
+ }
+ }
+
+ g_list_free_full(recommended, g_object_unref);
+ }
+ }
+ }
+
+ gtk_widget_set_sensitive(capplet->mail_reader_command_entry, is_custom_active);
+ gtk_widget_set_sensitive(capplet->mail_reader_command_label, is_custom_active);
+ gtk_widget_set_sensitive(capplet->mail_reader_terminal_checkbutton, is_custom_active);
 }
 
 static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -163,9 +243,9 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 current_index = gtk_combo_box_get_active (combo);
 is_custom_active = (current_index >= g_list_length (capplet->media_players));
 
- gtk_widget_set_sensitive (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);
+ gtk_widget_set_sensitive(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, MateDACapplet* capplet)
@@ -173,13 +253,13 @@ static void terminal_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet
 guint current_index;
 gboolean is_custom_active;
 
- current_index = gtk_combo_box_get_active (combo);
- is_custom_active = (current_index >= g_list_length (capplet->terminals));
+ current_index = gtk_combo_box_get_active(combo);
+ is_custom_active = (current_index >= g_list_length(capplet->terminals));
 
- gtk_widget_set_sensitive (capplet->terminal_command_entry, is_custom_active);
- gtk_widget_set_sensitive (capplet->terminal_command_label, is_custom_active);
- gtk_widget_set_sensitive (capplet->terminal_exec_flag_entry, is_custom_active);
- gtk_widget_set_sensitive (capplet->terminal_exec_flag_label, is_custom_active);
+ gtk_widget_set_sensitive(capplet->terminal_command_entry, is_custom_active);
+ gtk_widget_set_sensitive(capplet->terminal_command_label, is_custom_active);
+ gtk_widget_set_sensitive(capplet->terminal_exec_flag_entry, is_custom_active);
+ gtk_widget_set_sensitive(capplet->terminal_exec_flag_label, is_custom_active);
 }
 
 static void visual_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -187,11 +267,11 @@ static void visual_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 guint current_index;
 gboolean is_custom_active;
 
- current_index = gtk_combo_box_get_active (combo);
- is_custom_active = (current_index >= g_list_length (capplet->visual_ats));
+ current_index = gtk_combo_box_get_active(combo);
+ is_custom_active = (current_index >= g_list_length(capplet->visual_ats));
 
- gtk_widget_set_sensitive (capplet->visual_command_entry, is_custom_active);
- gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active);
+ gtk_widget_set_sensitive(capplet->visual_command_entry, is_custom_active);
+ gtk_widget_set_sensitive(capplet->visual_command_label, is_custom_active);
 }
 
 static void mobility_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -233,41 +313,39 @@ static void refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box,
 }
 
 static struct {
- const gchar* name;
- const gchar* icon;
+ const char* name;
+ const char* icon;
 } icons[] = {
- {"web_browser_image", "web-browser"},
- {"mail_reader_image", "emblem-mail"},
- {"media_player_image", "applications-multimedia"},
- {"visual_image", "zoom-best-fit"},
- {"mobility_image", "preferences-desktop-accessibility"},
- /*
- {"messenger_image", "im"},
- {"file_manager_image", "file-manager"},
- {"image_image", "image-viewer"},
- {"video_image", "mate-multimedia"},
- {"text_image", "text-editor"},
- */
- {"terminal_image", "mate-terminal"}
+ {"web_browser_image", "web-browser"},
+ {"mail_reader_image", "emblem-mail"},
+ {"media_player_image", "audio-x-generic"}, /* applications-multimedia */
+ {"visual_image", "zoom-best-fit"},
+ {"mobility_image", "preferences-desktop-accessibility"},
+ {"messenger_image", "user-idle"},
+ {"filemanager_image", "file-manager"},
+ {"imageviewer_image", "eog"}, /* no hay otra... */
+ {"video_image", "video-x-generic"},
+ {"text_image", "text-editor"},
+ {"terminal_image", "terminal"},
 };
 
 static void theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet)
 {
- GObject *icon;
+ GObject* icon;
 gint i;
 
- for (i = 0; i < G_N_ELEMENTS (icons); i++)
+ for (i = 0; i < G_N_ELEMENTS(icons); i++)
 {
- icon = gtk_builder_get_object (capplet->builder, icons[i].name);
+ icon = gtk_builder_get_object(capplet->builder, icons[i].name);
 set_icon (GTK_IMAGE (icon), theme, icons[i].icon);
 }
 
- 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);
- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
+ 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);
+ refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats);
+ refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats);
 }
 
 static void screen_changed_cb(GtkWidget* widget, GdkScreen* screen, MateDACapplet* capplet)
@@ -322,63 +400,65 @@ static void web_mateconf_changed_cb(MateConfPropertyEditor* peditor, gchar* key,
 * should also use the same value as HTTP
 */
 
- if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
- gchar *short_browser, *pos;
- const gchar *value_str = mateconf_value_get_string (value);
+ if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0)
+ {
+ gchar *short_browser, *pos;
+ const gchar *value_str = mateconf_value_get_string (value);
 
- cs = mateconf_change_set_new ();
+ cs = mateconf_change_set_new ();
 
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value);
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value);
- pos = strstr (value_str, " ");
- if (pos == NULL)
- short_browser = g_strdup (value_str);
- else
- short_browser = g_strndup (value_str, pos - value_str);
- mateconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser);
- g_free (short_browser);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value);
+ pos = strstr (value_str, " ");
+ if (pos == NULL)
+ short_browser = g_strdup (value_str);
+ else
+ short_browser = g_strndup (value_str, pos - value_str);
+ mateconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser);
+ g_free (short_browser);
 
- list_entry = g_list_find_custom (capplet->web_browsers,
- value_str,
- (GCompareFunc) web_item_comp);
+ list_entry = g_list_find_custom (capplet->web_browsers,
+ value_str,
+ (GCompareFunc) web_item_comp);
 
- if (list_entry) {
- MateDAWebItem *item = (MateDAWebItem *) list_entry->data;
+ if (list_entry) {
+ MateDAWebItem *item = (MateDAWebItem *) list_entry->data;
 
- mateconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote);
- }
+ mateconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote);
+ }
 
- mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
+ mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
 
- if (error != NULL) {
- g_warning (_("Error saving configuration: %s"), error->message);
- g_error_free (error);
- error = NULL;
- }
+ if (error != NULL) {
+ g_warning (_("Error saving configuration: %s"), error->message);
+ g_error_free (error);
+ error = NULL;
+ }
 
- mateconf_change_set_unref (cs);
+ mateconf_change_set_unref (cs);
 }
- else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
- mateconf_value_get_bool (value));
+ else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0)
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
+ mateconf_value_get_bool (value));
 
- cs = mateconf_change_set_new ();
+ cs = mateconf_change_set_new ();
 
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value);
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value);
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value);
- mateconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value);
+ mateconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value);
 
- mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
+ mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
 
- if (error != NULL) {
- g_warning (_("Error saving configuration: %s"), error->message);
- g_error_free (error);
- error = NULL;
- }
+ if (error != NULL) {
+ g_warning (_("Error saving configuration: %s"), error->message);
+ g_error_free (error);
+ error = NULL;
+ }
 
- mateconf_change_set_unref (cs);
+ mateconf_change_set_unref (cs);
 }
 }
 
@@ -592,127 +672,131 @@ static MateConfValue* combo_conv_from_widget_term_flag (MateConfPropertyEditor *
 }
 }
 
-static MateConfValue* combo_conv_to_widget_term_flag (MateConfPropertyEditor *peditor, const MateConfValue *value)
+static MateConfValue* combo_conv_to_widget_term_flag(MateConfPropertyEditor* peditor, const MateConfValue* value)
 {
- MateConfValue *ret;
- GtkComboBox *combo;
+ GtkComboBox* combo = GTK_COMBO_BOX(mateconf_property_editor_get_ui_control(peditor));
 
- combo = GTK_COMBO_BOX (mateconf_property_editor_get_ui_control (peditor));
+ MateConfValue* ret = mateconf_value_new(MATECONF_VALUE_INT);
 
- ret = mateconf_value_new (MATECONF_VALUE_INT);
- mateconf_value_set_int (ret, gtk_combo_box_get_active (combo));
- return ret;
+ mateconf_value_set_int(ret, gtk_combo_box_get_active (combo));
+
+ return ret;
 }
 
-static gboolean is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index)
+static gboolean is_separator(GtkTreeModel* model, GtkTreeIter* iter, gpointer sep_index)
 {
- GtkTreePath *path;
- gboolean result;
+ GtkTreePath* path = gtk_tree_model_get_path(model, iter);
+
+ gboolean result = gtk_tree_path_get_indices(path)[0] == GPOINTER_TO_INT(sep_index);
 
- path = gtk_tree_model_get_path (model, iter);
- result = gtk_tree_path_get_indices (path)[0] == GPOINTER_TO_INT (sep_index);
- gtk_tree_path_free (path);
+ gtk_tree_path_free(path);
 
 return result;
 }
 
-static void fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
+static void fill_combo_box (GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list)
 {
- GList *entry;
- GtkTreeModel *model;
- GtkCellRenderer *renderer;
- GtkTreeIter iter;
- GdkPixbuf *pixbuf;
+ GList* entry;
+ GtkTreeModel* model;
+ GtkCellRenderer* renderer;
+ GtkTreeIter iter;
+ GdkPixbuf* pixbuf;
 
- if (theme == NULL) {
- theme = gtk_icon_theme_get_default ();
- }
+ if (theme == NULL)
+ {
+ theme = gtk_icon_theme_get_default();
+ }
 
- gtk_combo_box_set_row_separator_func (combo_box, is_separator,
- GINT_TO_POINTER (g_list_length (app_list)), NULL);
+ gtk_combo_box_set_row_separator_func(combo_box, is_separator, GINT_TO_POINTER(g_list_length(app_list)), NULL);
 
- model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING));
- gtk_combo_box_set_model (combo_box, model);
+ model = GTK_TREE_MODEL(gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING));
+ gtk_combo_box_set_model(combo_box, model);
 
- renderer = gtk_cell_renderer_pixbuf_new ();
+ renderer = gtk_cell_renderer_pixbuf_new ();
 
- /* not all cells have a pixbuf, this prevents the combo box to shrink */
- gtk_cell_renderer_set_fixed_size (renderer, -1, 22);
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
- "pixbuf", PIXBUF_COL,
- NULL);
+ /* not all cells have a pixbuf, this prevents the combo box to shrink */
+ gtk_cell_renderer_set_fixed_size(renderer, -1, 22);
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, FALSE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), renderer,
+ "pixbuf", PIXBUF_COL,
+ NULL);
 
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
- "text", TEXT_COL,
- NULL);
+ renderer = gtk_cell_renderer_text_new();
 
- for (entry = app_list; entry != NULL; entry = g_list_next (entry)) {
- MateDAItem *item;
- item = (MateDAItem *) entry->data;
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
+ "text", TEXT_COL,
+ NULL);
 
- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL);
+ for (entry = app_list; entry != NULL; entry = g_list_next (entry))
+ {
+ MateDAItem* item = (MateDAItem*) entry->data;
 
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- PIXBUF_COL, pixbuf,
- TEXT_COL, item->name,
- -1);
+ pixbuf = gtk_icon_theme_load_icon(theme, item->icon_name, 22, 0, NULL);
 
- item->icon_path = gtk_tree_model_get_string_from_iter (model, &iter);
+ gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+ PIXBUF_COL, pixbuf,
+ TEXT_COL, item->name,
+ -1);
 
- if (pixbuf)
- g_object_unref (pixbuf);
- }
+ item->icon_path = gtk_tree_model_get_string_from_iter(model, &iter);
 
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1);
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- PIXBUF_COL, NULL,
- TEXT_COL, _("Custom"),
- -1);
+ if (pixbuf)
+ {
+ g_object_unref(pixbuf);
+ }
+ }
+
+ gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, -1);
+ gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+ PIXBUF_COL, NULL,
+ TEXT_COL, _("Custom"),
+ -1);
 }
 
-static GtkWidget* _gtk_builder_get_widget (GtkBuilder *builder, const gchar *name)
+static GtkWidget* _gtk_builder_get_widget(GtkBuilder* builder, const gchar* name)
 {
- return GTK_WIDGET (gtk_builder_get_object (builder, name));
+ return GTK_WIDGET(gtk_builder_get_object(builder, name));
 }
 
 
-static void show_dialog (MateDACapplet* capplet, const gchar* start_page)
+static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 {
- GObject *obj;
- GtkBuilder *builder;
+ GObject* obj;
+ GtkBuilder* builder;
 guint builder_result;
 
 capplet->builder = builder = gtk_builder_new ();
 
- if (g_file_test (MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) {
- builder_result = gtk_builder_add_from_file (builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL);
+ if (g_file_test(MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE)
+ {
+ builder_result = gtk_builder_add_from_file(builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL);
 }
- else {
- builder_result = gtk_builder_add_from_file (builder, "./mate-default-applications-properties.ui", NULL);
+ else
+ {
+ builder_result = gtk_builder_add_from_file(builder, "./mate-default-applications-properties.ui", NULL);
 }
 
- if (builder_result == 0) {
- GtkWidget *dialog;
-
- dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- _("Could not load the main interface"));
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- _("Please make sure that the applet "
- "is properly installed"));
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- exit (EXIT_FAILURE);
+ if (builder_result == 0)
+ {
+ GtkWidget* dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not load the main interface"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Please make sure that the applet is properly installed"));
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+ gtk_dialog_run(GTK_DIALOG(dialog));
+
+ gtk_widget_destroy(dialog);
+ exit(EXIT_FAILURE);
 }
 
 capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog");
- g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL);
+
+ g_signal_connect(capplet->window, "response", G_CALLBACK (close_cb), NULL);
+
+ #define _gtk_builder_get_widget(builder, name) GTK_WIDGET(gtk_builder_get_object(builder, name))
 
 capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry");
 capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label");
@@ -742,34 +826,40 @@ static void show_dialog (MateDACapplet* capplet, const gchar* start_page)
 capplet->mobility_command_label = _gtk_builder_get_widget (builder, "mobility_command_label");
 capplet->mobility_startup_checkbutton = _gtk_builder_get_widget (builder, "mobility_start_checkbutton");
 
- capplet->web_combo_box = _gtk_builder_get_widget (builder, "web_browser_combobox");
- capplet->mail_combo_box = _gtk_builder_get_widget (builder, "mail_reader_combobox");
- capplet->term_combo_box = _gtk_builder_get_widget (builder, "terminal_combobox");
- capplet->media_combo_box = _gtk_builder_get_widget (builder, "media_player_combobox");
- capplet->visual_combo_box = _gtk_builder_get_widget (builder, "visual_combobox");
- capplet->mobility_combo_box = _gtk_builder_get_widget (builder, "mobility_combobox");
+ capplet->web_combo_box = _gtk_builder_get_widget(builder, "web_browser_combobox");
+ capplet->mail_combo_box = _gtk_builder_get_widget(builder, "mail_reader_combobox");
+ capplet->term_combo_box = _gtk_builder_get_widget(builder, "terminal_combobox");
+ capplet->media_combo_box = _gtk_builder_get_widget(builder, "media_player_combobox");
+ capplet->visual_combo_box = _gtk_builder_get_widget(builder, "visual_combobox");
+ capplet->mobility_combo_box = _gtk_builder_get_widget(builder, "mobility_combobox");
+
+ capplet->text_combo_box = _gtk_builder_get_widget(builder, "text_combobox");
+ capplet->file_combo_box = _gtk_builder_get_widget(builder, "file_combobox");
+
+ #undef _gtk_builder_get_widget
 
- g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
- screen_changed_cb (capplet->window, gdk_screen_get_default (), 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);
- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
+ g_signal_connect(capplet->window, "screen-changed", G_CALLBACK(screen_changed_cb), capplet);
+ screen_changed_cb(capplet->window, gdk_screen_get_default(), capplet);
 
- 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);
- g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet);
- g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), 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);
+ fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats);
+ fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats);
 
+ 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);
+ g_signal_connect(capplet->visual_combo_box, "changed", G_CALLBACK(visual_combo_changed_cb), capplet);
+ g_signal_connect(capplet->mobility_combo_box, "changed", G_CALLBACK(mobility_combo_changed_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);
- g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_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);
+ g_signal_connect(capplet->new_tab_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet);
 
 /* Setup MateConfPropertyEditors */
 
@@ -898,40 +988,39 @@ static void show_dialog (MateDACapplet* capplet, const gchar* start_page)
 capplet->mobility_startup_checkbutton,
 NULL);
 
- gtk_window_set_icon_name (GTK_WINDOW (capplet->window),
- "preferences-desktop-default-applications");
+ gtk_window_set_icon_name (GTK_WINDOW (capplet->window), "preferences-desktop-default-applications");
 
- if (start_page != NULL) {
- gchar *page_name;
- GtkWidget *w;
+ if (start_page != NULL)
+ {
+ gchar* page_name;
+ GtkWidget* w;
 
 page_name = g_strconcat (start_page, "_vbox", NULL);
 
 w = _gtk_builder_get_widget (builder, page_name);
- if (w != NULL) {
+
+ if (w != NULL)
+ {
 GtkNotebook *nb;
 gint pindex;
 
- nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder,
- "preferred_apps_notebook"));
+ nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder, "preferred_apps_notebook"));
 pindex = gtk_notebook_page_num (nb, w);
 if (pindex != -1)
 gtk_notebook_set_current_page (nb, pindex);
 }
- g_free (page_name);
+
+ g_free(page_name);
 }
 
- gtk_widget_show (capplet->window);
+ gtk_widget_show(capplet->window);
 }
 
-int main (int argc, char** argv)
+int main(int argc, char** argv)
 {
- MateDACapplet* capplet;
-
- gchar* start_page = NULL;
+ gchar* start_page = NULL;
 
- GOptionContext* context;
- GOptionEntry option_entries[] = {
+ GOptionEntry option_entries[] = {
 {
 "show-page",
 'p',
@@ -943,28 +1032,28 @@ int main (int argc, char** argv)
 N_("page")
 },
 {NULL}
- };
+ };
 
- context = g_option_context_new(_("- MATE Default Applications"));
- g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE);
+ GOptionContext* context = g_option_context_new(_("- MATE Default Applications"));
+ g_option_context_add_main_entries(context, option_entries, GETTEXT_PACKAGE);
 
- capplet_init (context, &argc, &argv);
+ capplet_init (context, &argc, &argv);
 
- capplet = g_new0(MateDACapplet, 1);
- capplet->mateconf = mateconf_client_get_default();
- mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/url-handlers", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
- mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/applications", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+ MateDACapplet* capplet = g_new0(MateDACapplet, 1);
+ capplet->mateconf = mateconf_client_get_default();
+ mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/url-handlers", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+ mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/applications", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
 
- mate_da_xml_load_list(capplet);
+ mate_da_xml_load_list(capplet);
 
- show_dialog(capplet, start_page);
- g_free(start_page);
+ show_dialog(capplet, start_page);
+ g_free(start_page);
 
- gtk_main();
+ gtk_main();
 
- g_object_unref(capplet->mateconf);
+ g_object_unref(capplet->mateconf);
 
- mate_da_xml_free(capplet);
+ mate_da_xml_free(capplet);
 
- return 0;
+ return 0;
 }
diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h
index 3ce72955..e19dd70e 100644
--- a/capplets/default-applications/mate-da-capplet.h
+++ b/capplets/default-applications/mate-da-capplet.h
@@ -85,7 +85,9 @@ struct _MateDACapplet {
 GtkWidget* visual_combo_box;
 GtkWidget* mobility_combo_box;
 /* Para el File Manager */
- /*GtkWidget* filemanager_combo_box;*/
+ GtkWidget* file_combo_box;
+ GtkWidget* text_combo_box;
+
 
 GtkWidget* web_browser_command_entry;
 GtkWidget* web_browser_command_label;
@@ -95,12 +97,12 @@ struct _MateDACapplet {
 GtkWidget* new_tab_radiobutton;
 
 /* Para el File Manager */
- /*GtkWidget* file_manager_command_entry;
+ GtkWidget* file_manager_command_entry;
 GtkWidget* file_manager_command_label;
 GtkWidget* file_manager_terminal_checkbutton;
 GtkWidget* file_manager_default_radiobutton;
 GtkWidget* file_manager_new_win_radiobutton;
- GtkWidget* file_manager_new_tab_radiobutton;*/
+ GtkWidget* file_manager_new_tab_radiobutton;
 
 
 GtkWidget* mail_reader_command_entry;
@@ -133,7 +135,7 @@ struct _MateDACapplet {
 GList* visual_ats;
 GList* mobility_ats;
 /* Para el File Manager */
- /*GList* file_managers;*/
+ GList* file_managers;
 };
 
 #endif
diff --git a/capplets/default-applications/mate-da-item.h b/capplets/default-applications/mate-da-item.h
index 81223f4e..d3bfb4ca 100644
--- a/capplets/default-applications/mate-da-item.h
+++ b/capplets/default-applications/mate-da-item.h
@@ -43,8 +43,8 @@ struct _MateDAWebItem {
 MateDAItem generic;
 gboolean run_in_terminal;
 gboolean netscape_remote;
- gchar *tab_command;
- gchar *win_command;
+ gchar* tab_command;
+ gchar* win_command;
 };
 
 struct _MateDASimpleItem {
diff --git a/capplets/default-applications/mate-da-xml.c b/capplets/default-applications/mate-da-xml.c
index 288495c7..4105f2ce 100644
--- a/capplets/default-applications/mate-da-xml.c
+++ b/capplets/default-applications/mate-da-xml.c
@@ -47,10 +47,10 @@ mate_da_xml_get_bool (const xmlNode *parent, const gchar *val_name)
 if (!xmlStrncmp (element->name, xml_val_name, len)) {
 xmlChar *cont = xmlNodeGetContent (element);
 
- if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1"))
- ret_val = TRUE;
+ if (!xmlStrcasecmp(cont, (const xmlChar*) "true") || !xmlStrcasecmp(cont, (const xmlChar*) "1"))
+ ret_val = TRUE;
 else
- ret_val = FALSE;
+ ret_val = FALSE;
 
 xmlFree (cont);
 }
@@ -91,7 +91,7 @@ mate_da_xml_get_string (const xmlNode *parent, const gchar *val_name)
 }
 else {
 for (i = 0; sys_langs[i] != NULL; i++) {
- if (!strcmp (sys_langs[i], node_lang)) {
+ if (!strcmp(sys_langs[i], (char*) node_lang)) {
 ret_val = (gchar *) xmlNodeGetContent (element);
 /* since sys_langs is sorted from most desirable to
 * least desirable, exit at first match
@@ -144,9 +144,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
 root = xmlDocGetRootElement (xml_doc);
 
 for (section = root->children; section != NULL; section = section->next) {
- if (!xmlStrncmp (section->name, "web-browsers", 12)) {
+ if (!xmlStrncmp(section->name, (const xmlChar*) "web-browsers", strlen("web-browsers"))) {
 for (element = section->children; element != NULL; element = element->next) {
- if (!xmlStrncmp (element->name, "web-browser", 11)) {
+ if (!xmlStrncmp (element->name, (const xmlChar*) "web-browser", strlen("web-browser"))) {
 executable = mate_da_xml_get_string (element, "executable");
 if (is_executable_valid (executable)) {
 web_item = mate_da_web_item_new ();
@@ -170,9 +170,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
 }
 }
 }
- else if (!xmlStrncmp (section->name, "mail-readers", 12)) {
+ else if (!xmlStrncmp (section->name, (const xmlChar*) "mail-readers", strlen("mail-readers"))) {
 for (element = section->children; element != NULL; element = element->next) {
- if (!xmlStrncmp (element->name, "mail-reader", 11)) {
+ if (!xmlStrncmp (element->name, (const xmlChar*) "mail-reader", strlen("mail-reader"))) {
 executable = mate_da_xml_get_string (element, "executable");
 if (is_executable_valid (executable)) {
 mail_item = mate_da_simple_item_new ();
@@ -191,9 +191,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
 }
 }
 }
- else if (!xmlStrncmp (section->name, "terminals", 9)) {
+ else if (!xmlStrncmp (section->name, (const xmlChar*) "terminals", strlen("terminals"))) {
 for (element = section->children; element != NULL; element = element->next) {
- if (!xmlStrncmp (element->name, "terminal", 8)) {
+ if (!xmlStrncmp (element->name, (const xmlChar*) "terminal", strlen("terminal"))) {
 executable = mate_da_xml_get_string (element, "executable");
 if (is_executable_valid (executable)) {
 term_item = mate_da_term_item_new ();
@@ -212,9 +212,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
 }
 }
 }
- else if (!xmlStrncmp (section->name, "media-players", 13)) {
+ else if (!xmlStrncmp (section->name, (const xmlChar*) "music-players", strlen("music-players"))) {
 for (element = section->children; element != NULL; element = element->next) {
- if (!xmlStrncmp (element->name, "media-player", 12)) {
+ if (!xmlStrncmp (element->name, (const xmlChar*) "music-player", strlen("music-player"))) {
 executable = mate_da_xml_get_string (element, "executable");
 if (is_executable_valid (executable)) {
 media_item = mate_da_simple_item_new ();
@@ -233,9 +233,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
 }
 }
 }
- else if (!xmlStrncmp (section->name, "a11y-visual", 11)) {
+ else if (!xmlStrncmp (section->name, (const xmlChar*) "a11y-visual", strlen("a11y-visual"))) {
 for (element = section->children; element != NULL; element = element->next) {
- if (!xmlStrncmp (element->name, "visual", 6)) {
+ if (!xmlStrncmp (element->name, (const xmlChar*) "visual", strlen("visual"))) {
 executable = mate_da_xml_get_string (element,"executable");
 if (is_executable_valid (executable)) {
 visual_item = mate_da_visual_item_new ();
@@ -254,9 +254,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
 }
 }
 }
- else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) {
+ else if (!xmlStrncmp (section->name, (const xmlChar*) "a11y-mobility", strlen("a11y-mobility"))) {
 for (element = section->children; element != NULL; element = element->next) {
- if (!xmlStrncmp (element->name, "mobility", 8)) {
+ if (!xmlStrncmp (element->name, (const xmlChar*) "mobility", strlen("mobility"))) {
 executable = mate_da_xml_get_string (element,"executable");
 if (is_executable_valid (executable)) {
 mobility_item = mate_da_mobility_item_new ();
@@ -305,23 +305,24 @@ void mate_da_xml_load_list(MateDACapplet* capplet)
 }
 }
 
-void
-mate_da_xml_free (MateDACapplet *capplet)
+void mate_da_xml_free(MateDACapplet* capplet)
 {
- g_list_foreach (capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL);
- g_list_foreach (capplet->mail_readers, (GFunc) mate_da_simple_item_free, NULL);
- g_list_foreach (capplet->terminals, (GFunc) mate_da_term_item_free, NULL);
- g_list_foreach (capplet->media_players, (GFunc) mate_da_simple_item_free, NULL);
- g_list_foreach (capplet->visual_ats, (GFunc) mate_da_visual_item_free, NULL);
- g_list_foreach (capplet->mobility_ats, (GFunc) mate_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);
-
- g_object_unref (capplet->builder);
- g_free (capplet);
+ g_list_foreach(capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL);
+ g_list_foreach(capplet->mail_readers, (GFunc) mate_da_simple_item_free, NULL);
+ g_list_foreach(capplet->terminals, (GFunc) mate_da_term_item_free, NULL);
+ g_list_foreach(capplet->media_players, (GFunc) mate_da_simple_item_free, NULL);
+ g_list_foreach(capplet->visual_ats, (GFunc) mate_da_visual_item_free, NULL);
+ g_list_foreach(capplet->mobility_ats, (GFunc) mate_da_mobility_item_free, NULL);
+ //g_list_foreach(capplet->filemanagers, (GFunc) mate_da_filemanager_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);
+ //g_list_free(capplet->filemanagers);
+
+ g_object_unref(capplet->builder);
+ g_free(capplet);
 }
diff --git a/capplets/default-applications/mate-default-applications-properties.ui b/capplets/default-applications/mate-default-applications-properties.ui
index 4edc2968..bf1073c1 100644
--- a/capplets/default-applications/mate-default-applications-properties.ui
+++ b/capplets/default-applications/mate-default-applications-properties.ui
@@ -1,1196 +1,1477 @@
 <?xml version="1.0"?>
 <interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkDialog" id="preferred_apps_dialog">
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Preferred Applications</property>
- <property name="resizable">False</property>
- <property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkNotebook" id="preferred_apps_notebook">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkVBox" id="internet_vbox">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="web_browser_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="web_browser_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Web Browser</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="web_browser_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="web_browser_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="web_browser_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="web_browser_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="web_browser_options_table">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkEntry" id="web_browser_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="web_browser_terminal_checkbutton">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="web_browser_default_radiobutton">
- <property name="label" translatable="yes">Open link with web browser _default</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="web_browser_new_tab_radiobutton">
- <property name="label" translatable="yes">Open link in new _tab</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">web_browser_default_radiobutton</property>
- </object>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="web_browser_new_win_radiobutton">
- <property name="label" translatable="yes">Open link in new _window</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">web_browser_default_radiobutton</property>
- </object>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="web_browser_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">C_ommand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">web_browser_command_entry</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="mail_reader_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="mail_reader_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Mail Reader</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="mail_reader_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="mail_reader_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="mail_reader_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="mail_reader_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="mail_reader_options_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="mail_reader_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">mail_reader_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="mail_reader_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="mail_reader_terminal_checkbutton">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="messenger_vbox">
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="messenger_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Instant Messenger</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="messenger_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="messenger_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="messenger_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="messenger_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="messenger_options_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="messenger_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">messenger_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="messenger_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="messenger_terminal_checkbutton">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="internet_apps_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Internet</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="multimedia_vbox">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="image_vbox">
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="image_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Image Viewer</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="image_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="image_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="image_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="image_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="image_options_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="image_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">image_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="image_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="image_terminal_checkbox">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="media_player_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="media_player_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Multimedia Player</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="media_player_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="media_player_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="media_player_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="media_player_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="media_player_options_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="media_player_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">media_player_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="media_player_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="media_player_terminal_checkbutton">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="video_vbox">
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="video_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Video Player</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="video_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="video_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="video_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="video_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="video_options_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="video_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">video_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="video_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="video_terminal_checkbox">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="multimedia_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Multimedia</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="system_vbox">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="text_vbox">
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="text_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Text Editor</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="text_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="text_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="text_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="text_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="text_options_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="text_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">text_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="text_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="text_terminal_checkbox">
- <property name="label" translatable="yes">Run in t_erminal</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="terminal_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="terminal_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Terminal Emulator</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="terminal_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="terminal_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="terminal_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="terminal_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="terminal_options_table">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="terminal_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">terminal_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="terminal_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="terminal_exec_flag_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">E_xecute flag:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">terminal_exec_flag_entry</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="terminal_exec_flag_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
-
- <!-- el file manager -- >
+ <requires lib="gtk+" version="2.16" />
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="preferred_apps_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Preferred Applications</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox">
+ <property name="visible">True</property>
 <child>
- <object class="GtkVBox" id="filemanager_vbox">
+ <object class="GtkNotebook" id="preferred_apps_notebook">
 <property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
 <child>
- <object class="GtkLabel" id="filemanager_label">
+ <object class="GtkVBox" id="internet_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="web_browser_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="web_browser_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Web Browser</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="web_browser_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="web_browser_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="web_browser_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="web_browser_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="web_browser_options_table">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="web_browser_command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="web_browser_terminal_checkbutton">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="web_browser_default_radiobutton">
+ <property name="label" translatable="yes">Open link with web browser _default</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="web_browser_new_tab_radiobutton">
+ <property name="label" translatable="yes">Open link in new _tab</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">web_browser_default_radiobutton</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="web_browser_new_win_radiobutton">
+ <property name="label" translatable="yes">Open link in new _window</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">web_browser_default_radiobutton</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="web_browser_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">C_ommand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">web_browser_command_entry</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="mail_reader_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="mail_reader_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mail Reader</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="mail_reader_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="mail_reader_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="mail_reader_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="mail_reader_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="mail_reader_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="mail_reader_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">mail_reader_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="mail_reader_command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="mail_reader_terminal_checkbutton">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="messenger_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="messenger_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Instant Messenger</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="messenger_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="messenger_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="messenger_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="messenger_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="messenger_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="messenger_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">messenger_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="messenger_command_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="messenger_terminal_checkbutton">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="internet_apps_label">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">File Manager</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">Internet</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="tab_fill">False</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="filemanager_hbox">
+ <object class="GtkVBox" id="multimedia_vbox">
 <property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="border_width">12</property>
+ <property name="spacing">18</property>
+
+
+ <!-- visor de imagenes -->
 <child>
- <object class="GtkImage" id="filemanager_image">
+ <object class="GtkVBox" id="image_vbox">
 <property name="visible">True</property>
- <property name="yalign">0</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="image_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Image Viewer</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="image_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="imageviewer_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="image_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="image_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="image_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="image_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="image_command_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="image_terminal_checkbox">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
 <property name="position">0</property>
 </packing>
 </child>
+ <!-- / visor de imagenes -->
+
+ <!-- / reproductor de musica -->
 <child>
- <object class="GtkVBox" id="filemanager_options_vbox">
+ <object class="GtkVBox" id="media_player_vbox">
 <property name="visible">True</property>
 <property name="spacing">6</property>
 <child>
- <object class="GtkComboBox" id="filemanager_combobox">
+ <object class="GtkLabel" id="media_player_label">
 <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Multimedia Player</property> <!-- should be Music Player -->
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkTable" id="filemanager_options_table">
+ <object class="GtkHBox" id="media_player_hbox">
 <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
+ <property name="spacing">12</property>
 <child>
- <object class="GtkLabel" id="filemanager_command_label">
+ <object class="GtkImage" id="media_player_image">
 <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">filemanager_command_entry</property>
+ <property name="yalign">0</property>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEntry" id="filemanager_command_entry">
+ <object class="GtkVBox" id="media_player_options_vbox">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="media_player_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="media_player_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="media_player_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">media_player_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="media_player_command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="media_player_terminal_checkbutton">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <!-- / reproductor de musica -->
+
+ <!-- / reproductor de videos -->
+ <child>
+ <object class="GtkVBox" id="video_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="video_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Video Player</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="video_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
 <child>
- <object class="GtkLabel" id="filemanager_exec_flag_label">
+ <object class="GtkImage" id="video_image">
 <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">E_xecute flag:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">filemanager_exec_flag_entry</property>
+ <property name="yalign">0</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEntry" id="filemanager_exec_flag_entry">
+ <object class="GtkVBox" id="video_options_vbox">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="video_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="video_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="video_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">video_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="video_command_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="video_terminal_checkbox">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <!-- / reproductor de videos -->
+
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="multimedia_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Multimedia</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="system_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">18</property>
+
+ <!-- editor de texto -->
+ <child>
+ <object class="GtkVBox" id="text_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="text_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Text Editor</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="text_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="text_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="text_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="text_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="text_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="text_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">text_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="text_command_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="text_terminal_checkbox">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <!-- / editor de texto -->
+
+ <!-- terminal -->
+ <child>
+ <object class="GtkVBox" id="terminal_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="terminal_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Terminal Emulator</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="terminal_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="terminal_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="terminal_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="terminal_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="terminal_options_table">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="terminal_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">terminal_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="terminal_command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="terminal_exec_flag_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">E_xecute flag:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">terminal_exec_flag_entry</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="terminal_exec_flag_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <!-- / terminal -->
+
+
+ <!-- el file manager -->
+ <child>
+ <object class="GtkVBox" id="filemanager_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="filemanager_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">File Manager</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="filemanager_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="filemanager_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="filemanager_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="filemanager_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="filemanager_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="filemanager_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">filemanager_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="filemanager_command_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="filemanager_terminal_checkbox">
+ <property name="label" translatable="yes">Run in t_erminal</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <!-- / el file manager -->
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="system_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">System</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="a11y_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="visual_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="visual_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Visual</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="visual_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="visual_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="visual_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="visual_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="visual_start_checkbutton">
+ <property name="label" translatable="yes">_Run at start</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="visual_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="visual_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">C_ommand:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image_command_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="visual_command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="mobility_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="mobility_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mobility</property>
+ <attributes>
+ <attribute name="weight" value="bold" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="mobility_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="mobility_image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="mobility_options_vbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="mobility_combobox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="mobility_start_checkbutton">
+ <property name="label" translatable="yes">Run at st_art</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="mobility_options_table">
+ <property name="visible">True</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="mobility_command_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="mobility_command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="a11y_apps_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Accessibility</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
 </child>
 </object>
 <packing>
@@ -1198,321 +1479,52 @@
 <property name="position">1</property>
 </packing>
 </child>
-
- < ! -- / el file manager -->
-
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="system_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">System</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="a11y_vbox">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="visual_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="visual_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Visual</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="visual_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="visual_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="visual_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="visual_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="visual_start_checkbutton">
- <property name="label" translatable="yes">_Run at start</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="visual_options_table">
- <property name="visible">True</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="visual_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">C_ommand:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">image_command_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="visual_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="mobility_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="mobility_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Mobility</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="mobility_hbox">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="mobility_image">
- <property name="visible">True</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="mobility_options_vbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="mobility_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="mobility_start_checkbutton">
- <property name="label" translatable="yes">Run at st_art</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="mobility_options_table">
- <property name="visible">True</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="mobility_command_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_mmand:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="mobility_command_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="a11y_apps_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Accessibility</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-11">helpbutton1</action-widget>
- <action-widget response="-7">closebutton1</action-widget>
- </action-widgets>
- </object>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="closebutton1">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">helpbutton1</action-widget>
+ <action-widget response="-7">closebutton1</action-widget>
+ </action-widgets>
+ </object>
 </interface>
diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in
index 4bd2f8b9..616912e9 100644
--- a/capplets/default-applications/mate-default-applications.xml.in
+++ b/capplets/default-applications/mate-default-applications.xml.in
@@ -4,249 +4,289 @@
 
 <!-- Remember to never use the same string for <command>, <tab-command> and <win-command> entries -->
 
- <web-browsers>
- <web-browser>
- <_name>Opera</_name>
- <executable>opera</executable>
- <command>opera %s</command>
- <icon-name>opera</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>opera -newpage %s</tab-command>
- <win-command>opera -newwindow %s</win-command>
- </web-browser>
- <web-browser>
- <_name>Debian Sensible Browser</_name>
- <executable>sensible-browser</executable>
- <command>sensible-browser %s</command>
- <icon-name></icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>false</netscape-remote>
- </web-browser>
- <web-browser>
- <_name>Epiphany Web Browser</_name>
- <executable>epiphany</executable>
- <command>epiphany %s</command>
- <icon-name>web-browser</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>epiphany --new-tab %s</tab-command>
- <win-command>epiphany --new-window %s</win-command>
- </web-browser>
- <web-browser>
- <_name>Galeon</_name>
- <executable>galeon</executable>
- <command>galeon %s</command>
- <icon-name>galeon</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>galeon -n %s</tab-command>
- <win-command>galeon -w %s</win-command>
- </web-browser>
- <web-browser>
- <_name>Encompass</_name>
- <executable>encompass</executable>
- <command>encompass %s</command>
- <icon-name>encompass</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>false</netscape-remote>
- </web-browser>
- <web-browser>
- <_name>Firebird</_name>
- <executable>mozilla-firebird</executable>
- <command>mozilla-firebird %s</command>
- <icon-name></icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Firefox</_name>
- <executable>firefox</executable>
- <command>firefox %s</command>
- <icon-name>firefox</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>firefox -new-tab "%s"</tab-command>
- <win-command>firefox -new-window "%s"</win-command>
- </web-browser>
- <web-browser>
- <_name>Iceweasel</_name>
- <executable>iceweasel</executable>
- <command>iceweasel %s</command>
- <icon-name>iceweasel</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>iceweasel -new-tab "%s"</tab-command>
- <win-command>iceweasel -new-window "%s"</win-command>
- </web-browser>
- <web-browser>
- <_name>Mozilla 1.6</_name>
- <executable>mozilla-1.6</executable>
- <command>mozilla-1.6 %s</command>
- <icon-name>mozilla-icon</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Mozilla</_name>
- <executable>mozilla</executable>
- <command>mozilla %s</command>
- <icon-name>mozilla-icon</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>SeaMonkey</_name>
- <executable>seamonkey</executable>
- <command>seamonkey %s</command>
- <icon-name>seamonkey</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Iceape</_name>
- <executable>iceape</executable>
- <command>iceape %s</command>
- <icon-name>iceape</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>iceape -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Netscape Communicator</_name>
- <executable>netscape</executable>
- <command>netscape %s</command>
- <icon-name>netscape</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Konqueror</_name>
- <executable>konqueror</executable>
- <command>konqueror %s</command>
- <icon-name>konqueror</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>false</netscape-remote>
- </web-browser>
- <web-browser>
- <_name>Midori</_name>
- <executable>midori</executable>
- <command>midori %s</command>
- <icon-name>web-browser</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>false</netscape-remote>
- </web-browser>
- </web-browsers>
-
- <mail-readers>
- <mail-reader>
- <_name>Evolution Mail Reader</_name>
- <executable>evolution</executable>
- <command>evolution %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Balsa</_name>
- <executable>balsa</executable>
- <command>balsa -m %s</command>
- <icon-name>mate-balsa2</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>KMail</_name>
- <executable>kmail</executable>
- <command>kmail %s</command>
- <icon-name>kmail</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Icedove</_name>
- <executable>icedove</executable>
- <command>icedove %s</command>
- <icon-name>icedove</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Thunderbird</_name>
- <executable>thunderbird</executable>
- <command>thunderbird %s</command>
- <icon-name>thunderbird</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Mozilla Thunderbird</_name>
- <executable>mozilla-thunderbird</executable>
- <command>mozilla-thunderbird %s</command>
- <icon-name>thunderbird</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Mozilla Mail</_name>
- <executable>mozilla</executable>
- <command>mozilla -mail %s</command>
- <icon-name>mozilla-mail-icon</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>SeaMonkey Mail</_name>
- <executable>seamonkey</executable>
- <command>seamonkey -mail %s</command>
- <icon-name>seamonkey</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Iceape Mail</_name>
- <executable>iceape</executable>
- <command>iceape -mail %s</command>
- <icon-name>iceape</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Mutt</_name>
- <executable>mutt</executable>
- <command>mutt %s</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <run-in-terminal>true</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Claws Mail</_name>
- <executable>claws-mail</executable>
- <command>claws-mail --compose %s</command>
- <icon-name>claws-mail</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Sylpheed-Claws</_name>
- <executable>sylpheed-claws</executable>
- <command>sylpheed-claws --compose %s</command>
- <icon-name>sylpheed</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Sylpheed</_name>
- <executable>sylpheed</executable>
- <command>sylpheed --compose %s</command>
- <icon-name>sylpheed</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- </mail-readers>
+ <web-browsers>
+
+ <web-browser>
+ <_name>Opera</_name>
+ <executable>opera</executable>
+ <command>opera %s</command>
+ <icon-name>opera</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>opera -newpage %s</tab-command>
+ <win-command>opera -newwindow %s</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Debian Sensible Browser</_name>
+ <executable>sensible-browser</executable>
+ <command>sensible-browser %s</command>
+ <icon-name></icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>false</netscape-remote>
+ </web-browser>
+
+ <web-browser>
+ <_name>Epiphany Web Browser</_name>
+ <executable>epiphany</executable>
+ <command>epiphany %s</command>
+ <icon-name>web-browser</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>epiphany --new-tab %s</tab-command>
+ <win-command>epiphany --new-window %s</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Galeon</_name>
+ <executable>galeon</executable>
+ <command>galeon %s</command>
+ <icon-name>galeon</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>galeon -n %s</tab-command>
+ <win-command>galeon -w %s</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Encompass</_name>
+ <executable>encompass</executable>
+ <command>encompass %s</command>
+ <icon-name>encompass</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>false</netscape-remote>
+ </web-browser>
+
+ <web-browser>
+ <_name>Firebird</_name>
+ <executable>mozilla-firebird</executable>
+ <command>mozilla-firebird %s</command>
+ <icon-name></icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
+ <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Firefox</_name>
+ <executable>firefox</executable>
+ <command>firefox %s</command>
+ <icon-name>firefox</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>firefox -new-tab "%s"</tab-command>
+ <win-command>firefox -new-window "%s"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Iceweasel</_name>
+ <executable>iceweasel</executable>
+ <command>iceweasel %s</command>
+ <icon-name>iceweasel</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>iceweasel -new-tab "%s"</tab-command>
+ <win-command>iceweasel -new-window "%s"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Mozilla 1.6</_name>
+ <executable>mozilla-1.6</executable>
+ <command>mozilla-1.6 %s</command>
+ <icon-name>mozilla-icon</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
+ <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Mozilla</_name>
+ <executable>mozilla</executable>
+ <command>mozilla %s</command>
+ <icon-name>mozilla-icon</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
+ <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>SeaMonkey</_name>
+ <executable>seamonkey</executable>
+ <command>seamonkey %s</command>
+ <icon-name>seamonkey</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
+ <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Iceape</_name>
+ <executable>iceape</executable>
+ <command>iceape %s</command>
+ <icon-name>iceape</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
+ <win-command>iceape -remote "openurl(%s,new-window)"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Netscape Communicator</_name>
+ <executable>netscape</executable>
+ <command>netscape %s</command>
+ <icon-name>netscape</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>true</netscape-remote>
+ <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
+ <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
+ </web-browser>
+
+ <web-browser>
+ <_name>Konqueror</_name>
+ <executable>konqueror</executable>
+ <command>konqueror %s</command>
+ <icon-name>konqueror</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>false</netscape-remote>
+ </web-browser>
+
+ <web-browser>
+ <_name>Midori</_name>
+ <executable>midori</executable>
+ <command>midori %s</command>
+ <icon-name>midori</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>false</netscape-remote>
+ </web-browser>
+
+ <web-browser>
+ <_name>Chromium</_name>
+ <executable>chromium</executable>
+ <command>chromium %s</command>
+ <icon-name>chromium</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>false</netscape-remote>
+ </web-browser>
+
+ <web-browser>
+ <_name>Google Chrome</_name>
+ <executable>google-chrome</executable>
+ <command>google-chrome %s</command>
+ <icon-name>google-chrome</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ <netscape-remote>false</netscape-remote>
+ </web-browser>
+
+ </web-browsers>
+
+ <mail-readers>
+
+ <mail-reader>
+ <_name>Thunderbird</_name>
+ <executable>thunderbird</executable>
+ <command>thunderbird %s</command>
+ <icon-name>thunderbird</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Evolution Mail Reader</_name>
+ <executable>evolution</executable>
+ <command>evolution %s</command>
+ <icon-name>evolution</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Balsa</_name>
+ <executable>balsa</executable>
+ <command>balsa -m %s</command>
+ <icon-name>mate-balsa2</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>KMail</_name>
+ <executable>kmail</executable>
+ <command>kmail %s</command>
+ <icon-name>kmail</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Icedove</_name>
+ <executable>icedove</executable>
+ <command>icedove %s</command>
+ <icon-name>icedove</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Mozilla Thunderbird</_name>
+ <executable>mozilla-thunderbird</executable>
+ <command>mozilla-thunderbird %s</command>
+ <icon-name>thunderbird</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Mozilla Mail</_name>
+ <executable>mozilla</executable>
+ <command>mozilla -mail %s</command>
+ <icon-name>mozilla-mail-icon</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>SeaMonkey Mail</_name>
+ <executable>seamonkey</executable>
+ <command>seamonkey -mail %s</command>
+ <icon-name>seamonkey</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Iceape Mail</_name>
+ <executable>iceape</executable>
+ <command>iceape -mail %s</command>
+ <icon-name>iceape</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Mutt</_name>
+ <executable>mutt</executable>
+ <command>mutt %s</command>
+ <icon-name>application-x-executable</icon-name>
+ <run-in-terminal>true</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Claws Mail</_name>
+ <executable>claws-mail</executable>
+ <command>claws-mail --compose %s</command>
+ <icon-name>claws-mail</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ <mail-reader>
+ <_name>Sylpheed</_name>
+ <executable>sylpheed</executable>
+ <command>sylpheed --compose %s</command>
+ <icon-name>sylpheed</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+
+ </mail-readers>
 
 <!-- agregando para los ... -->
 <file-managers>
 <file-manager>
- <_name>Mate File Manager</_name>
+ <_name>MATE File Manager</_name>
 <executable>caja</executable>
 <run-in-terminal>false</run-in-terminal>
 <command>caja %s</command>
@@ -271,77 +311,87 @@
 
 </file-managers>
 
- <terminals>
- <terminal>
- <_name>Debian Terminal Emulator</_name>
- <executable>x-terminal-emulator</executable>
- <command>x-terminal-emulator</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
- <terminal>
- <_name>MATE Terminal</_name>
- <executable>mate-terminal</executable>
- <command>mate-terminal</command>
- <icon-name>utilities-terminal</icon-name>
- <exec-flag>-x</exec-flag>
- </terminal>
- <terminal>
- <_name>GNOME Terminal</_name>
- <executable>gnome-terminal</executable>
- <command>gnome-terminal</command>
- <icon-name>gnome-terminal</icon-name>
- <exec-flag>-x</exec-flag>
- </terminal>
- <terminal>
- <_name>Terminator</_name>
- <executable>terminator</executable>
- <command>terminator</command>
- <icon-name>terminator</icon-name>
- <exec-flag>-x</exec-flag>
- </terminal>
- <terminal>
- <_name>Standard XTerminal</_name>
- <executable>xterm</executable>
- <command>xterm</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
- <terminal>
- <_name>NXterm</_name>
- <executable>nxterm</executable>
- <command>nxterm</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
- <terminal>
- <_name>RXVT</_name>
- <executable>rxvt</executable>
- <command>rxvt</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
- <terminal>
- <_name>aterm</_name>
- <executable>aterm</executable>
- <command>aterm</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
- <terminal>
- <_name>ETerm</_name>
- <executable>ETerm</executable>
- <command>ETerm</command>
- <icon-name>mate-mime-application-x-executable</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
- <terminal>
- <_name>Konsole</_name>
- <executable>konsole</executable>
- <command>konsole</command>
- <icon-name>konsole</icon-name>
- <exec-flag>-e</exec-flag>
- </terminal>
+ <terminals>
+ <terminal>
+ <_name>Debian Terminal Emulator</_name>
+ <executable>x-terminal-emulator</executable>
+ <command>x-terminal-emulator</command>
+ <icon-name>application-x-executable</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>MATE Terminal</_name>
+ <executable>mate-terminal</executable>
+ <command>mate-terminal</command>
+ <icon-name>utilities-terminal</icon-name>
+ <exec-flag>-x</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>GNOME Terminal</_name>
+ <executable>gnome-terminal</executable>
+ <command>gnome-terminal</command>
+ <icon-name>gnome-terminal</icon-name>
+ <exec-flag>-x</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>Terminator</_name>
+ <executable>terminator</executable>
+ <command>terminator</command>
+ <icon-name>terminator</icon-name>
+ <exec-flag>-x</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>Standard XTerminal</_name>
+ <executable>xterm</executable>
+ <command>xterm</command>
+ <icon-name>application-x-executable</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>NXterm</_name>
+ <executable>nxterm</executable>
+ <command>nxterm</command>
+ <icon-name>application-x-executable</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>RXVT</_name>
+ <executable>rxvt</executable>
+ <command>rxvt</command>
+ <icon-name>application-x-executable</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>aterm</_name>
+ <executable>aterm</executable>
+ <command>aterm</command>
+ <icon-name>application-x-executable</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>ETerm</_name>
+ <executable>ETerm</executable>
+ <command>ETerm</command>
+ <icon-name>application-x-executable</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
+ <terminal>
+ <_name>Konsole</_name>
+ <executable>konsole</executable>
+ <command>konsole</command>
+ <icon-name>konsole</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+
 <terminal>
 <_name>Terminal</_name>
 <executable>terminal</executable>
@@ -349,6 +399,7 @@
 <icon-name>utilities-terminal</icon-name>
 <exec-flag>-e</exec-flag>
 </terminal>
+
 <terminal>
 <_name>Sakura</_name>
 <executable>sakura</executable>
@@ -356,45 +407,112 @@
 <icon-name>terminal-tango</icon-name>
 <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-player>
- <_name>Listen</_name>
- <executable>listen</executable>
- <command>listen</command>
- <icon-name>listen</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </media-player>
- </media-players>
+ </terminals>
+
+ <image-viewers>
+
+ <image-viewer>
+ <_name>MATE image viewer</_name>
+ <executable>eom</executable>
+ <command>eog %s</command>
+ <icon-name>eom</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </image-viewer>
+
+ <image-viewer>
+ <_name>Eye of GNOME</_name>
+ <executable>eog</executable>
+ <command>eog %s</command>
+ <icon-name>eog</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </image-viewer>
+
+ <!-- se necesita agregar los otros visores -->
+ </image-viewers>
+
+ <music-players>
+
+ <music-player>
+ <_name>DeaDBeeF</_name>
+ <executable>deadbeef</executable>
+ <command>deadbeef %s</command>
+ <icon-name>deadbeef</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </music-player>
+
+ <music-player>
+ <_name>VLC</_name>
+ <executable>vlc</executable>
+ <command>vlc %s</command>
+ <icon-name>vlc</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </music-player>
+
+ <music-player>
+ <_name>Rhythmbox Music Player</_name>
+ <executable>rhythmbox</executable>
+ <command>rhythmbox</command>
+ <icon-name>rhythmbox</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </music-player>
+
+ <music-player>
+ <_name>Totem Movie Player</_name>
+ <executable>totem</executable>
+ <command>totem</command>
+ <icon-name>totem</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </music-player>
+
+ <music-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>
+ </music-player>
+
+ <music-player>
+ <_name>Muine Music Player</_name>
+ <executable>muine</executable>
+ <command>muine</command>
+ <icon-name>muine</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </music-player>
+
+
+ <music-player>
+ <_name>Listen</_name>
+ <executable>listen</executable>
+ <command>listen</command>
+ <icon-name>listen</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </music-player>
+
+ <!-- se necesita agregar los otros reproductores de musica -->
+ </music-players>
+
+ <media-players>
+
+ <media-player>
+ <_name>VLC</_name>
+ <executable>vlc</executable>
+ <command>vlc %s</command>
+ <icon-name>vlc</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>
+
+
 
 <a11y-visual>
 <visual>
author	Perberos <[email protected]>	2011-12-05 06:31:39 -0300
committer	Perberos <[email protected]>	2011-12-05 06:31:39 -0300
commit	efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b (patch)
tree	a57782c02659983e2d5f76af4b358c57fb2e5069
parent	12eae9fdc68e3186b290b3779842d313aed89454 (diff)
download	mate-control-center-efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b.tar.bz2 mate-control-center-efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b.tar.xz