Dinoop Thomas <
[email protected]>
* control-center.spec: Update
* patches/control-center-36-https-default-browser.diff: Added patch to make
default browser change effective for https also.
Fixes bug #6262124.
Patch is backported from cvs head. Bugzilla #123487.
--- control-center-2.6.1/capplets/default-applications/gnome-default-applications-properties.c 2005-04-28 11:51:24.000000000 +0530
+++ control-center-2.6.1-new/capplets/default-applications/gnome-default-applications-properties.c 2005-04-28 21:22:56.919851192 +0530
@@ -40,9 +40,13 @@
#include "gconf-property-editor.h"
-#define DEFAULT_APPS_KEY_BROWSER_PATH "/desktop/gnome/url-handlers/http"
-#define DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM DEFAULT_APPS_KEY_BROWSER_PATH"/needs_terminal"
-#define DEFAULT_APPS_KEY_BROWSER_EXEC DEFAULT_APPS_KEY_BROWSER_PATH"/command"
+#define DEFAULT_APPS_KEY_HTTP_PATH "/desktop/gnome/url-handlers/http"
+#define DEFAULT_APPS_KEY_HTTP_NEEDS_TERM DEFAULT_APPS_KEY_HTTP_PATH"/needs_terminal"
+#define DEFAULT_APPS_KEY_HTTP_EXEC DEFAULT_APPS_KEY_HTTP_PATH"/command"
+
+#define DEFAULT_APPS_KEY_HTTPS_PATH "/desktop/gnome/url-handlers/https"
+#define DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM DEFAULT_APPS_KEY_HTTPS_PATH"/needs_terminal"
+#define DEFAULT_APPS_KEY_HTTPS_EXEC DEFAULT_APPS_KEY_HTTPS_PATH"/command"
#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"
@@ -379,9 +383,14 @@ setup_peditors (GConfClient *client,
{
GConfChangeSet *changeset = NULL;
- gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM,
+ gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM,
WID ("web_custom_terminal_toggle"), NULL);
- gconf_peditor_new_string (changeset, DEFAULT_APPS_KEY_BROWSER_EXEC,
+ gconf_peditor_new_string (changeset, DEFAULT_APPS_KEY_HTTP_EXEC,
+ WID ("web_custom_command_entry"), NULL);
+
+ gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM,
+ WID ("web_custom_terminal_toggle"), NULL);
+ gconf_peditor_new_string (changeset, DEFAULT_APPS_KEY_HTTPS_EXEC,
WID ("web_custom_command_entry"), NULL);
gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM,
@@ -404,12 +413,12 @@ read_browser (GConfClient *client,
gboolean needs_term;
gint i;
- needs_term = gconf_client_get_bool (client, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, &error);
+ needs_term = gconf_client_get_bool (client, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, &error);
if (error) {
/* hp will shoot me -- I'll do this later. */
return;
}
- browser = gconf_client_get_string (client, DEFAULT_APPS_KEY_BROWSER_EXEC, &error);
+ browser = gconf_client_get_string (client, DEFAULT_APPS_KEY_HTTP_EXEC, &error);
if (error) {
return;
}
@@ -578,7 +587,7 @@ value_changed_cb (GConfClient *client,
g_return_if_fail (key != NULL);
if (strncmp (key, DEFAULT_APPS_KEY_MAILER_PATH, strlen (DEFAULT_APPS_KEY_MAILER_PATH)) == 0) {
gconf_client_set_bool (client, DEFAULT_APPS_KEY_MAILER_PATH"/enabled", TRUE, NULL);
- } else if (strncmp (key, DEFAULT_APPS_KEY_BROWSER_PATH, strlen (DEFAULT_APPS_KEY_BROWSER_PATH)) == 0) {
+ } else if (strncmp (key, DEFAULT_APPS_KEY_HTTP_PATH, strlen (DEFAULT_APPS_KEY_HTTP_PATH)) == 0) {
} else if (strncmp (key, DEFAULT_APPS_KEY_TERMINAL_PATH, strlen (DEFAULT_APPS_KEY_TERMINAL_PATH)) == 0) {
}
}