/soc/2013/ankitkv/gobjectification: 488eec308b4c: Forgot to move...

[Ankit Vani]

Changeset: 488eec308b4c150cb8db4bf3f1d8b64d1c1fdec9
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-04 05:37 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/488eec308b4c

Description:

Forgot to move a few things

diffstat:

 libpurple/protocols/msn/msn.c           |  3 ++-
 libpurple/protocols/null/nullprotocol.c |  3 ++-
 libpurple/protocols/sametime/sametime.c |  6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (63 lines):

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
@@ -2880,7 +2880,6 @@ msn_protocol_base_init(MsnProtocolClass 
 {
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
-	PurpleCmdId id;
 
 	proto_class->id        = "msn";
 	proto_class->name      = "MSN";
@@ -2992,6 +2991,8 @@ plugin_query(GError **error)
 static gboolean
 plugin_load(PurplePlugin *plugin, GError **error)
 {
+	PurpleCmdId id;
+
 	my_protocol = purple_protocols_add(MSN_TYPE_PROTOCOL, error);
 	if (!my_protocol)
 		return FALSE;
diff --git a/libpurple/protocols/null/nullprotocol.c b/libpurple/protocols/null/nullprotocol.c
--- a/libpurple/protocols/null/nullprotocol.c
+++ b/libpurple/protocols/null/nullprotocol.c
@@ -1058,7 +1058,6 @@ null_protocol_base_init(NullProtocolClas
   PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
   PurpleAccountUserSplit *split;
   PurpleAccountOption *option;
-  PurpleCmdId id;
 
   proto_class->id        = "null";
   proto_class->name      = "Null - Testing Protocol";
@@ -1166,6 +1165,8 @@ plugin_query(GError **error)
 static gboolean
 plugin_load(PurplePlugin *plugin, GError **error)
 {
+  PurpleCmdId id;
+
   /* add the protocol to the core */
   my_protocol = purple_protocols_add(NULL_TYPE_PROTOCOL, error);
   if (!my_protocol)
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
@@ -5626,9 +5626,6 @@ mw_protocol_base_init(mwProtocolClass *k
   PurpleAccountOption *opt;
   GList *l = NULL;
 
-  GLogLevelFlags logflags =
-    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION;
-
   proto_class->id      = PROTOCOL_ID;
   proto_class->name    = PROTOCOL_NAME;
   proto_class->options = OPT_PROTO_IM_IMAGE;
@@ -5747,6 +5744,9 @@ plugin_query(GError **error)
 static gboolean
 plugin_load(PurplePlugin *plugin, GError **error)
 {
+  GLogLevelFlags logflags =
+    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION;
+
   my_protocol = purple_protocols_add(MW_TYPE_PROTOCOL, error);
   if (!my_protocol)
     return FALSE;