Mercurial > pidgin3 / changeset

--- a/libpurple/prefs.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/prefs.c	Fri Jan 17 21:45:33 2014 +0530
@@ -1389,7 +1389,7 @@
 	purple_prefs_add_none("/plugins");
 	purple_prefs_add_none("/plugins/core");
 	purple_prefs_add_none("/plugins/lopl");
-	purple_prefs_add_none("/plugins/prpl");
+	purple_prefs_add_none("/protocols");
 
 	/* Away */
 	purple_prefs_add_none("/purple/away");

--- a/libpurple/protocols/gg/gg.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/gg/gg.c	Fri Jan 17 21:45:33 2014 +0530
@@ -1193,7 +1193,7 @@
 	if (!my_protocol)
 		return FALSE;
 
-	purple_prefs_add_none("/plugins/prpl/gg");
+	purple_prefs_add_none("/protocols/gg");
 
 	purple_debug_info("gg", "Loading Gadu-Gadu protocol plugin with "
 		"libgadu %s...\n", gg_libgadu_version());

--- a/libpurple/protocols/gg/servconn.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/gg/servconn.c	Fri Jan 17 21:45:33 2014 +0530
@@ -34,7 +34,7 @@
 #include <debug.h>
 #include <glibcompat.h>
 
-#define GGP_SERVCONN_HISTORY_PREF "/plugins/prpl/gg/server_history"
+#define GGP_SERVCONN_HISTORY_PREF "/protocols/gg/server_history"
 #define GGP_SERVCONN_HISTORY_MAXLEN 15
 
 typedef struct

--- a/libpurple/protocols/irc/irc.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/irc/irc.c	Fri Jan 17 21:45:33 2014 +0530
@@ -1083,8 +1083,8 @@
 	if (!_irc_protocol)
 		return FALSE;
 
-	purple_prefs_remove("/plugins/prpl/irc/quitmsg");
-	purple_prefs_remove("/plugins/prpl/irc");
+	purple_prefs_remove("/protocols/irc/quitmsg");
+	purple_prefs_remove("/protocols/irc");
 
 	irc_register_commands();
 

--- a/libpurple/protocols/jabber/iq.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/jabber/iq.c	Fri Jan 17 21:45:33 2014 +0530
@@ -225,7 +225,7 @@
 		const char *ui_name = NULL, *ui_version = NULL;
 #if 0
 		char *os = NULL;
-		if(!purple_prefs_get_bool("/plugins/prpl/jabber/hide_os")) {
+		if(!purple_prefs_get_bool("/protocols/jabber/hide_os")) {
 			struct utsname osinfo;
 
 			uname(&osinfo);

--- a/libpurple/protocols/jabber/xmpp.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/jabber/xmpp.c	Fri Jan 17 21:45:33 2014 +0530
@@ -99,7 +99,7 @@
 	protocol->protocol_options = g_list_append(protocol->protocol_options,
 		option);
 
-	purple_prefs_remove("/plugins/prpl/jabber");
+	purple_prefs_remove("/protocols/jabber");
 }
 
 static void

--- a/libpurple/protocols/msn/msn.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/msn/msn.c	Fri Jan 17 21:45:33 2014 +0530
@@ -3071,7 +3071,7 @@
 	                  _("nudge: nudge a user to get their attention"), NULL);
 	cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id));
 
-	purple_prefs_remove("/plugins/prpl/msn");
+	purple_prefs_remove("/protocols/msn");
 
 	msn_notification_init();
 	msn_switchboard_init();

--- a/libpurple/protocols/oscar/oscar.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/oscar/oscar.c	Fri Jan 17 21:45:33 2014 +0530
@@ -751,7 +751,7 @@
 
 	/* Connect to core Purple signals */
 	purple_prefs_connect_callback(purple_connection_get_protocol(gc), "/purple/away/idle_reporting", idle_reporting_pref_cb, gc);
-	purple_prefs_connect_callback(purple_connection_get_protocol(gc), "/plugins/prpl/oscar/recent_buddies", recent_buddies_pref_cb, gc);
+	purple_prefs_connect_callback(purple_connection_get_protocol(gc), "/protocols/oscar/recent_buddies", recent_buddies_pref_cb, gc);
 
 	/*
 	 * On 2008-03-05 AOL released some documentation on the OSCAR protocol
@@ -5736,11 +5736,11 @@
 		PURPLE_CALLBACK(oscar_uri_handler), NULL);
 
 	/* Preferences */
-	purple_prefs_add_none("/plugins/prpl/oscar");
-	purple_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
-
-	purple_prefs_remove("/plugins/prpl/oscar/show_idle");
-	purple_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
+	purple_prefs_add_none("/protocols/oscar");
+	purple_prefs_add_bool("/protocols/oscar/recent_buddies", FALSE);
+
+	purple_prefs_remove("/protocols/oscar/show_idle");
+	purple_prefs_remove("/protocols/oscar/always_use_rv_proxy");
 
 	return TRUE;
 }

--- a/libpurple/protocols/sametime/sametime.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/sametime/sametime.c	Fri Jan 17 21:45:33 2014 +0530
@@ -86,7 +86,7 @@
 
 
 /* plugin preference names */
-#define MW_PROTOCOL_OPT_BASE          "/plugins/prpl/meanwhile"
+#define MW_PROTOCOL_OPT_BASE          "/protocols/meanwhile"
 #define MW_PROTOCOL_OPT_BLIST_ACTION  MW_PROTOCOL_OPT_BASE "/blist_action"
 #define MW_PROTOCOL_OPT_PSYCHIC       MW_PROTOCOL_OPT_BASE "/psychic"
 #define MW_PROTOCOL_OPT_FORCE_LOGIN   MW_PROTOCOL_OPT_BASE "/force_login"

--- a/libpurple/protocols/silc/silc.c	Fri Jan 17 18:22:02 2014 +0530
+++ b/libpurple/protocols/silc/silc.c	Fri Jan 17 21:45:33 2014 +0530
@@ -2336,7 +2336,7 @@
 	if (!my_protocol)
 		return FALSE;
 
-	purple_prefs_remove("/plugins/prpl/silc");
+	purple_prefs_remove("/protocols/silc");
 
 	silc_log_set_callback(SILC_LOG_ERROR, silcpurple_log_error, NULL);
 	silcpurple_register_commands();

--- a/pidgin/pidgin.h	Fri Jan 17 18:22:02 2014 +0530
+++ b/pidgin/pidgin.h	Fri Jan 17 21:45:33 2014 +0530
@@ -36,8 +36,7 @@
 /**
  * Our UI's identifier.
  */
-/* leave this as gtk-gaim until we have a decent way to migrate UI-prefs */
-#define PIDGIN_UI "gtk-gaim"
+#define PIDGIN_UI "gtk-pidgin"
 
 /* change this only when we have a sane upgrade path for old prefs */
 #define PIDGIN_PREFS_ROOT "/pidgin"