# HG changeset patch # User John Bailey # Date 1284997152 0 # Node ID 70d8e2e715528c0da3450b27a05b64c23cdac460 # Parent f1a80dd255cba6335223c6b90568e0ddb7120869 I thought I had done this in my last commit. Clearly I'm an idiot. This fixes all the references to the browser command pref to use the new pref name that I created. Refs #12024. diff -r f1a80dd255cb -r 70d8e2e71552 pidgin/gtknotify.c --- a/pidgin/gtknotify.c Mon Sep 20 03:55:18 2010 +0000 +++ b/pidgin/gtknotify.c Mon Sep 20 15:39:12 2010 +0000 @@ -1392,7 +1392,7 @@ { const char *web_command; - web_command = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/command"); + web_command = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command"); if (web_command == NULL || *web_command == '\0') { diff -r f1a80dd255cb -r 70d8e2e71552 pidgin/gtkprefs.c --- a/pidgin/gtkprefs.c Mon Sep 20 03:55:18 2010 +0000 +++ b/pidgin/gtkprefs.c Mon Sep 20 15:39:12 2010 +0000 @@ -1811,7 +1811,7 @@ { const char *program = gtk_entry_get_text(GTK_ENTRY(entry)); - purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/command", program); + purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", program); /* carry on normally */ return FALSE; @@ -1968,7 +1968,7 @@ entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(entry), - purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/command")); + purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command")); g_signal_connect(G_OBJECT(entry), "focus-out-event", G_CALLBACK(manual_browser_set), NULL); hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL);