diff options
| 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 /capplets/default-applications/mate-da-capplet.c | |
| parent | 12eae9fdc68e3186b290b3779842d313aed89454 (diff) | |
| download | mate-control-center-efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b.tar.bz2 mate-control-center-efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b.tar.xz | |
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.
Diffstat (limited to 'capplets/default-applications/mate-da-capplet.c')
| -rw-r--r-- | capplets/default-applications/mate-da-capplet.c | 625 |
1 files changed, 357 insertions, 268 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; } |