/soc/2013/ankitkv/gobjectification: 42f4aa601777: Backed out cha...
Ankit Vani
a at nevitus.org
Fri Jan 17 11:15:55 EST 2014
Changeset: 42f4aa601777b7689e29dac9ab63a9cf1a840e97
Author: Ankit Vani <a at nevitus.org>
Date: 2014-01-17 21:45 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/42f4aa601777
Description:
Backed out changeset bc6040e3f9c8
diffstat:
libpurple/prefs.c | 2 +-
libpurple/protocols/gg/gg.c | 2 +-
libpurple/protocols/gg/servconn.c | 2 +-
libpurple/protocols/irc/irc.c | 4 ++--
libpurple/protocols/jabber/iq.c | 2 +-
libpurple/protocols/jabber/xmpp.c | 2 +-
libpurple/protocols/msn/msn.c | 2 +-
libpurple/protocols/oscar/oscar.c | 12 ++++++------
libpurple/protocols/sametime/sametime.c | 2 +-
libpurple/protocols/silc/silc.c | 2 +-
pidgin/pidgin.h | 3 +--
11 files changed, 17 insertions(+), 18 deletions(-)
diffs (152 lines):
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -1389,7 +1389,7 @@ purple_prefs_init(void)
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");
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -1193,7 +1193,7 @@ plugin_load(PurplePlugin *plugin, GError
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());
diff --git a/libpurple/protocols/gg/servconn.c b/libpurple/protocols/gg/servconn.c
--- a/libpurple/protocols/gg/servconn.c
+++ b/libpurple/protocols/gg/servconn.c
@@ -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
diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -1083,8 +1083,8 @@ plugin_load(PurplePlugin *plugin, GError
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();
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -225,7 +225,7 @@ static void jabber_iq_version_parse(Jabb
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);
diff --git a/libpurple/protocols/jabber/xmpp.c b/libpurple/protocols/jabber/xmpp.c
--- a/libpurple/protocols/jabber/xmpp.c
+++ b/libpurple/protocols/jabber/xmpp.c
@@ -99,7 +99,7 @@ xmpp_protocol_init(PurpleProtocol *proto
protocol->protocol_options = g_list_append(protocol->protocol_options,
option);
- purple_prefs_remove("/plugins/prpl/jabber");
+ purple_prefs_remove("/protocols/jabber");
}
static void
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -3071,7 +3071,7 @@ plugin_load(PurplePlugin *plugin, GError
_("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();
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -751,7 +751,7 @@ oscar_login(PurpleAccount *account)
/* 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 @@ plugin_load(PurplePlugin *plugin, GError
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;
}
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -86,7 +86,7 @@ static PurpleProtocol *my_protocol = NUL
/* 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"
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -2336,7 +2336,7 @@ plugin_load(PurplePlugin *plugin, GError
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();
diff --git a/pidgin/pidgin.h b/pidgin/pidgin.h
--- a/pidgin/pidgin.h
+++ b/pidgin/pidgin.h
@@ -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"
More information about the Commits
mailing list