Mercurial > pidgin.yaz
changeset 30991:41c3ae96f398
Make the "Manual" browser setting's command be stored as a string instead of as
a path. Storing it as a path requires specifying the full path to the command
when just the command name would suffice. Fixes #12024.
committer: John Bailey <rekkanoryo@rekkanoryo.org>
author | rtobar@csrg.inf.utfsm.cl |
---|---|
date | Sat, 18 Sep 2010 15:54:17 +0000 |
parents | 00455fe8c574 |
children | 55fb3dfd086b |
files | pidgin/gtknotify.c pidgin/gtkprefs.c |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtknotify.c Sat Sep 18 02:01:29 2010 +0000 +++ b/pidgin/gtknotify.c Sat Sep 18 15:54:17 2010 +0000 @@ -1392,7 +1392,7 @@ { const char *web_command; - web_command = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command"); + web_command = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/command"); if (web_command == NULL || *web_command == '\0') {
--- a/pidgin/gtkprefs.c Sat Sep 18 02:01:29 2010 +0000 +++ b/pidgin/gtkprefs.c Sat Sep 18 15:54:17 2010 +0000 @@ -1811,7 +1811,7 @@ { const char *program = gtk_entry_get_text(GTK_ENTRY(entry)); - purple_prefs_set_path(PIDGIN_PREFS_ROOT "/browsers/command", program); + purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/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_path(PIDGIN_PREFS_ROOT "/browsers/command")); + purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/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); @@ -2828,7 +2828,7 @@ /* Browsers */ purple_prefs_add_none(PIDGIN_PREFS_ROOT "/browsers"); purple_prefs_add_int(PIDGIN_PREFS_ROOT "/browsers/place", PIDGIN_BROWSER_DEFAULT); - purple_prefs_add_path(PIDGIN_PREFS_ROOT "/browsers/command", ""); + purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/command", ""); purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "mozilla"); #endif