From fd6ab4bdcf7fd81d3debe2a1b6c1aec06fc5b73f3c6b845437cb874f3aa41085 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 25 Apr 2011 09:58:59 +0000 Subject: [PATCH] Accepting request 67381 from GNOME:Next thanks OBS-URL: https://build.opensuse.org/request/show/67381 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=93 --- gnome-control-center-2.32.1.tar.bz2 | 3 - gnome-control-center-3.0.0.1.tar.bz2 | 3 + ...e-control-center-bnc427745-force-dpi.patch | 16 - ...e-control-center-mime-scheme-handler.patch | 1522 ----------------- ...ntrol-center-shell-common-tasks-i18n.patch | 28 - ...-control-center-symlinked-background.patch | 115 -- gnome-control-center-use-settings-menu.patch | 13 - gnome-control-center.changes | 397 +++++ gnome-control-center.spec | 176 +- 9 files changed, 485 insertions(+), 1788 deletions(-) delete mode 100644 gnome-control-center-2.32.1.tar.bz2 create mode 100644 gnome-control-center-3.0.0.1.tar.bz2 delete mode 100644 gnome-control-center-bnc427745-force-dpi.patch delete mode 100644 gnome-control-center-mime-scheme-handler.patch delete mode 100644 gnome-control-center-shell-common-tasks-i18n.patch delete mode 100644 gnome-control-center-symlinked-background.patch delete mode 100644 gnome-control-center-use-settings-menu.patch diff --git a/gnome-control-center-2.32.1.tar.bz2 b/gnome-control-center-2.32.1.tar.bz2 deleted file mode 100644 index 97dbf5e..0000000 --- a/gnome-control-center-2.32.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 -size 2280217 diff --git a/gnome-control-center-3.0.0.1.tar.bz2 b/gnome-control-center-3.0.0.1.tar.bz2 new file mode 100644 index 0000000..6b3f2fb --- /dev/null +++ b/gnome-control-center-3.0.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f3e95ba559d73cfe714d4dbc7ac70a342cfd9999d506552b79f9e61a171e1d9 +size 4601838 diff --git a/gnome-control-center-bnc427745-force-dpi.patch b/gnome-control-center-bnc427745-force-dpi.patch deleted file mode 100644 index c59bdfa..0000000 --- a/gnome-control-center-bnc427745-force-dpi.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gnome-control-center-2.24.0/capplets/appearance/appearance-font.c -=================================================================== ---- gnome-control-center-2.24.0.orig/capplets/appearance/appearance-font.c -+++ gnome-control-center-2.24.0/capplets/appearance/appearance-font.c -@@ -759,8 +759,10 @@ dpi_load (GConfClient *client, - if (value) { - dpi = gconf_value_get_float (value); - gconf_value_free (value); -- } else -+ } else { - dpi = get_dpi_from_x_server (); -+ dpi = DPI_FALLBACK; -+ } - - if (dpi < DPI_LOW_REASONABLE_VALUE) - dpi = DPI_LOW_REASONABLE_VALUE; diff --git a/gnome-control-center-mime-scheme-handler.patch b/gnome-control-center-mime-scheme-handler.patch deleted file mode 100644 index 4e4e0be..0000000 --- a/gnome-control-center-mime-scheme-handler.patch +++ /dev/null @@ -1,1522 +0,0 @@ -From f8317280f54336c5252ee7ab6df33a4f325a426d Mon Sep 17 00:00:00 2001 -From: Rodrigo Moya -Date: Mon, 11 Oct 2010 13:35:21 +0200 -Subject: [PATCH 1/7] [default applications] Use URL handlers for browser and mailer applications - ---- - capplets/default-applications/gnome-da-capplet.c | 403 ++----------------- - capplets/default-applications/gnome-da-capplet.h | 11 - - capplets/default-applications/gnome-da-item.c | 13 +- - capplets/default-applications/gnome-da-item.h | 15 +- - capplets/default-applications/gnome-da-xml.c | 105 ++--- - .../gnome-default-applications-properties.ui | 172 +-------- - 6 files changed, 101 insertions(+), 618 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c -index 438ee13..399527d 100644 ---- a/capplets/default-applications/gnome-da-capplet.c -+++ b/capplets/default-applications/gnome-da-capplet.c -@@ -64,83 +64,25 @@ set_icon (GtkImage *image, GtkIconTheme *theme, const char *name) - } - - static void --web_radiobutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet) --{ -- gint index; -- GnomeDAWebItem *item; -- const gchar *command; -- GError *error = NULL; -- -- index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box)); -- -- if (index == -1) -- return; -- -- item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index); -- if (item == NULL) -- return; -- -- 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; -- } -- -- gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); -- -- 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, GnomeDACapplet *capplet) - { - guint current_index; -- gboolean is_custom_active; -- gboolean has_net_remote; -- GnomeDAWebItem *item; -- GtkWidget *active = NULL; - - current_index = gtk_combo_box_get_active (combo); - - if (current_index < g_list_length (capplet->web_browsers)) { -+ GnomeDAURLItem *item; -+ GError *error = NULL; - -- item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index); -- has_net_remote = item->netscape_remote; -- is_custom_active = FALSE; -- -- } -- 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); -- -- if (has_net_remote) { -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); -+ if (item == NULL) -+ return; - -- 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))) -- active = capplet->new_tab_radiobutton; -- else -- active = capplet->default_radiobutton; -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error)) { -+ g_warning (_("Error setting default browser: %s"), error->message); -+ g_error_free (error); -+ } - } -- -- web_radiobutton_toggled_cb (active, capplet); - } - - /* FIXME: Refactor these two functions below into one... */ -@@ -148,14 +90,23 @@ static void - mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *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)); - -- 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 < g_list_length (capplet->mail_readers)) { -+ GnomeDAURLItem *item; -+ GError *error = NULL; -+ -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); -+ if (item == NULL) -+ return; -+ -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/mailto", &error)) { -+ g_warning (_("Error setting default mailer: %s"), error->message); -+ g_error_free (error); -+ } -+ } -+ - } - - static void -@@ -297,221 +248,6 @@ generic_item_comp (gconstpointer list_item, gconstpointer command) - return (strcmp (((GnomeDAItem *) list_item)->command, (gchar *) command)); - } - --static gint --web_item_comp (gconstpointer item, gconstpointer command) --{ -- GnomeDAWebItem *web_list_item; -- -- web_list_item = (GnomeDAWebItem *) item; -- -- if (strcmp (web_list_item->generic.command, (gchar *) command) == 0) -- return 0; -- -- if (web_list_item->netscape_remote) { -- if (strcmp (web_list_item->tab_command, (gchar *) command) == 0) -- return 0; -- -- if (strcmp (web_list_item->win_command, (gchar *) command) == 0) -- return 0; -- } -- -- return (strcmp (web_list_item->generic.command, (gchar *) command)); --} -- --static void --web_gconf_changed_cb (GConfPropertyEditor *peditor, gchar *key, GConfValue *value, GnomeDACapplet *capplet) --{ -- GConfChangeSet *cs; -- GError *error = NULL; -- GList *list_entry; -- -- /* This function is used to update HTTPS,ABOUT and UNKNOWN handlers, which -- * 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 = gconf_value_get_string (value); -- -- cs = gconf_change_set_new (); -- -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); -- gconf_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); -- gconf_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); -- -- if (list_entry) { -- GnomeDAWebItem *item = (GnomeDAWebItem *) list_entry->data; -- -- gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote); -- } -- -- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- error = NULL; -- } -- -- gconf_change_set_unref (cs); -- } -- else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) { -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton), -- gconf_value_get_bool (value)); -- -- cs = gconf_change_set_new (); -- -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); -- -- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- error = NULL; -- } -- -- gconf_change_set_unref (cs); -- } --} -- --static void --web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command) --{ -- GList *entry; -- gboolean has_net_remote; -- -- entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp); -- -- if (entry) { -- GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data; -- -- has_net_remote = item->netscape_remote; -- -- if (has_net_remote) { -- /* disable "toggle" signal emitting, thus preventing calling this function twice */ -- g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton), -- strcmp (item->generic.command, command) == 0); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton), -- strcmp (item->tab_command, command) == 0); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton), -- strcmp (item->win_command, command) == 0); -- -- g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- } -- } -- else { -- has_net_remote = FALSE; -- } -- -- 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); --} -- --static GConfValue* --web_combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) --{ -- GConfValue *ret; -- GList *entry, *handlers; -- const gchar *command; -- gint index; -- GnomeDACapplet *capplet; -- -- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); -- -- command = gconf_value_get_string (value); -- handlers = capplet->web_browsers; -- -- if (handlers) -- { -- entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp); -- if (entry) -- index = g_list_position (handlers, entry); -- else -- index = g_list_length (handlers) + 1; -- } -- else -- { -- /* if the item has no handlers lsit then select the Custom item */ -- index = 1; -- } -- -- web_browser_update_radio_buttons (capplet, command); -- -- ret = gconf_value_new (GCONF_VALUE_INT); -- gconf_value_set_int (ret, index); -- -- return ret; --} -- --static GConfValue* --web_combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) --{ -- GConfValue *ret; -- GList *handlers; -- gint index; -- GnomeDAWebItem *item; -- const gchar *command; -- GnomeDACapplet *capplet; -- -- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); -- -- index = gconf_value_get_int (value); -- handlers = capplet->web_browsers; -- -- item = g_list_nth_data (handlers, index); -- -- ret = gconf_value_new (GCONF_VALUE_STRING); -- if (!item) -- { -- /* if item was not found, this is probably the "Custom" item */ -- /* XXX: returning "" as the value here is not ideal, but required to -- * prevent the combo box from jumping back to the previous value if the -- * user has selected Custom */ -- gconf_value_set_string (ret, ""); -- return ret; -- } -- else -- { -- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && item->netscape_remote == TRUE) -- command = item->win_command; -- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && item->netscape_remote == TRUE) -- command = item->tab_command; -- else -- command = item->generic.command; -- -- gconf_value_set_string (ret, command); -- return ret; -- } --} -- - static GConfValue* - combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) - { -@@ -632,7 +368,7 @@ is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index) - } - - static void --fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) -+fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) - { - GList *entry; - GtkTreeModel *model; -@@ -644,8 +380,10 @@ fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) - 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); -+ if (add_custom) { -+ 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); -@@ -683,13 +421,15 @@ fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) - 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); -+ if (add_custom) { -+ 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* -@@ -702,7 +442,6 @@ _gtk_builder_get_widget (GtkBuilder *builder, const gchar *name) - static void - show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - { -- GObject *obj; - GtkBuilder *builder; - guint builder_result; - -@@ -732,17 +471,6 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); - g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); - -- 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"); -- capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton"); -- capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton"); -- capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton"); -- capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton"); -- -- capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry"); -- capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label"); -- capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton"); -- - capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry"); - capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label"); - capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry"); -@@ -770,12 +498,12 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - 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); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); - - 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); -@@ -784,53 +512,8 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - 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); -- - /* Setup GConfPropertyEditors */ - -- /* Web Browser */ -- gconf_peditor_new_combo_box (NULL, -- DEFAULT_APPS_KEY_HTTP_EXEC, -- capplet->web_combo_box, -- "conv-from-widget-cb", web_combo_conv_from_widget, -- "conv-to-widget-cb", web_combo_conv_to_widget, -- "data", capplet, -- NULL); -- -- obj = gconf_peditor_new_string (NULL, -- DEFAULT_APPS_KEY_HTTP_EXEC, -- capplet->web_browser_command_entry, -- NULL); -- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); -- -- obj = gconf_peditor_new_boolean (NULL, -- DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, -- capplet->web_browser_terminal_checkbutton, -- NULL); -- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); -- -- /* Mailer */ -- gconf_peditor_new_combo_box (NULL, -- DEFAULT_APPS_KEY_MAILER_EXEC, -- capplet->mail_combo_box, -- "conv-from-widget-cb", combo_conv_from_widget, -- "conv-to-widget-cb", combo_conv_to_widget, -- "data", capplet->mail_readers, -- NULL); -- -- gconf_peditor_new_string (NULL, -- DEFAULT_APPS_KEY_MAILER_EXEC, -- capplet->mail_reader_command_entry, -- NULL); -- -- gconf_peditor_new_boolean (NULL, -- DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, -- capplet->mail_reader_terminal_checkbutton, -- NULL); -- - /* Media player */ - gconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_MEDIA_EXEC, -diff --git a/capplets/default-applications/gnome-da-capplet.h b/capplets/default-applications/gnome-da-capplet.h -index 2f55f56..db7f4f6 100644 ---- a/capplets/default-applications/gnome-da-capplet.h -+++ b/capplets/default-applications/gnome-da-capplet.h -@@ -85,17 +85,6 @@ struct _GnomeDACapplet { - GtkWidget *visual_combo_box; - GtkWidget *mobility_combo_box; - -- GtkWidget *web_browser_command_entry; -- GtkWidget *web_browser_command_label; -- GtkWidget *web_browser_terminal_checkbutton; -- GtkWidget *default_radiobutton; -- GtkWidget *new_win_radiobutton; -- GtkWidget *new_tab_radiobutton; -- -- GtkWidget *mail_reader_command_entry; -- GtkWidget *mail_reader_command_label; -- GtkWidget *mail_reader_terminal_checkbutton; -- - GtkWidget *terminal_command_entry; - GtkWidget *terminal_command_label; - GtkWidget *terminal_exec_flag_entry; -diff --git a/capplets/default-applications/gnome-da-item.c b/capplets/default-applications/gnome-da-item.c -index d929bd5..86188e2 100644 ---- a/capplets/default-applications/gnome-da-item.c -+++ b/capplets/default-applications/gnome-da-item.c -@@ -21,12 +21,12 @@ - #include "gnome-da-capplet.h" - #include "gnome-da-item.h" - --GnomeDAWebItem* --gnome_da_web_item_new (void) -+GnomeDAURLItem* -+gnome_da_url_item_new (void) - { -- GnomeDAWebItem *item = NULL; -+ GnomeDAURLItem *item = NULL; - -- item = g_new0 (GnomeDAWebItem, 1); -+ item = g_new0 (GnomeDAURLItem, 1); - - return item; - } -@@ -72,7 +72,7 @@ gnome_da_mobility_item_new (void) - } - - void --gnome_da_web_item_free (GnomeDAWebItem *item) -+gnome_da_url_item_free (GnomeDAURLItem *item) - { - g_return_if_fail (item != NULL); - -@@ -82,8 +82,7 @@ gnome_da_web_item_free (GnomeDAWebItem *item) - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - -- g_free (item->tab_command); -- g_free (item->win_command); -+ g_object_unref (item->app_info); - - g_free (item); - } -diff --git a/capplets/default-applications/gnome-da-item.h b/capplets/default-applications/gnome-da-item.h -index 5a80af9..96d7b95 100644 ---- a/capplets/default-applications/gnome-da-item.h -+++ b/capplets/default-applications/gnome-da-item.h -@@ -25,7 +25,7 @@ - - typedef struct _GnomeDAItem GnomeDAItem; - --typedef struct _GnomeDAWebItem GnomeDAWebItem; -+typedef struct _GnomeDAURLItem GnomeDAURLItem; - typedef struct _GnomeDATermItem GnomeDATermItem; - typedef struct _GnomeDASimpleItem GnomeDASimpleItem; - typedef struct _GnomeDAVisualItem GnomeDAVisualItem; -@@ -39,17 +39,14 @@ struct _GnomeDAItem { - gchar *icon_path; - }; - --struct _GnomeDAWebItem { -+struct _GnomeDASimpleItem { - GnomeDAItem generic; - gboolean run_in_terminal; -- gboolean netscape_remote; -- gchar *tab_command; -- gchar *win_command; - }; - --struct _GnomeDASimpleItem { -+struct _GnomeDAURLItem { - GnomeDAItem generic; -- gboolean run_in_terminal; -+ GAppInfo *app_info; - }; - - struct _GnomeDATermItem { -@@ -67,13 +64,13 @@ struct _GnomeDAMobilityItem { - gboolean run_at_startup; - }; - --GnomeDAWebItem* gnome_da_web_item_new (void); - GnomeDATermItem* gnome_da_term_item_new (void); -+GnomeDAURLItem* gnome_da_url_item_new (void); - GnomeDASimpleItem* gnome_da_simple_item_new (void); - GnomeDAVisualItem* gnome_da_visual_item_new (void); - GnomeDAMobilityItem* gnome_da_mobility_item_new (void); --void gnome_da_web_item_free (GnomeDAWebItem *item); - void gnome_da_term_item_free (GnomeDATermItem *item); -+void gnome_da_url_item_free (GnomeDAURLItem *item); - void gnome_da_simple_item_free (GnomeDASimpleItem *item); - void gnome_da_visual_item_free (GnomeDAVisualItem *item); - void gnome_da_mobility_item_free (GnomeDAMobilityItem *item); -diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c -index 68f8c97..2566c20 100644 ---- a/capplets/default-applications/gnome-da-xml.c -+++ b/capplets/default-applications/gnome-da-xml.c -@@ -47,7 +47,7 @@ gnome_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")) -+ if (!xmlStrcasecmp (cont, (const xmlChar *) "true") || !xmlStrcasecmp (cont, (const xmlChar *) "1")) - ret_val = TRUE; - else - ret_val = FALSE; -@@ -91,7 +91,7 @@ gnome_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 ((const char *) sys_langs[i], (const char *) node_lang)) { - ret_val = (gchar *) xmlNodeGetContent (element); - /* since sys_langs is sorted from most desirable to - * least desirable, exit at first match -@@ -109,7 +109,7 @@ gnome_da_xml_get_string (const xmlNode *parent, const gchar *val_name) - } - - static gboolean --is_executable_valid (gchar *executable) -+is_executable_valid (const gchar *executable) - { - gchar *path; - -@@ -129,8 +129,6 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - xmlDoc *xml_doc; - xmlNode *root, *section, *element; - gchar *executable; -- GnomeDAWebItem *web_item; -- GnomeDASimpleItem *mail_item; - GnomeDASimpleItem *media_item; - GnomeDATermItem *term_item; - GnomeDAVisualItem *visual_item; -@@ -144,56 +142,9 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - root = xmlDocGetRootElement (xml_doc); - - for (section = root->children; section != NULL; section = section->next) { -- if (!xmlStrncmp (section->name, "web-browsers", 12)) { -+ if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "web-browser", 11)) { -- executable = gnome_da_xml_get_string (element, "executable"); -- if (is_executable_valid (executable)) { -- web_item = gnome_da_web_item_new (); -- -- web_item->generic.name = gnome_da_xml_get_string (element, "name"); -- web_item->generic.executable = executable; -- web_item->generic.command = gnome_da_xml_get_string (element, "command"); -- web_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -- -- web_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); -- web_item->netscape_remote = gnome_da_xml_get_bool (element, "netscape-remote"); -- if (web_item->netscape_remote) { -- web_item->tab_command = gnome_da_xml_get_string (element, "tab-command"); -- web_item->win_command = gnome_da_xml_get_string (element, "win-command"); -- } -- -- capplet->web_browsers = g_list_append (capplet->web_browsers, web_item); -- } -- else -- g_free (executable); -- } -- } -- } -- else if (!xmlStrncmp (section->name, "mail-readers", 12)) { -- for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "mail-reader", 11)) { -- executable = gnome_da_xml_get_string (element, "executable"); -- if (is_executable_valid (executable)) { -- mail_item = gnome_da_simple_item_new (); -- -- mail_item->generic.name = gnome_da_xml_get_string (element, "name"); -- mail_item->generic.executable = executable; -- mail_item->generic.command = gnome_da_xml_get_string (element, "command"); -- mail_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -- -- mail_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); -- -- capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item); -- } -- else -- g_free (executable); -- } -- } -- } -- else if (!xmlStrncmp (section->name, "terminals", 9)) { -- for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "terminal", 8)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "terminal", 8)) { - executable = gnome_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - term_item = gnome_da_term_item_new (); -@@ -212,9 +163,9 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - } - } - } -- else if (!xmlStrncmp (section->name, "media-players", 13)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "media-players", 13)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "media-player", 12)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "media-player", 12)) { - executable = gnome_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - media_item = gnome_da_simple_item_new (); -@@ -233,9 +184,9 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - } - } - } -- else if (!xmlStrncmp (section->name, "a11y-visual", 11)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "visual", 6)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "visual", 6)) { - executable = gnome_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - visual_item = gnome_da_visual_item_new (); -@@ -254,9 +205,9 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - } - } - } -- else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "mobility", 8)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) { - executable = gnome_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - mobility_item = gnome_da_mobility_item_new (); -@@ -280,11 +231,37 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - xmlFreeDoc (xml_doc); - } - -+static void -+load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme, GList **item_list) -+{ -+ GList *app_list; -+ -+ app_list = g_app_info_get_all_for_type (scheme); -+ while (app_list != NULL) { -+ const gchar *executable; -+ GAppInfo *app_info = (GAppInfo *) app_list->data; -+ -+ executable = g_app_info_get_executable (app_info); -+ if (is_executable_valid (executable)) { -+ GnomeDASimpleItem *url_item; -+ -+ url_item = gnome_da_simple_item_new (); -+ url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); -+ url_item->generic.executable = g_strdup (executable); -+ url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); -+ url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -+ -+ *item_list = g_list_append (*item_list, url_item); -+ } -+ } -+} -+ - void - gnome_da_xml_load_list (GnomeDACapplet *capplet) - { - GDir *app_dir = g_dir_open (GNOMECC_APPS_DIR, 0, NULL); - -+ /* First load all applications from the XML files */ - if (app_dir != NULL) { - const gchar *extra_file; - gchar *filename; -@@ -299,13 +276,17 @@ gnome_da_xml_load_list (GnomeDACapplet *capplet) - } - g_dir_close (app_dir); - } -+ -+ /* Now load URL handlers */ -+ load_url_handlers (capplet, "x-scheme-handler/http", &capplet->web_browsers); -+ load_url_handlers (capplet, "x-scheme-handler/mailto", &capplet->mail_readers); - } - - void - gnome_da_xml_free (GnomeDACapplet *capplet) - { -- g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_web_item_free, NULL); -- g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_simple_item_free, NULL); -+ g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_url_item_free, NULL); -+ g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_url_item_free, NULL); - g_list_foreach (capplet->terminals, (GFunc) gnome_da_term_item_free, NULL); - g_list_foreach (capplet->media_players, (GFunc) gnome_da_simple_item_free, NULL); - g_list_foreach (capplet->visual_ats, (GFunc) gnome_da_visual_item_free, NULL); -diff --git a/capplets/default-applications/gnome-default-applications-properties.ui b/capplets/default-applications/gnome-default-applications-properties.ui -index 9a4cfcf..4f25207 100644 ---- a/capplets/default-applications/gnome-default-applications-properties.ui -+++ b/capplets/default-applications/gnome-default-applications-properties.ui -@@ -1,4 +1,4 @@ -- -+ - - - -@@ -69,122 +69,7 @@ - - - -- -- True -- 4 -- 3 -- 12 -- 6 -- -- -- True -- True -- All %s occurrences will be replaced with actual link -- -- -- 1 -- 2 -- 3 -- 4 -- -- -- -- -- -- Run in t_erminal -- True -- False -- True -- False -- True -- True -- -- -- 2 -- 3 -- 3 -- 4 -- GTK_FILL -- -- -- -- -- -- Open link with web browser _default -- True -- False -- True -- False -- True -- True -- True -- -- -- 3 -- GTK_FILL -- -- -- -- -- -- Open link in new _tab -- True -- False -- True -- False -- True -- True -- web_browser_default_radiobutton -- -- -- 3 -- 2 -- 3 -- GTK_FILL -- -- -- -- -- -- Open link in new _window -- True -- False -- True -- False -- True -- True -- web_browser_default_radiobutton -- -- -- 3 -- 1 -- 2 -- GTK_FILL -- -- -- -- -- -- True -- False -- 0 -- C_ommand: -- True -- web_browser_command_entry -- -- -- 3 -- 4 -- GTK_FILL -- -- -- -- -- -- False -- False -- 1 -- -+ - - - -@@ -250,58 +135,7 @@ - - - -- -- True -- 3 -- 12 -- 6 -- -- -- True -- False -- 0 -- Co_mmand: -- True -- mail_reader_command_entry -- -- -- GTK_FILL -- -- -- -- -- -- True -- True -- All %s occurrences will be replaced with actual link -- -- -- 1 -- 2 -- -- -- -- -- -- Run in t_erminal -- True -- False -- True -- False -- True -- True -- -- -- 2 -- 3 -- GTK_FILL -- -- -- -- -- -- 1 -- -+ - - - --- -1.7.3.4 - - -From bd86a24b5b9809a94587d0436707036483ac1c51 Mon Sep 17 00:00:00 2001 -From: Rodrigo Moya -Date: Mon, 11 Oct 2010 15:40:43 +0200 -Subject: [PATCH 2/7] default applications: Set the selected browser to handle HTTPS urls also - ---- - capplets/default-applications/gnome-da-capplet.c | 3 ++- - capplets/default-applications/gnome-da-xml.c | 5 +++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c -index 399527d..47955b3 100644 ---- a/capplets/default-applications/gnome-da-capplet.c -+++ b/capplets/default-applications/gnome-da-capplet.c -@@ -78,7 +78,8 @@ web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - if (item == NULL) - return; - -- if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error)) { -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error) || -+ !g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/https", &error)) { - g_warning (_("Error setting default browser: %s"), error->message); - g_error_free (error); - } -diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c -index 2566c20..7fa9e3b 100644 ---- a/capplets/default-applications/gnome-da-xml.c -+++ b/capplets/default-applications/gnome-da-xml.c -@@ -243,13 +243,14 @@ load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme, GList **item_li - - executable = g_app_info_get_executable (app_info); - if (is_executable_valid (executable)) { -- GnomeDASimpleItem *url_item; -+ GnomeDAURLItem *url_item; - -- url_item = gnome_da_simple_item_new (); -+ url_item = gnome_da_url_item_new (); - url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); - url_item->generic.executable = g_strdup (executable); - url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); - url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -+ url_item->app_info = g_object_ref (app_info); - - *item_list = g_list_append (*item_list, url_item); - } --- -1.7.3.4 - - -From e30f53994e8d93d54e66461daf8d36748bc3f656 Mon Sep 17 00:00:00 2001 -From: Yanko Kaneti -Date: Mon, 1 Nov 2010 19:22:38 +0200 -Subject: [PATCH 3/7] user-accounts: Fix endless loop in load_url_handlers - ---- - capplets/default-applications/gnome-da-xml.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c -index 7fa9e3b..c3e6085 100644 ---- a/capplets/default-applications/gnome-da-xml.c -+++ b/capplets/default-applications/gnome-da-xml.c -@@ -234,12 +234,12 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - static void - load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme, GList **item_list) - { -- GList *app_list; -+ GList *app_list, *l; - - app_list = g_app_info_get_all_for_type (scheme); -- while (app_list != NULL) { -+ for (l = app_list; l != NULL; l = l->next) { - const gchar *executable; -- GAppInfo *app_info = (GAppInfo *) app_list->data; -+ GAppInfo *app_info = l->data; - - executable = g_app_info_get_executable (app_info); - if (is_executable_valid (executable)) { -@@ -250,11 +250,15 @@ load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme, GList **item_li - url_item->generic.executable = g_strdup (executable); - url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); - url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -- url_item->app_info = g_object_ref (app_info); -+ /* Steal the reference */ -+ url_item->app_info = app_info; - - *item_list = g_list_append (*item_list, url_item); -+ } else { -+ g_object_unref (app_info); - } - } -+ g_list_free (app_list); - } - - void --- -1.7.3.4 - - -From 2e439d133e9a1cf2365e8af0e2e07e7eb39721e3 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 1 Nov 2010 17:38:23 +0000 -Subject: [PATCH 4/7] default-applications: Simplify load_url_handlers - -When what you want is just a new list... ---- - capplets/default-applications/gnome-da-xml.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c -index c3e6085..e645725 100644 ---- a/capplets/default-applications/gnome-da-xml.c -+++ b/capplets/default-applications/gnome-da-xml.c -@@ -231,12 +231,14 @@ gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) - xmlFreeDoc (xml_doc); - } - --static void --load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme, GList **item_list) -+static GList * -+load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme) - { -- GList *app_list, *l; -+ GList *app_list, *l, *ret; - - app_list = g_app_info_get_all_for_type (scheme); -+ ret = NULL; -+ - for (l = app_list; l != NULL; l = l->next) { - const gchar *executable; - GAppInfo *app_info = l->data; -@@ -253,12 +255,14 @@ load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme, GList **item_li - /* Steal the reference */ - url_item->app_info = app_info; - -- *item_list = g_list_append (*item_list, url_item); -+ ret = g_list_prepend (ret, url_item); - } else { - g_object_unref (app_info); - } - } - g_list_free (app_list); -+ -+ return g_list_reverse (ret); - } - - void -@@ -283,8 +287,8 @@ gnome_da_xml_load_list (GnomeDACapplet *capplet) - } - - /* Now load URL handlers */ -- load_url_handlers (capplet, "x-scheme-handler/http", &capplet->web_browsers); -- load_url_handlers (capplet, "x-scheme-handler/mailto", &capplet->mail_readers); -+ capplet->web_browsers = load_url_handlers (capplet, "x-scheme-handler/http"); -+ capplet->mail_readers = load_url_handlers (capplet, "x-scheme-handler/mailto"); - } - - void --- -1.7.3.4 - - -From 5cf606c8d332d1bd761738fbe3515d92f7fe6d47 Mon Sep 17 00:00:00 2001 -From: Rodrigo Moya -Date: Thu, 11 Nov 2010 13:12:03 +0100 -Subject: [PATCH 5/7] default applications: Remove web browsers and mail readers from XML file - -We use g_app_info API to retrieve those now ---- - .../gnome-default-applications.xml.in | 239 -------------------- - 1 files changed, 0 insertions(+), 239 deletions(-) - -diff --git a/capplets/default-applications/gnome-default-applications.xml.in b/capplets/default-applications/gnome-default-applications.xml.in -index 54089e0..39fe3e6 100644 ---- a/capplets/default-applications/gnome-default-applications.xml.in -+++ b/capplets/default-applications/gnome-default-applications.xml.in -@@ -4,245 +4,6 @@ - - - -- -- -- <_name>Opera -- opera -- opera %s -- opera -- false -- true -- opera -newpage %s -- opera -newwindow %s -- -- -- <_name>Debian Sensible Browser -- sensible-browser -- sensible-browser %s -- -- false -- false -- -- -- <_name>Epiphany Web Browser -- epiphany -- epiphany %s -- web-browser -- false -- true -- epiphany --new-tab %s -- epiphany --new-window %s -- -- -- <_name>Galeon -- galeon -- galeon %s -- galeon -- false -- true -- galeon -n %s -- galeon -w %s -- -- -- <_name>Encompass -- encompass -- encompass %s -- encompass -- false -- false -- -- -- <_name>Firebird -- mozilla-firebird -- mozilla-firebird %s -- -- false -- true -- mozilla-firebird -remote "openurl(%s,new-tab)" -- mozilla-firebird -remote "openurl(%s,new-window)" -- -- -- <_name>Firefox -- firefox -- firefox %s -- firefox -- false -- true -- firefox -new-tab "%s" -- firefox -new-window "%s" -- -- -- <_name>Iceweasel -- iceweasel -- iceweasel %s -- iceweasel -- false -- true -- iceweasel -new-tab "%s" -- iceweasel -new-window "%s" -- -- -- <_name>Mozilla 1.6 -- mozilla-1.6 -- mozilla-1.6 %s -- mozilla-icon -- false -- true -- mozilla-1.6 -remote "openurl(%s,new-tab)" -- mozilla-1.6 -remote "openurl(%s,new-window)" -- -- -- <_name>Mozilla -- mozilla -- mozilla %s -- mozilla-icon -- false -- true -- mozilla -remote "openurl(%s,new-tab)" -- mozilla -remote "openurl(%s,new-window)" -- -- -- <_name>SeaMonkey -- seamonkey -- seamonkey %s -- seamonkey -- false -- true -- seamonkey -remote "openurl(%s,new-tab)" -- seamonkey -remote "openurl(%s,new-window)" -- -- -- <_name>Iceape -- iceape -- iceape %s -- iceape -- false -- true -- iceape -remote "openurl(%s,new-tab)" -- iceape -remote "openurl(%s,new-window)" -- -- -- <_name>Netscape Communicator -- netscape -- netscape %s -- netscape -- false -- true -- netscape -remote "openurl(%s,new-tab)" -- netscape -remote "openurl(%s,new-window)" -- -- -- <_name>Konqueror -- konqueror -- konqueror %s -- konqueror -- false -- false -- -- -- <_name>Midori -- midori -- midori %s -- midori -- false -- false -- -- -- -- -- -- <_name>Evolution Mail Reader -- evolution -- evolution %s -- evolution -- false -- -- -- <_name>Balsa -- balsa -- balsa -m %s -- gnome-balsa2 -- false -- -- -- <_name>KMail -- kmail -- kmail %s -- kmail -- false -- -- -- <_name>Icedove -- icedove -- icedove %s -- icedove -- false -- -- -- <_name>Thunderbird -- thunderbird -- thunderbird %s -- thunderbird -- false -- -- -- <_name>Mozilla Thunderbird -- mozilla-thunderbird -- mozilla-thunderbird %s -- thunderbird -- false -- -- -- <_name>Mozilla Mail -- mozilla -- mozilla -mail %s -- mozilla-mail-icon -- false -- -- -- <_name>SeaMonkey Mail -- seamonkey -- seamonkey -mail %s -- seamonkey -- false -- -- -- <_name>Iceape Mail -- iceape -- iceape -mail %s -- iceape -- false -- -- -- <_name>Mutt -- mutt -- mutt %s -- gnome-mime-application-x-executable -- true -- -- -- <_name>Claws Mail -- claws-mail -- claws-mail --compose %s -- claws-mail -- false -- -- -- <_name>Sylpheed-Claws -- sylpheed-claws -- sylpheed-claws --compose %s -- sylpheed -- false -- -- -- <_name>Sylpheed -- sylpheed -- sylpheed --compose %s -- sylpheed -- false -- -- -- - - - <_name>Debian Terminal Emulator --- -1.7.3.4 - - -From fcd14e4e8a887838eb20b622339a377e138df39d Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 13 Jan 2011 11:13:46 +0100 -Subject: [PATCH 6/7] default-applications: Do not set web browser as default mailer - -This fixes the usage of the wrong variable causing a change in the -default mailer to actually configure a browser as default mailer. ---- - capplets/default-applications/gnome-da-capplet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c -index 47955b3..3d41c6a 100644 ---- a/capplets/default-applications/gnome-da-capplet.c -+++ b/capplets/default-applications/gnome-da-capplet.c -@@ -98,7 +98,7 @@ mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - GnomeDAURLItem *item; - GError *error = NULL; - -- item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->mail_readers, current_index); - if (item == NULL) - return; - --- -1.7.3.4 - - -From fa629810b7c041bfa29e332cc3e7cdf3ec3ad118 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 13 Jan 2011 11:47:07 +0100 -Subject: [PATCH 7/7] default-applications: Select current default browser/mailer on start - ---- - capplets/default-applications/gnome-da-capplet.c | 29 ++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) - -diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c -index 3d41c6a..2c04161 100644 ---- a/capplets/default-applications/gnome-da-capplet.c -+++ b/capplets/default-applications/gnome-da-capplet.c -@@ -433,6 +433,32 @@ fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gb - } - } - -+static void -+select_current_for_uri_scheme (GtkComboBox *combo_box, GList *app_list, const gchar *uri) -+{ -+ GAppInfo *current_default; -+ GList *l; -+ int index; -+ -+ current_default = g_app_info_get_default_for_uri_scheme (uri); -+ if (!current_default) -+ return; -+ -+ index = 0; -+ -+ for (l = app_list; l != NULL; l = l->next) { -+ if (!g_app_info_equal (current_default, ((GnomeDAURLItem *) l->data)->app_info)) { -+ index++; -+ continue; -+ } -+ -+ gtk_combo_box_set_active (combo_box, index); -+ break; -+ } -+ -+ g_object_unref (current_default); -+} -+ - static GtkWidget* - _gtk_builder_get_widget (GtkBuilder *builder, const gchar *name) - { -@@ -506,6 +532,9 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); - -+ select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); -+ select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); -+ - 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); --- -1.7.3.4 - diff --git a/gnome-control-center-shell-common-tasks-i18n.patch b/gnome-control-center-shell-common-tasks-i18n.patch deleted file mode 100644 index 4a520a5..0000000 --- a/gnome-control-center-shell-common-tasks-i18n.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: gnome-control-center-2.27.91/shell/control-center.c -=================================================================== ---- gnome-control-center-2.27.91.orig/shell/control-center.c -+++ gnome-control-center-2.27.91/shell/control-center.c -@@ -35,6 +35,14 @@ static GSList *get_actions_list (); - #define CONTROL_CENTER_ACTIONS_SEPARATOR ";" - #define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action" - -+#define COMMON_TASK_1 N_("Change Look and Feel") -+#define COMMON_TASK_2 N_("Set Preferred Applications") -+#define COMMON_TASK_3 N_("Configure Printer") -+#define COMMON_TASK_4 N_("Configure Network") -+#define COMMON_TASK_5 N_("Edit Personal Information") -+#define COMMON_TASK_6 N_("Add User") -+#define COMMON_TASK_7 N_("Open Administrator Settings") -+ - static GSList * - get_actions_list (void) - { -@@ -57,7 +65,7 @@ get_actions_list (void) - - action = g_new (AppAction, 1); - temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2); -- action->name = g_strdup (temp[0]); -+ action->name = g_strdup (_(temp[0])); - if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL) - { - g_warning ("get_actions_list() - PROBLEM - Can't load %s\n", temp[1]); diff --git a/gnome-control-center-symlinked-background.patch b/gnome-control-center-symlinked-background.patch deleted file mode 100644 index c9f0fb7..0000000 --- a/gnome-control-center-symlinked-background.patch +++ /dev/null @@ -1,115 +0,0 @@ -Index: gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/appearance/appearance-desktop.c -+++ gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c -@@ -48,6 +48,50 @@ static const GtkTargetEntry drag_types[] - - static void wp_update_preview (GtkFileChooser *chooser, AppearanceData *data); - -+static GnomeWPItem * -+lookup_with_symlink (AppearanceData *data, -+ const char *path, -+ char **real_path) -+{ -+ GnomeWPItem *item; -+ gchar *readlink; -+ -+ if (real_path) -+ *real_path = NULL; -+ -+ if (!path) -+ return NULL; -+ -+ item = g_hash_table_lookup (data->wp_hash, path); -+ if (item) -+ return item; -+ -+ /* if the current background is not in the hash of known backgrounds, -+ * see if it's a symlink and if the file it points to is in the hash */ -+ -+ readlink = g_strdup (path); -+ -+ while (readlink && -+ g_file_test (readlink, G_FILE_TEST_IS_SYMLINK) && -+ item == NULL) { -+ gchar *new; -+ -+ new = g_file_read_link (readlink, NULL); -+ g_free (readlink); -+ readlink = new; -+ -+ if (readlink) -+ item = g_hash_table_lookup (data->wp_hash, readlink); -+ } -+ -+ if (item != NULL && real_path) -+ *real_path = readlink; -+ else -+ g_free (readlink); -+ -+ return item; -+} -+ - static void - select_item (AppearanceData *data, - GnomeWPItem * item, -@@ -418,11 +462,16 @@ wp_uri_changed (const gchar *uri, - AppearanceData *data) - { - GnomeWPItem *item, *selected; -+ gchar *realuri; -+ -+ realuri = NULL; -+ item = lookup_with_symlink (data, uri, &realuri); -+ if (!realuri) -+ realuri = g_strdup (uri); - -- item = g_hash_table_lookup (data->wp_hash, uri); - selected = get_selected_item (data, NULL); - -- if (selected != NULL && strcmp (selected->filename, uri) != 0) -+ if (selected != NULL && strcmp (selected->filename, realuri) != 0) - { - if (item == NULL) - item = wp_add_image (data, uri); -@@ -430,6 +479,8 @@ wp_uri_changed (const gchar *uri, - if (item) - select_item (data, item, TRUE); - } -+ -+ g_free (realuri); - } - - static void -@@ -936,6 +987,7 @@ wp_load_stuffs (void *user_data) - AppearanceData *data; - gchar *imagepath, *uri, *style; - GnomeWPItem *item; -+ gchar *realpath; - - data = (AppearanceData *) user_data; - -@@ -971,7 +1023,12 @@ wp_load_stuffs (void *user_data) - - g_free (uri); - -- item = g_hash_table_lookup (data->wp_hash, imagepath); -+ realpath = NULL; -+ item = lookup_with_symlink (data, imagepath, &realpath); -+ if (realpath) { -+ g_free (imagepath); -+ imagepath = realpath; -+ } - - if (item != NULL) - { -@@ -986,7 +1043,9 @@ wp_load_stuffs (void *user_data) - wp_props_load_wallpaper (item->filename, item, data); - } - -+ data->wp_update_gconf = FALSE; - select_item (data, item, FALSE); -+ data->wp_update_gconf = TRUE; - } - } - else if (strcmp (style, "none") != 0) diff --git a/gnome-control-center-use-settings-menu.patch b/gnome-control-center-use-settings-menu.patch deleted file mode 100644 index 0bdfa55..0000000 --- a/gnome-control-center-use-settings-menu.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: shell/control-center.c -=================================================================== ---- shell/control-center.c.orig -+++ shell/control-center.c -@@ -174,7 +174,7 @@ main (int argc, char *argv[]) - return retval; - } - -- app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX, -+ app_data = appshelldata_new ("settings.menu", NULL, CONTROL_CENTER_PREFIX, - GTK_ICON_SIZE_DND, FALSE, TRUE); - generate_categories (app_data); - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 187f3c7..08d374b 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,400 @@ +------------------------------------------------------------------- +Wed Apr 6 14:23:52 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0.1: + + Network: + - Avoid assertions with mobile broadband devices + + Background: + - Fix a compiler warning + + Printers: + - Actualize printer and job lists automatically + - Avoid crash if policy is unavailable + - Don't set a reason when setting AcceptJobs + + Date & Time: + - Fix test-endianess on OpenSUSE (bgo#646780) +- Changes from version 3.0.0: + + Background: + - Don't show errors when loading default bg (bgo#646056). + - Don't use the GnomeBG thumbnails for the preview area + (bgo#646180). + - Don't assert() for typos in XML files (bgo#646250). + + Common: + - Remove API reference, as it's incomplete and going away for + next cycle. + - Fix build on fresh checkouts + + Keyboard: + - Set repeat-interval correctly (bgo#646241) + - Bump gnome-settings-daemon requirement + + Network: + - Use symbolic icon for ad-hoc wireless connections + (bgo#646140). + - Hide the security cell renderer if there's no icon to display + (bgo#646140) + - Do not add bluetooth devices to the panel to avoid asserting + the control-center. + - Fix build against NetworkManager on Debian (bgo#646349). + - Reset the network name combo when disconnected (bgo#646031). + - Display more detailed status for unavailable devices + (bgo#646027). + - Make creating vpn connections work again. + + Printers: + - Make "Print Test Page" button always sensitive + - Do not delete browsed printers + + Region: + - Make the layout options modal (bgo#646183). + + Shell: + - Turn off spinner cursor when launched (bgo#646045). + + Sound: + - Make the volume icons smaller and center them properly in the + bar (bgo#646153). + - Make sound applet work again in fallback (bgo#646044). + + Universal Access: + - Don't incorrectly mark some hboxes as insensitive + (bgo#646240). +- Drop fix-timezone-build.patch: fixed upstream +- Ensure suse_update_desktop_files is called on all .desktop files. + +------------------------------------------------------------------- +Wed Mar 30 08:18:22 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.93: + + Common: + - Add a --verbose option to the shell + - Make sure the desktop file uses categories that show up in + menus. + + Date & Time: + - Fix time widget ordering in RTL locales + + Printing: + - Use a single privilege to unlock the entire page + - Honor disable-print-setup lockdown setting + - Use CUPS printer test page + + Power: + - Use a better icon + + Sound: + - Port to GSettings + - Fallback if loading a non-existent custom theme + + User Accounts: + - Remove stray debugging output + - Make crop window modal + - Fix crop window background color + + Universal Access: + - Bring screen reader option back + + Network: + - Drop creation of custom connections for now, except for VPN + - Show a padlock icon for 'secure' access points + + Memory leak fixes + - Implement on/off switch for wired devices + - Properly track VPN connection state + - Use grids for better UI alignment + - Handle NetworkManager restarts gracefully + + Region: + - Remove tooltips from layout list + + Background: + - Make the window fit on small screens + + Updated translations. + +------------------------------------------------------------------- +Thu Mar 24 14:29:01 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.92: + + Common: + - Bump GTK+ dep to 3.0.2 (bgo#644182) + - Fix linking of libshortcuts against (bgo#644410) + - Improve CUPS detection (bgo#644064) + - Set the 'inline-toolbar' style class to toolbars which need + it (bgo#645059) + + Background: + - Use new picture-uri GSettings key (bgo#633983) + + Date and Time: + - Change combobox when map is clicked + - Make 24h setting changeable without unlocking (bgo#643891) + - Add missing timezone files (bgo#630261) + - Add hacks to support more timezones + - Don't crash when the timezone is unknown + + Display: + - Fix dragging rotated monitors (bgo#641345) + + Info: + - Use dim labels + + Keyboard: + - Fix crasher when num workspace changes (bgo#644784) + - Mark the scales as insensitive when the checkboxes are off + (bgo#645151) + - Correct labels for blinking speed (bgo#645314) + + Mouse: + - Don't destroy the touchpad tab + - Check caps of the touchpad when added + - Make sure we fit within our minimum vertical size + - Don't reset scrolling method on start (bgo#642474) + + Network: + - Show the wireless security currently being used + - Do not show a provider string for mobile broadband devices + when not connected. + - Do not show the IPv6 address if nm_device_get_dhcp6_config() + failed. + - nm_device_wifi_get_bitrate() returns values in kb/s, not + Mb/s. + - Hide UI controls that are not connected up to anything yet. + - Display the IPv6 address if one is provided for the device. + - Never show the loop device if IP4 data isn't available. + - Use an abstract device so we can get the VPN connection data/ + - Show the VPN connection state in the panel header. + - A disconnected wired connection is 'Unplugged', not + 'Disconnected'. + - Display a different icon if the wired ethernet device is + disconnected. + - Do not show a speed of zero for any device + - Ensure we refresh the UI if coldplug devices are changed + - Add Option buttons + - Fix some alignment and focus issues + - Add a device off switch + - Implement and show on/off switch for wireless/wimax + - Refresh UI when active connections change + - Add Option buttons to allow editing connections + - Watch for new VPN connections being added and add them to the + panel. + - Drop tooltips on the device list (bgo#644964) + - Use dim-label style class for labels (bgo#644964) + - Fix version compatibility warning dialog (bgo#644973) + - Avoid header pixel noise and inconsistent spacing + (bgo#644954, bgo#644955) + + Printers: + - Attach 'add printer' dialog to toplevel (bgo#644213) + - Call cupsGetDevices() asynchronously (bgo#644212) + - Use dim-label to accentuate values + - Set longer timeout for installation of printer driver + - Don't sort printers by usage + - Handle no printers situation better (bgo#641421) + - Show IP address of printer + - Change text about unavailability of CUPS (bgo#641421) + - Fix alignment in secondary notebook pages + - Show computer-fail icon when can not connect to CUPS (bgo#641421) + + Region: + - Using separate window group to avoid modal shadowing + - Stop layout add dialogue from "jumping" + - Make drag'n'drop work + + Screen: + - Fix the delay acrobatics (bgo#644403) + - Drop converting between seconds and minutes + - Set the label as insensitive when Lock is off (bgo#645149) + - Honor disable-lock-screen setting + + Shell: + - Fix resizing when switching from panel to panel (bgo#636596) + + Sound: + - Fix scroll event handling of channel bars (bgo#644462) + - Fix ordering of typedefs + - Use upstream value for amplified volume (bgo#644292) + - Add introspection info for new GIcon function + - Remove old support code for PA < 0.9.15 + + Universal access: + - Set the name to the right hboxes (bgo#645135) + - Use NO_SENSITIVITY flag for g_settings_bind() (bgo#645171) + + User accounts: + - Use dim-label class instead of hardcoded color + - Update cheeese minimum requirements + - Nuke supervised accounts + - Don't warn if there are no faces pixmaps (bgo#645347) +- Changes from version 2.91.91: + + Shell: + - Reload the list of panels when new ones are added + + Date and Time: + - Use correct order for date widgets when in non-US locales + + Info: + - Look for which device is being driven by the VESA driver + - Remove (tm) from GNOME logo + + Keyboard: + - Add support for the magnifier zoom in/out shortcuts + - Fix loading of custom shortcuts + - Fix initial selection in the shortcut pane + - Make shortcut conflicts code actually work + - Fix warning about "editing-canceled" + - Make repeat rate and speed follow a11y guidelines + + Network: + - Update for recent NetworkManager changes + + Printers: + - Don't show driver version in the model name + - Add dialogue for adding new printers + + Region and Language: + - Don't block the interface when loading the panel + - Do not allow adding the same keyboard layout twice + + Sound: + - Fix only starting applet in fallback session + + Universal Access: + - Show actual keyboard shortcuts as defined in Keyboard + - Make "on-screen keyboard" switch work + - Fix initial state of typing help + - Add "smaller text" size +- Add fix-timezone-build.patch: fix locale path, used at build time + to check if timezone data are available. +- Add build requires on pkgconfig(cheese-gtk): allow to take user + face snapshot from user account dialog. +- Add requires on freeglut, system info panel needs glxinfo binary. + +------------------------------------------------------------------- +Wed Mar 2 10:55:51 CET 2011 - vuntz@opensuse.org + +- Remove gnome-patch-translation support as there are no strings + added by patches anymore: + + remove gnome-patch-translation BuildRequires. + + remove calls to gnome-patch-translation-prepare/update in + %setup. + +------------------------------------------------------------------- +Thu Feb 24 14:41:37 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.90: + + Background: + - Remove loading of obsolete backgrounds + - Load initial state from GSettings + - Don't warn when trying to load a gradient + - Make loading wallpapers seem faster + - Show 'Adwaita' as the first in the list (bgo#637384) + - Handle no-flags from saved config + - Set the shading for pictures + - Add/Remove features for panel + - Don't show an error if no cache dir + - Add arrows for the gradients + + Date & Time: + - Don't crash when g-s-d is badly installed (bgo#641232) + - Create filenames locale-independently (bgo#641294) + - Fix crash when TZ is an alias (bgo#641360) + - Fix city combobox filtering + + Display: + - Remove support for old D-Bus interface + - Simplify some old GNOME 2.x code + + Info: + - Make labels selectable + - Add graphics info + - Add special case for Atom(TM) + - Add panel chooser, graphics tab (bgo#642068) + - Add stub for default apps page + - Clarify language in force fallback controls + - Correctly detect the fallback session + + Keyboard: + - Change grouping of keys + - Improve the layout of the bindings page + - Clean up GConf handling + - Add support for GSettings shortcuts + - Pass a gettext package when loading GConf + - Don't resize the shell horizontally + - Don't expand tables vertically + - Add Universal Access shortcuts (bgo#641279) + + Network: + - Wrap long dns lines + - Select the first device after they are all loaded + - Use the same border width as other panels + - Use emblem-default-symbolic for the default printer + - Disable NetworkManager when the airplane switch gets changed + - Show the wired network subnet mask + - Fix a crasher due to an uninitialized GVariant + - Fix linking + - Port to the rm-userset branch of NetworkManager + - Only add the strongest AP for each SSID to the drop down box + + Printers: + - Right align the image + - Use a 64px icon + - Don't expand switch vertically + - Fix panel width + - Allow location and model to span cols again + - Add unlock button (bgo#640733) + - Sort printers by usage (bgo#641285) + - l10n fixes for jobs count + - Add translation context to statuses (bgo#641339) + - Avoid unnecessary use of markup + - Check that cups is recent enough + - Change widget showing supply levels + - Don't show printers separator when not needed + - Don't try to draw empty ink level + - Replace "Idle" state by "Ready" + - Set Options and Show buttons sensitive + + Region: + - Use consistent border spacing + - New search-based layout addition (bgo#640772) + - Minor UI tweaks in kbd layout chooser + - Remove annoying tooltip on a treeview + - Easier to understand layout switching options (bgo#641021) + - Remove code to handle print button + - Some UI fixes for the layout chooser + - Make layout filtering much faster + - Fix overeager string splitting + - Fix the modality of the Preview dialog + + Screen: + - Simplify GtkBuilder-using code + - Hide the brightness slider when it cannot be set + - Hook up screen locking (bgo#637939) + - Set idle-delay to the same value as DPMS timeout + - Make sure the combo box is always set + - Fix the operation of locking + + Shell: + - Add shortcuts to focus search entry (bgo#409230) + - Don't pass invalid option flags (bgo#641290) + - Use symbolic icons in the search entry (bgo#642167) + - Sort the icons alphabetically + - Make sure the search entry doesn't appear when in a panel + - Fix searching for anything hiding widgets + + Sound: + - Try using symbolic icons for range widgets (bgo#614213) + + Universal Access: + - Allow the pointer page to use less horizontal space + - Hide options that are currently unavailable (bgo#639784) + - Implement the zoom setting + - Adjust for magnifier schema changes + - Use switches instead of radio groups + - Show the typing assistant widgets + + User Accounts: + - Use 0 instead of blank to clear options + - Port to GtkStyleContext + - Hide fingerprint dialogue by default (bgo#641990) + + Updated translations + +------------------------------------------------------------------- +Thu Feb 22 16:46:29 UTC 2011 - fcrozat@novell.com + +- Changes from version 2.91.6: + + Way too many changes since 2.32 to list here. Please see NEWS + the full list. Here are the highlights: + + Port to GTK+ 3 and migrate to GSettings. + + New control center shell, with panels, instead of independant + capplets. + + Revamp most panels, with a streamlined UI. + + Add new panels: Background, Date & Time, Media (based on what + was in nautilus preferences), Network (replacing proxy + capplet), Power, Printers, Sound, System Information, User + Accounts. + + Rename Keyboard capplet to Region panel, and add language + selection there. + + Rename Keybinding capplet to Keyboard panel. + + Drop default applications capplet. + + Add various nice features here and there (support backgrounds + from Flickr, make it possible to configure the use of NTP, + etc.) +- Add cups-devel BuildRequires. +- Change pkgconfig() BuildRequires: + + add gdk-pixbuf-2.0, gsettings-desktop-schemas, iso-codes, + libsocialweb-client, polkit-gobject-1, gstreamer-0.10, + libgtop-2.0, libpulse, libpulse-mainloop-glib, upower-glib. + + change gnome-desktop-2.0 to gnome-desktop-3.0, gtk+-2.0 to + gtk+-3.0, libcanberra-gtk to libcanberra-gtk3 + + remove libebook-1.2, libmetacity-private, libslab, unique-1.0. +- Add iso-codes Requires. +- Add apg Recommends, needed for user accounts panel. +- Drop gnome-control-center-shell-common-tasks-i18n.patch and + gnome-control-center-use-settings-menu.patch: they were only + needed for the slab-based shell, which is gone. +- Drop gnome-control-center-bnc427745-force-dpi.patch: this was + needed to change font settings, but it's gone. +- Drop gnome-control-center-mime-scheme-handler.patch: defining + default apps is now handled differently. +- Use %glib2_gsettings_schema_* macros. +- Drop libgnome-window-settings1 and libgnome-window-settings-devel + subpackages, and instead add libgnome-control-center1. Add a + Requires for it to gnome-control-center-devel. +- Pass --with-libsocialweb to configure because we want to use + libsocialweb, and remove now non-existing --enable-aboutme + option. +- Add support for source service checkout, with %BUILD_FROM_VCS: + + Add call to ./autogen.sh. + + Do not call %suse_update_desktop_file in this case. + ------------------------------------------------------------------- Mon Feb 21 13:53:37 CET 2011 - vuntz@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 5aef1b5..708350b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -19,31 +19,39 @@ Name: gnome-control-center +BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel -BuildRequires: gnome-patch-translation BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(cheese-gtk) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-desktop-2.0) +BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gnome-settings-daemon) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libcanberra-gtk) -BuildRequires: pkgconfig(libebook-1.2) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgnomekbd) BuildRequires: pkgconfig(libgnomekbdui) BuildRequires: pkgconfig(libgnome-menu) -BuildRequires: pkgconfig(libmetacity-private) -BuildRequires: pkgconfig(libslab) +BuildRequires: pkgconfig(libnm-glib) >= 0.8.992 +BuildRequires: pkgconfig(libgtop-2.0) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-mainloop-glib) +BuildRequires: pkgconfig(libsocialweb-client) BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(unique-1.0) +BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) @@ -51,39 +59,46 @@ License: GPLv2+ Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.32.1 -Release: 9 +Version: 3.0.0.1 +Release: 1 Summary: The GNOME Control Center Source: %{name}-%{version}.tar.bz2 -# PATCH-FEATURE-OPENSUSE gnome-control-center-shell-common-tasks-i18n.patch vuntz@opensuse.org -- Translate favorite capplets in the code. This is needed for our gconf2-branding to really work for this setting, so keep in sync with gconf2-branding. -Patch0: gnome-control-center-shell-common-tasks-i18n.patch -# PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts. -Patch1: gnome-control-center-bnc427745-force-dpi.patch -# PATCH-FIX-UPSTREAM gnome-control-center-mime-scheme-handler.patch vuntz@opensuse.org -- Use x-scheme-handler/* mime types to set default web browser and mailer. Cherry-picked to gonme-2-32 branch from master/3.0 branch -Patch2: gnome-control-center-mime-scheme-handler.patch -# PATCH-FIX-OPENSUSE gnome-control-center-symlinked-background.patch vuntz@opensuse.org -- Do not show twice the configured background, if it is a symlink to a known background. This only applies to 2.32.x, and is not needed on 3.0, so there's no need to send it upstream -Patch3: gnome-control-center-symlinked-background.patch # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) Patch14: gnome-control-center-system-proxy-configuration.patch -# PATCH-FEATURE-OPENSUSE gnome-control-center-use-settings-menu.patch -Patch28: gnome-control-center-use-settings-menu.patch Url: http://www.gnome.org -Requires: nautilus gnome-settings-daemon gnome-menus +Requires: gnome-menus +Requires: gnome-settings-daemon +Requires: iso-codes +Requires: nautilus +# needed for /usr/bin/glxinfo, used by System info panel +Requires: freeglut Recommends: %{name}-lang +Recommends: apg Provides: control-center2 = 2.22.1 Obsoletes: control-center2 < 2.22.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%glib2_gsettings_schema_requires %gconf_schemas_prereq %description The control center is GNOME's main interface for configuration of various aspects of your desktop. +%package -n libgnome-control-center1 + +License: GPLv2+ +Summary: Shared library used by GNOME control center +Group: System/GUI/GNOME + +%description -n libgnome-control-center1 +Shared library used by GNOME control center + %package devel License: GPLv2+ Summary: Header files for the GNOME Control Center Group: System/GUI/GNOME Requires: %{name} = %{version} +Requires: libgnome-control-center1 = %{version} Provides: control-center2-devel = 2.22.1 Obsoletes: control-center2-devel < 2.22.1 @@ -91,77 +106,57 @@ Obsoletes: control-center2-devel < 2.22.1 The control center is GNOME's main interface for configuration of various aspects of your desktop. -%package -n libgnome-window-settings1 -License: GPLv2+ -Summary: Utility library for getting window manager settings -Group: Development/Libraries/GNOME -Group: Development/Libraries/GNOME -Recommends: %{name}-lang - -%description -n libgnome-window-settings1 -This library is used by the GNOME control center to change preferences -of window managers. - -%package -n libgnome-window-settings-devel -License: GPLv2+ -Summary: Utility library for getting window manager settings - Development Files -Group: Development/Libraries/GNOME -Requires: libgnome-window-settings1 = %{version} -Requires: gtk2-devel - -%description -n libgnome-window-settings-devel -This library is used by the GNOME control center to change preferences -of window managers. - %lang_package %prep %setup -q translation-update-upstream -gnome-patch-translation-prepare -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 #NEEDS-REBASE #%patch14 -p1 -%patch28 -gnome-patch-translation-update + +%if 0%{?BUILD_FROM_VCS} +[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh +%endif %build -autoreconf -f -i %configure --with-pic\ - --disable-static\ - --disable-scrollkeeper\ - --disable-update-mimedb\ - --enable-aboutme -make %{?jobs:-j%jobs} + --with-libsocialweb\ + --disable-static\ + --disable-scrollkeeper\ + --disable-maintainer-mode\ + --disable-update-mimedb +make %{?jobs:-j%jobs} V=1 %install %makeinstall %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif +# Drop no: we use either nb or nn +%{__rm} %{buildroot}%{_datadir}/locale/no/LC_MESSAGES/gnome-control-center-2.0-timezones.mo rm -f %{buildroot}%{_datadir}/applications/mimeinfo.cache find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}-2.0 %{?no_lang_C} +%find_lang %{name}-2.0-timezones %{name}-2.0.lang # help files %find_lang control-center %{?no_lang_C} %{name}-2.0.lang %find_gconf_schemas -%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings +%suse_update_desktop_file gnome-control-center # capplets -%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal -%suse_update_desktop_file default-applications X-SuSE-ControlCenter-Personal -%suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware -%suse_update_desktop_file gnome-about-me X-SuSE-ControlCenter-Personal -%suse_update_desktop_file gnome-network-properties X-SuSE-ControlCenter-Hardware -%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware -%suse_update_desktop_file gnome-appearance-properties X-SuSE-ControlCenter-LookAndFeel -%suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal -%suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware -%suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel -%suse_update_desktop_file gnome-at-session -%suse_update_desktop_file gnome-font-viewer -%suse_update_desktop_file gnome-theme-installer +%suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal +%suse_update_desktop_file gnome-info-panel X-SuSE-ControlCenter-Personal +%suse_update_desktop_file gnome-display-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal +%suse_update_desktop_file gnome-network-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-mouse-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-background-panel X-SuSE-ControlCenter-LookAndFeel +%suse_update_desktop_file gnome-region-panel X-SuSE-ControlCenter-Personal +%suse_update_desktop_file gnome-keyboard-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-datetime-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-media-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-power-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-printers-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-screen-panel X-SuSE-ControlCenter-LookAndFeel %fdupes $RPM_BUILD_ROOT %clean @@ -170,6 +165,7 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %mime_database_post @@ -179,13 +175,14 @@ rm -rf $RPM_BUILD_ROOT %preun -f %{name}.schemas_preun %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %mime_database_postun -%post -n libgnome-window-settings1 -p /sbin/ldconfig +%post -n libgnome-control-center1 -p /sbin/ldconfig -%postun -n libgnome-window-settings1 -p /sbin/ldconfig +%postun -n libgnome-control-center1 -p /sbin/ldconfig %files -f %{name}.schemas_list %defattr(-,root,root) @@ -197,36 +194,33 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/omf/ %dir %{_datadir}/omf/control-center/ %doc %{_datadir}/omf/control-center/control-center-C.omf -%{_sbindir}/gnome-display-properties-install-systemwide %{_bindir}/* %{_sysconfdir}/xdg/autostart/*.desktop +%{_libdir}/control-center-1/ %{_datadir}/applications/*.desktop %{_datadir}/desktop-directories/*.directory -%{_datadir}/gnome/cursor-fonts -%{_datadir}/gnome-control-center +%{_datadir}/gnome-control-center/ +%{_datadir}/pixmaps/faces %{_datadir}/icons/hicolor/*/*/*.png -%{_datadir}/icons/hicolor/scalable/apps/*.svg -%{_datadir}/mime/packages/*.xml -%{_datadir}/polkit-1/actions/org.gnome.randr.policy +%{_datadir}/icons/hicolor/*/*/*.svg +%{_datadir}/icons/hicolor/scalable/*/*.svg +%dir %{_datadir}/sounds/gnome +%dir %{_datadir}/sounds/gnome/default +%dir %{_datadir}/sounds/gnome/default/alerts +%{_datadir}/sounds/gnome/default/alerts/*.ogg %{_sysconfdir}/xdg/menus/gnomecc.menu %files lang -f %{name}-2.0.lang +%files -n libgnome-control-center1 +%defattr (-, root, root) +%{_libdir}/libgnome-control-center.so.1* + %files devel %defattr (-, root, root) -%{_datadir}/pkgconfig/gnome-default-applications.pc %{_datadir}/pkgconfig/gnome-keybindings.pc - -%files -n libgnome-window-settings1 -%defattr (-, root, root) -%dir %{_libdir}/window-manager-settings -%{_libdir}/window-manager-settings/libmetacity.so -%{_libdir}/libgnome-window-settings.so.* - -%files -n libgnome-window-settings-devel -%defattr (-, root, root) -%{_includedir}/gnome-window-settings-2.0 -%{_libdir}/libgnome-window-settings.so -%{_libdir}/pkgconfig/gnome-window-settings-2.0.pc +%{_libdir}/pkgconfig/libgnome-control-center.pc +%{_includedir}/gnome-control-center-1/ +%{_libdir}/*.so %changelog