From 3a0df15aee29151ab14615c9f311e7828331b46a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Jan 20 2009 11:13:40 +0000
Subject: - Set HTTPS handler correctly when changing default browser (#480707)


---

diff --git a/control-center.spec b/control-center.spec
index b00e6b6..69aa6f3 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -41,6 +41,9 @@ Patch9: gcc-set-sound-theme-dir.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=466342
 Patch10: gcc-sound-props-remove-oss.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=568408
+Patch11: gcc-set-https-handler.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -189,6 +192,7 @@ utilities.
 %patch8 -p1 -b .gtkmarshal
 %patch9 -p0 -b .default-dir
 %patch10 -p0 -b .no-oss
+%patch11 -p0 -b .set-https
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch28 -p1 -b .capplet-help
@@ -366,6 +370,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera@redhat.com> - 2.24.0.1-12
+- Set HTTPS handler correctly when changing default browser (#480707)
+
 * Sat Jan 17 2009 Matthias Clasen <mclasen@redhat.com> - 2.24.0.1-11
 - Make notification theme setting work better 
 
diff --git a/gcc-set-https-handler.patch b/gcc-set-https-handler.patch
new file mode 100644
index 0000000..95ee9b7
--- /dev/null
+++ b/gcc-set-https-handler.patch
@@ -0,0 +1,30 @@
+Index: capplets/default-applications/gnome-da-capplet.c
+===================================================================
+--- capplets/default-applications/gnome-da-capplet.c	(revision 9201)
++++ capplets/default-applications/gnome-da-capplet.c	(working copy)
+@@ -90,6 +90,8 @@
+ 
+     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);
+@@ -124,6 +126,8 @@
+     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);
++
++    web_radiobutton_toggled_cb (NULL, capplet);
+ }
+ 
+ /* FIXME: Refactor these two functions below into one... */
+@@ -450,6 +454,7 @@
+ 
+     ret = gconf_value_new (GCONF_VALUE_INT);
+     gconf_value_set_int (ret, index);
++
+     return ret;
+ }
+