? compile
? diff
? capplets/default-applications/gnome-default-applications.xml
? m4/intltool.m4
? po/stamp-it
Index: capplets/default-applications/gnome-da-capplet.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-capplet.c,v
retrieving revision 1.13
diff -u -b -p -r1.13 gnome-da-capplet.c
--- capplets/default-applications/gnome-da-capplet.c	9 May 2006 20:44:41 -0000	1.13
+++ capplets/default-applications/gnome-da-capplet.c	8 Oct 2006 17:29:53 -0000
@@ -561,6 +561,7 @@ web_gconf_changed_cb (GConfClient *clien
 	return;
 
     if (strcmp (entry->key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
+	gchar* short_browser;
 	web_browser_update_combo_box (capplet, gconf_value_get_string (value));
 	web_browser_update_radio_buttons (capplet, gconf_value_get_string (value));
 
@@ -569,6 +570,11 @@ web_gconf_changed_cb (GConfClient *clien
 	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);
+	short_browser = g_strndup(gconf_value_get_string(value),
+				  strstr(gconf_value_get_string(value), "%s") -
+				  gconf_value_get_string(value));
+	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser);
+	g_free(short_browser);
 
 	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
 
@@ -590,6 +596,7 @@ web_gconf_changed_cb (GConfClient *clien
 	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);
 
Index: capplets/default-applications/gnome-da-capplet.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-capplet.h,v
retrieving revision 1.2
diff -u -b -p -r1.2 gnome-da-capplet.h
--- capplets/default-applications/gnome-da-capplet.h	28 Feb 2006 21:02:55 -0000	1.2
+++ capplets/default-applications/gnome-da-capplet.h	8 Oct 2006 17:29:53 -0000
@@ -49,6 +49,10 @@
 #define DEFAULT_APPS_KEY_MAILER_NEEDS_TERM DEFAULT_APPS_KEY_MAILER_PATH"/needs_terminal"
 #define DEFAULT_APPS_KEY_MAILER_EXEC       DEFAULT_APPS_KEY_MAILER_PATH"/command"
 
+#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"
+
 #define DEFAULT_APPS_KEY_TERMINAL_PATH     "/desktop/gnome/applications/terminal"
 #define DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG DEFAULT_APPS_KEY_TERMINAL_PATH"/exec_arg"
 #define DEFAULT_APPS_KEY_TERMINAL_EXEC     DEFAULT_APPS_KEY_TERMINAL_PATH"/exec"
