# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 968777514 0
# Node ID db5f5c33e83f20ac9a6b7da3c52b3c4e65d5c2a8
# Parent  d4e0d5b35811205e36b1d4703fad58dc14ee0daf
[gaim-migrate @ 895]
Thank to William Bader for this fix

committer: Tailor Script <tailor@pidgin.im>

diff -r d4e0d5b35811 -r db5f5c33e83f src/buddy.c
--- a/src/buddy.c	Tue Sep 12 01:09:59 2000 +0000
+++ b/src/buddy.c	Tue Sep 12 16:51:54 2000 +0000
@@ -65,7 +65,7 @@
 #include "pixmaps/add_small.xpm"
 #include "pixmaps/import_small.xpm"
 #include "pixmaps/export_small.xpm"
-#ifdef GAIM_PLUGINS
+#if defined(GAIM_PLUGINS) || defined(USE_PERL)
 #include "pixmaps/plugins_small.xpm"
 #endif
 #include "pixmaps/prefs_small.xpm"
diff -r d4e0d5b35811 -r db5f5c33e83f src/conversation.c
--- a/src/conversation.c	Tue Sep 12 01:09:59 2000 +0000
+++ b/src/conversation.c	Tue Sep 12 16:51:54 2000 +0000
@@ -83,8 +83,8 @@
 GdkBitmap *dark_icon_bm = NULL;
 
 char fontface[64];
-GdkColor bgcolor;
-GdkColor fgcolor;
+extern GdkColor bgcolor;
+extern GdkColor fgcolor;
 
 void check_everything(GtkWidget *entry);
 gboolean keypress_callback(GtkWidget *entry, GdkEventKey *event,  struct conversation *c);
diff -r d4e0d5b35811 -r db5f5c33e83f src/gaim.h
--- a/src/gaim.h	Tue Sep 12 01:09:59 2000 +0000
+++ b/src/gaim.h	Tue Sep 12 16:51:54 2000 +0000
@@ -150,15 +150,6 @@
         char page[255];
 };
 
-#ifdef GAIM_PLUGINS
-struct gaim_plugin {
-	char *name;
-	char *filename;
-	char *description;
-	void *handle;
-	int   remove;
-};
-
 enum gaim_event {
 	event_signon = 0,
 	event_signoff,
@@ -185,6 +176,15 @@
 	/* any others? it's easy to add... */
 };
 
+#ifdef GAIM_PLUGINS
+struct gaim_plugin {
+	char *name;
+	char *filename;
+	char *description;
+	void *handle;
+	int   remove;
+};
+
 struct gaim_callback {
 	void *handle;
 	enum gaim_event event;
@@ -408,7 +408,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 883 $"
+#define REVISION "gaim:$Revision: 895 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
diff -r d4e0d5b35811 -r db5f5c33e83f src/plugins.c
--- a/src/plugins.c	Tue Sep 12 01:09:59 2000 +0000
+++ b/src/plugins.c	Tue Sep 12 16:51:54 2000 +0000
@@ -32,8 +32,6 @@
 #include "../config.h"
 #endif
 
-#ifdef GAIM_PLUGINS
-
 #include <string.h>
 #include <sys/time.h>
 
@@ -46,6 +44,8 @@
 #include <gtk/gtk.h>
 #include "gaim.h"
 
+#ifdef GAIM_PLUGINS
+
 #include <dlfcn.h>
 
 /* ------------------ Global Variables ----------------------- */