pidgin: e070fe0f: Make the "Manual" browser setting's comm...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: e070fe0fbc8e56012bfe41e12b678b6b1a2597fb
Parent:   0149327168b6f5f7ad69ae18066afccf126b4124
Author:   rtobar at csrg.inf.utfsm.cl
Date:     09/18/10 11:54:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e070fe0fbc8e56012bfe41e12b678b6b1a2597fb

Changelog: 

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.

Changes against parent 0149327168b6f5f7ad69ae18066afccf126b4124

  patched  pidgin/gtknotify.c
  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- pidgin/gtknotify.c	30a3cf47f47f8ca12060d7d435ce08204742499f
+++ pidgin/gtknotify.c	d5b4244a33fe352443699bbaef9a9984696e547d
@@ -1392,7 +1392,7 @@ pidgin_notify_uri(const char *uri)
 	{
 		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')
 		{
============================================================
--- pidgin/gtkprefs.c	72cc171962e19b76bdb120156cce915b018557d1
+++ pidgin/gtkprefs.c	d1946e5cf2c72b625a7a0c8864d8493f6ed1df83
@@ -1811,7 +1811,7 @@ manual_browser_set(GtkWidget *entry, Gdk
 {
 	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 @@ browser_page(void)
 
 		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 @@ pidgin_prefs_init(void)
 	/* 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