diff libpurple/protocols/sametime/sametime.c @ 25823:051c29d275de

propagate from branch 'im.pidgin.pidgin' (head a2d611d8fe1aec7a7cc8d1837f1a4dceeadcb6eb) to branch 'im.pidgin.pidgin.next.minor' (head 21c0e3d598ce43b2ed1bf56a226310af8f527fb5)

--- a/libpurple/protocols/sametime/sametime.c	Mon Nov 03 04:48:50 2008 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Sat Nov 08 19:26:40 2008 +0000
@@ -4507,27 +4507,25 @@
 			      PurpleBuddy *buddy,
 			      PurpleGroup *group) {
 
-  struct mwPurplePluginData *pd;
+  struct mwPurplePluginData *pd = gc->proto_data;
   struct mwServiceResolve *srvc;
   GList *query;
   enum mwResolveFlag flags;
   guint32 req;
-
   BuddyAddData *data;
 
-  data = g_new0(BuddyAddData, 1);
-  data->buddy = buddy;
-  data->group = group;
-
-  pd = gc->proto_data;
-  srvc = pd->srvc_resolve;
-
   /* catch external buddies. They won't be in the resolve service */
   if(buddy_is_external(buddy)) {
     buddy_add(pd, buddy);
     return;
   }
 
+  data = g_new0(BuddyAddData, 1);
+  data->buddy = buddy;
+  data->group = group;
+
+  srvc = pd->srvc_resolve;
+
   query = g_list_prepend(NULL, (char *)purple_buddy_get_name(buddy));
   flags = mwResolveFlag_FIRST | mwResolveFlag_USERS;