# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1182740235 0
# Node ID ad450d54e72dc09ca1f130a6a4cf1f14dc0cc787
# Parent  1faa319ab4c3884a480994c78697d11de21cf79f# Parent  54ad47857b7b818251c63cdca2b8012e1a0040d9
merge of '12d65ba57d0e91f1bd68b923a95faab92a2bebe1'
     and 'b0753c11df84cce7262621801d1d625cb3366495'

diff -r 54ad47857b7b -r ad450d54e72d finch/gntplugin.c
--- a/finch/gntplugin.c	Mon Jun 25 02:56:32 2007 +0000
+++ b/finch/gntplugin.c	Mon Jun 25 02:57:15 2007 +0000
@@ -277,6 +277,14 @@
 	{
 		PurplePlugin *plug = iter->data;
 
+		if (plug->info->type == PURPLE_PLUGIN_LOADER) {
+			GList *cur;
+			for (cur = PURPLE_PLUGIN_LOADER_INFO(plug)->exts; cur != NULL;
+					 cur = cur->next)
+				purple_plugins_probe(cur->data);
+			continue;
+		}
+
 		if (plug->info->type != PURPLE_PLUGIN_STANDARD ||
 			(plug->info->flags & PURPLE_PLUGIN_FLAG_INVISIBLE) ||
 			plug->error)
diff -r 54ad47857b7b -r ad450d54e72d libpurple/protocols/bonjour/buddy.c
--- a/libpurple/protocols/bonjour/buddy.c	Mon Jun 25 02:56:32 2007 +0000
+++ b/libpurple/protocols/bonjour/buddy.c	Mon Jun 25 02:57:15 2007 +0000
@@ -17,6 +17,7 @@
 #include <glib.h>
 #include <stdlib.h>
 
+#include "internal.h"
 #include "buddy.h"
 #include "account.h"
 #include "blist.h"
diff -r 54ad47857b7b -r ad450d54e72d libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Mon Jun 25 02:56:32 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Mon Jun 25 02:57:15 2007 +0000
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include "internal.h"
 #include "network.h"
 #include "eventloop.h"
 #include "connection.h"
diff -r 54ad47857b7b -r ad450d54e72d libpurple/protocols/bonjour/mdns_common.c
--- a/libpurple/protocols/bonjour/mdns_common.c	Mon Jun 25 02:56:32 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_common.c	Mon Jun 25 02:57:15 2007 +0000
@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include "internal.h"
 #include "config.h"
 #include "mdns_common.h"
 #include "bonjour.h"
diff -r 54ad47857b7b -r ad450d54e72d libpurple/protocols/bonjour/mdns_win32.c
--- a/libpurple/protocols/bonjour/mdns_win32.c	Mon Jun 25 02:56:32 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Mon Jun 25 02:57:15 2007 +0000
@@ -14,6 +14,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "internal.h"
 #include "mdns_win32.h"
 
 #include "debug.h"
diff -r 54ad47857b7b -r ad450d54e72d libpurple/protocols/qq/Makefile.mingw
--- a/libpurple/protocols/qq/Makefile.mingw	Mon Jun 25 02:56:32 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Mon Jun 25 02:57:15 2007 +0000
@@ -54,7 +54,6 @@
 	group_im.c \
 	group_info.c \
 	group_join.c \
-	group_misc.c \
 	group_network.c \
 	group_opt.c \
 	group_search.c \
diff -r 54ad47857b7b -r ad450d54e72d libpurple/win32/win32dep.c
--- a/libpurple/win32/win32dep.c	Mon Jun 25 02:56:32 2007 +0000
+++ b/libpurple/win32/win32dep.c	Mon Jun 25 02:57:15 2007 +0000
@@ -32,6 +32,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include "internal.h"
 #include "debug.h"
 #include "notify.h"