Hello community, here is the log from the commit of package control-center2 checked in at Tue May 22 15:05:08 CEST 2007. -------- --- GNOME/control-center2/control-center2.changes 2007-05-17 10:19:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes 2007-05-22 12:20:11.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 22 12:20:06 CEST 2007 - sbrabec@suse.cz + +- Removed X-SuSE tag from the upstream desktop file. +- Added MIME based default option for default applications FTP + preferences (GNOME#426638#c13). + +------------------------------------------------------------------- New: ---- control-center-no-x-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.kZ7573/_old 2007-05-22 15:04:50.000000000 +0200 +++ /var/tmp/diff_new_pack.kZ7573/_new 2007-05-22 15:04:50.000000000 +0200 @@ -18,7 +18,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.18.0 -Release: 25 +Release: 26 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -45,6 +45,7 @@ Patch26: control-center2-static-libslab.patch Patch27: control-center2-shell-schemas.patch Patch28: control-center2-use-preferences-menu.patch +Patch29: control-center-no-x-suse.patch Patch100: control-center2-po-update.patch URL: http://www.gnome.org Requires: nautilus @@ -113,6 +114,7 @@ %patch26 %patch27 -p1 %patch28 +%patch29 gnome-patch-translation-update %build @@ -235,6 +237,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue May 22 2007 - sbrabec@suse.cz +- Removed X-SuSE tag from the upstream desktop file. +- Added MIME based default option for default applications FTP + preferences (GNOME#426638#c13). * Thu May 17 2007 - rodrigo@suse.de - Look for gnome-passwd.glade file in the correct dir (#272702) * Mon May 14 2007 - maw@suse.de ++++++ control-center-default-applications-ftp+news.patch ++++++ --- /var/tmp/diff_new_pack.kZ7573/_old 2007-05-22 15:04:51.000000000 +0200 +++ /var/tmp/diff_new_pack.kZ7573/_new 2007-05-22 15:04:51.000000000 +0200 @@ -1,3 +1,5 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=426638 +================================================================================ --- capplets/default-applications/gnome-da-capplet.c +++ capplets/default-applications/gnome-da-capplet.c @@ -63,9 +63,15 @@ @@ -32,7 +34,7 @@ if (error != NULL) { g_warning (_("Error saving configuration: %s"), error->message); -@@ -217,6 +229,79 @@ +@@ -217,6 +229,97 @@ } static void @@ -56,11 +58,7 @@ + if (current_index == 0) { + is_custom_active = FALSE; + cs = gconf_change_set_new (); -+ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL); -+ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, ftp_cmd); -+ g_free (ftp_cmd); -+ ftp_term = gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL); -+ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, ftp_term); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_ENABLED, FALSE); + + gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); + @@ -69,17 +67,18 @@ + g_error_free (error); + error = NULL; + } -+ } -+ else { -+ current_index--; -+ if (current_index < g_list_length (capplet->ftp_clients)) { -+ item = (GnomeDAFtpItem*) g_list_nth_data (capplet->ftp_clients, current_index); -+ is_custom_active = FALSE; ++ ftp_cmd = g_strdup (""); + ++ } else { ++ if (current_index == 1) { ++ is_custom_active = FALSE; + cs = gconf_change_set_new (); -+ -+ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, item->generic.command); -+ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, item->run_in_terminal); ++ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, ftp_cmd); ++ g_free (ftp_cmd); ++ ftp_term = gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, ftp_term); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_ENABLED, TRUE); + + gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); + @@ -88,16 +87,37 @@ + g_error_free (error); + error = NULL; + } -+ -+ gconf_change_set_unref (cs); + } + else { -+ is_custom_active = TRUE; ++ current_index -= 2; ++ if (current_index < g_list_length (capplet->ftp_clients)) { ++ item = (GnomeDAFtpItem*) g_list_nth_data (capplet->ftp_clients, current_index); ++ is_custom_active = FALSE; ++ ++ cs = gconf_change_set_new (); ++ ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, item->generic.command); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, item->run_in_terminal); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_ENABLED, TRUE); ++ ++ gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); ++ ++ if (error != NULL) { ++ g_warning (_("Error saving configuration: %s"), error->message); ++ g_error_free (error); ++ error = NULL; ++ } ++ ++ gconf_change_set_unref (cs); ++ } ++ else { ++ is_custom_active = TRUE; ++ } ++ + } ++ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); + + } -+ -+ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); + gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), ftp_cmd); + g_free (ftp_cmd); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->ftp_client_terminal_checkbutton), @@ -112,7 +132,7 @@ mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) { GtkTreeIter iter; -@@ -268,6 +353,57 @@ +@@ -268,6 +371,57 @@ } static void @@ -170,7 +190,7 @@ terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) { GtkTreeIter iter; -@@ -351,7 +487,9 @@ +@@ -351,7 +505,9 @@ const gchar *icon; } icons[] = { { "web_browser_image", "web-browser" }, @@ -180,7 +200,7 @@ /* { "messenger_image", "im" }, * { "image_image", "image-viewer" }, * { "sound_image", "gnome-audio" }, -@@ -372,7 +510,9 @@ +@@ -372,7 +528,9 @@ } refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); @@ -190,7 +210,7 @@ refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); } -@@ -496,6 +636,42 @@ +@@ -496,6 +654,46 @@ } static void @@ -200,26 +220,30 @@ + gint index; + gboolean is_custom_active; + -+ if (!strcmp (command, gtk_entry_get_text (GTK_ENTRY (capplet->web_browser_command_entry)))) { -+ is_custom_active = FALSE; ++ if (!command) { + index = 0; ++ is_custom_active = FALSE; ++ } ++ else if (!strcmp (command, gtk_entry_get_text (GTK_ENTRY (capplet->web_browser_command_entry)))) { ++ is_custom_active = FALSE; ++ index = 1; + } + else { + + entry = g_list_find_custom (capplet->ftp_clients, command, (GCompareFunc) generic_item_comp); + + if (entry) { -+ index = g_list_position (capplet->ftp_clients, entry) + 1; ++ index = g_list_position (capplet->ftp_clients, entry) + 2; + is_custom_active = FALSE; + } + else { + /* index of 'Custom' combo box entry */ -+ index = g_list_length (capplet->ftp_clients) + 2; ++ index = g_list_length (capplet->ftp_clients) + 3; + is_custom_active = TRUE; + } + } + -+ gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), command); ++ gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), (command ? command : "")); + + gtk_editable_set_editable (GTK_EDITABLE (capplet->ftp_client_command_entry), is_custom_active); + gtk_widget_set_sensitive (capplet->ftp_client_command_label, is_custom_active); @@ -233,7 +257,7 @@ mail_reader_update_combo_box (GnomeDACapplet *capplet, const gchar *command) { GList *entry; -@@ -525,6 +701,35 @@ +@@ -525,6 +723,35 @@ } static void @@ -269,7 +293,7 @@ terminal_update_combo_box (GnomeDACapplet *capplet, const gchar *command) { GList *entry; -@@ -562,11 +767,20 @@ +@@ -562,11 +789,20 @@ GError *error = NULL; GList *list_entry; @@ -290,27 +314,27 @@ if (strcmp (entry->key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) { gchar *short_browser, *pos; const gchar *value_str = gconf_value_get_string (value); -@@ -579,6 +793,9 @@ +@@ -579,6 +815,9 @@ 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); -+ if (current_index == 0) { ++ if (current_index == 1) { + gconf_change_set_set (cs, DEFAULT_APPS_KEY_FTP_EXEC, value); + } pos = strstr (value_str, " "); if (pos == NULL) short_browser = g_strdup (value_str); -@@ -618,6 +835,9 @@ +@@ -618,6 +857,9 @@ 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); -+ if (current_index == 0) { ++ if (current_index == 1) { + gconf_change_set_set (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, value); + } gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -@@ -632,6 +852,26 @@ +@@ -632,6 +874,35 @@ } static void @@ -323,8 +347,17 @@ + if (!(value = gconf_entry_get_value (entry))) + return; + ++ if (strcmp (entry->key, DEFAULT_APPS_KEY_FTP_ENABLED) == 0) { ++ if (gconf_value_get_bool (value)) ++ ftp_client_update_combo_box (capplet, gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL)); ++ else ++ ftp_client_update_combo_box (capplet, NULL); ++ } + if (strcmp (entry->key, DEFAULT_APPS_KEY_FTP_EXEC) == 0) { -+ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); ++ if (gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_FTP_ENABLED, NULL)) ++ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); ++ else ++ ftp_client_update_combo_box (capplet, NULL); + } + /* TODO: Remove when GConfPropertyEditor will be used */ + else if (strcmp (entry->key, DEFAULT_APPS_KEY_FTP_NEEDS_TERM) == 0) { @@ -337,7 +370,7 @@ mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet) { GConfValue *value; -@@ -652,6 +892,26 @@ +@@ -652,6 +923,26 @@ } static void @@ -364,7 +397,7 @@ term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet) { GConfValue *value; -@@ -685,7 +945,7 @@ +@@ -685,7 +976,7 @@ } static void @@ -373,7 +406,7 @@ { GList *entry; GtkTreeModel *model; -@@ -697,8 +957,13 @@ +@@ -697,8 +988,13 @@ theme = gtk_icon_theme_get_default (); } @@ -382,18 +415,26 @@ + if (ftp) + /* FIXME: Add one another separator between Default web browser and list. */ + gtk_combo_box_set_row_separator_func (combo_box, is_separator, -+ GINT_TO_POINTER (g_list_length (app_list)+1), NULL); ++ GINT_TO_POINTER (g_list_length (app_list)+2), NULL); + else + 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); -@@ -718,6 +983,17 @@ +@@ -718,6 +1014,25 @@ "text", TEXT_COL, NULL); + if (ftp) { ++ pixbuf = gtk_icon_theme_load_icon (theme, "stock_autocompletion", 22, 0, NULL); ++ gtk_list_store_append (GTK_LIST_STORE (model), &iter); ++ gtk_list_store_set (GTK_LIST_STORE (model), &iter, ++ PIXBUF_COL, pixbuf, ++ TEXT_COL, _("File type based"), ++ -1); ++ if (pixbuf) ++ g_object_unref (pixbuf); + pixbuf = gtk_icon_theme_load_icon (theme, "web-browser", 22, 0, NULL); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -407,7 +448,7 @@ for (entry = app_list; entry != NULL; entry = g_list_next (entry)) { GnomeDAItem *item; item = (GnomeDAItem *) entry->data; -@@ -781,25 +1057,37 @@ +@@ -781,25 +1096,37 @@ capplet->new_win_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_win_radiobutton"); capplet->new_tab_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_tab_radiobutton"); @@ -448,29 +489,35 @@ /* update ui to gconf content */ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL); -@@ -818,6 +1106,21 @@ +@@ -818,6 +1145,27 @@ gconf_value_free (value); } -+ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); -+ if (value) ++ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_ENABLED, NULL); ++ if (gconf_value_get_bool (value)) + { -+ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); -+ gconf_value_free (value); -+ } ++ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); ++ if (value) ++ { ++ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); ++ gconf_value_free (value); ++ } + -+ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, NULL); -+ if (value) -+ { -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->ftp_client_terminal_checkbutton), -+ gconf_value_get_bool (value)); -+ gconf_value_free (value); ++ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, NULL); ++ if (value) ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->ftp_client_terminal_checkbutton), ++ gconf_value_get_bool (value)); ++ gconf_value_free (value); ++ } + } ++ else ++ ftp_client_update_combo_box (capplet, NULL); + value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MAILER_EXEC, NULL); if (value) { -@@ -833,6 +1136,21 @@ +@@ -833,6 +1181,21 @@ gconf_value_free (value); } @@ -492,7 +539,7 @@ if (value) { value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL); -@@ -849,18 +1167,26 @@ +@@ -849,18 +1212,26 @@ } g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); @@ -519,7 +566,7 @@ g_signal_connect (capplet->terminal_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet); g_signal_connect (capplet->terminal_exec_flag_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet); -@@ -903,9 +1229,15 @@ +@@ -903,9 +1274,15 @@ gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_HTTP_PATH, (GConfClientNotifyFunc) web_gconf_changed_cb, capplet, NULL, NULL); @@ -537,13 +584,14 @@ capplet, NULL, NULL); --- capplets/default-applications/gnome-da-capplet.h +++ capplets/default-applications/gnome-da-capplet.h -@@ -45,10 +45,18 @@ +@@ -45,10 +45,19 @@ #define DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM DEFAULT_APPS_KEY_ABOUT_PATH"/needs_terminal" #define DEFAULT_APPS_KEY_ABOUT_EXEC DEFAULT_APPS_KEY_ABOUT_PATH"/command" +#define DEFAULT_APPS_KEY_FTP_PATH "/desktop/gnome/url-handlers/ftp" +#define DEFAULT_APPS_KEY_FTP_NEEDS_TERM DEFAULT_APPS_KEY_FTP_PATH"/needs_terminal" +#define DEFAULT_APPS_KEY_FTP_EXEC DEFAULT_APPS_KEY_FTP_PATH"/command" ++#define DEFAULT_APPS_KEY_FTP_ENABLED DEFAULT_APPS_KEY_FTP_PATH"/enabled" + #define DEFAULT_APPS_KEY_MAILER_PATH "/desktop/gnome/url-handlers/mailto" #define DEFAULT_APPS_KEY_MAILER_NEEDS_TERM DEFAULT_APPS_KEY_MAILER_PATH"/needs_terminal" @@ -556,7 +604,7 @@ #define DEFAULT_APPS_KEY_BROWSER_PATH "/desktop/gnome/applications/browser" #define DEFAULT_APPS_KEY_BROWSER_EXEC DEFAULT_APPS_KEY_BROWSER_PATH"/exec" #define DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM DEFAULT_APPS_KEY_BROWSER_PATH"/needs_term" -@@ -68,7 +76,9 @@ +@@ -68,7 +77,9 @@ GtkWidget *window; GtkWidget *web_combo_box; @@ -566,7 +614,7 @@ GtkWidget *term_combo_box; GtkWidget *web_browser_command_entry; -@@ -78,10 +88,18 @@ +@@ -78,10 +89,18 @@ GtkWidget *new_win_radiobutton; GtkWidget *new_tab_radiobutton; @@ -585,7 +633,7 @@ GtkWidget *terminal_command_entry; GtkWidget *terminal_command_label; GtkWidget *terminal_exec_flag_entry; -@@ -90,7 +108,9 @@ +@@ -90,7 +109,9 @@ GConfClient *gconf; GList *web_browsers; ++++++ control-center-no-x-suse.patch ++++++ --- shell/gnomecc.desktop.in.in +++ shell/gnomecc.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Encoding=UTF-8 _Name=Control Center _GenericName=The GNOME configuration tool ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org