# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1177309790 0
# Node ID 3ba37836d67486cf7e8d928b9e15e6892a5b0a9a
# Parent  94843d812e69be216abe91daa2b76a0a0dff79b7# Parent  ee4ce3c4186f34ea23bc9c99ff2e42016fe1aa9f
merge of '5227d53d05340b1c55335bc5ef30e1e63cd75b2c'
     and 'be425ac6aa2a108801c6b65385b40d02071bcba3'

diff -r 94843d812e69 -r 3ba37836d674 libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -13,7 +13,7 @@
 ##
 ## INCLUDE PATHS
 ##
-INCLUDE_PATHS =	\
+INCLUDE_PATHS +=	\
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP) \
@@ -22,7 +22,7 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(LIBXML2_TOP)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/plugins/Makefile.mingw
--- a/libpurple/plugins/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -25,7 +25,7 @@
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/plugins/perl/Makefile.mingw
--- a/libpurple/plugins/perl/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -24,7 +24,7 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PERL_LIB_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -17,7 +17,7 @@
 ##
 ## INCLUDE PATHS
 ##
-INCLUDE_PATHS =		-I. \
+INCLUDE_PATHS +=		-I. \
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(PURPLE_TOP) \
 			-I$(GTK_TOP)/include \
@@ -25,7 +25,7 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
-LIB_PATHS = 		-L$(PERL_LIB_TOP) \
+LIB_PATHS += 		-L$(PERL_LIB_TOP) \
 			-L$(PERL_PLUGIN_TOP) \
 			-L$(PURPLE_TOP) \
 			-L$(GTK_TOP)/lib
diff -r 94843d812e69 -r 3ba37836d674 libpurple/plugins/ssl/Makefile.mingw
--- a/libpurple/plugins/ssl/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -36,7 +36,7 @@
 			-I$(NSS_TOP)/include \
 			-I$(NSPR_TOP)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(NSS_TOP)/lib \
 			-L$(NSPR_TOP)/lib
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/bonjour/Makefile.mingw
--- a/libpurple/protocols/bonjour/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(HOWL_TOP)/lib \
 			-L$(PURPLE_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/gg/Makefile.mingw
--- a/libpurple/protocols/gg/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/irc/Makefile.mingw
--- a/libpurple/protocols/irc/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -34,7 +34,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L.
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/msn/Makefile.mingw
--- a/libpurple/protocols/msn/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/novell/Makefile.mingw
--- a/libpurple/protocols/novell/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/oscar/Makefile.mingw
--- a/libpurple/protocols/oscar/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L.
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/oscar/family_feedbag.c
--- a/libpurple/protocols/oscar/family_feedbag.c	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Mon Apr 23 06:29:50 2007 +0000
@@ -132,8 +132,21 @@
 			do {
 				new->gid += 0x0001;
 				for (cur=*list, i=0; ((cur) && (!i)); cur=cur->next)
-					if ((cur->type == AIM_SSI_TYPE_GROUP) && (cur->gid == new->gid))
+					if ((cur->type == AIM_SSI_TYPE_GROUP) && (cur->gid == new->gid)) {
 						i=1;
+						break;
+					}
+			} while (i);
+		}
+	} else if (new->gid == 0x0000) {
+		if (new->bid == 0xFFFF) {
+			do {
+				new->bid += 0x0001;
+				for (cur=*list, i=0; ((cur) && (!i)); cur=cur->next)
+					if (((cur->bid == new->bid) && (cur->gid == new->gid)) || (cur->gid == new->bid)) {
+						i=1;
+						break;
+					}
 			} while (i);
 		}
 	} else {
@@ -141,8 +154,10 @@
 			do {
 				new->bid += 0x0001;
 				for (cur=*list, i=0; ((cur) && (!i)); cur=cur->next)
-					if ((cur->bid == new->bid) && (cur->gid == new->gid))
+					if ((cur->bid == new->bid) && (cur->gid == new->gid)) {
 						i=1;
+						break;
+					}
 			} while (i);
 		}
 	}
@@ -550,8 +565,10 @@
 
 	/* We're out of stuff to do, so tell the AIM servers we're done and exit */
 	if (!od->ssi.pending) {
-		aim_ssi_modend(od);
-		od->ssi.in_transaction = FALSE;
+		if (od->ssi.in_transaction) {
+			aim_ssi_modend(od);
+			od->ssi.in_transaction = FALSE;
+		}
 		return 0;
 	}
 
@@ -764,7 +781,7 @@
 int aim_ssi_addpermit(OscarData *od, const char *name)
 {
 
-	if (!od || !name)
+	if (!od || !name || !od->ssi.received_data)
 		return -EINVAL;
 
 	/* Make sure the master group exists */
@@ -790,7 +807,7 @@
 int aim_ssi_adddeny(OscarData *od, const char *name)
 {
 
-	if (!od || !name)
+	if (!od || !name || !od->ssi.received_data)
 		return -EINVAL;
 
 	/* Make sure the master group exists */
@@ -1040,7 +1057,7 @@
 {
 	struct aim_ssi_item *tmp;
 
-	if (!od)
+	if (!od || !od->ssi.received_data)
 		return -EINVAL;
 
 	/* Find the PDINFO item, or add it if it does not exist */
@@ -1072,12 +1089,12 @@
  * @param iconcsumlen Length of the MD5 checksum given above.  Should be 0x10 bytes.
  * @return Return 0 if no errors, otherwise return the error number.
  */
-int aim_ssi_seticon(OscarData *od, const guint8 *iconsum, guint16 iconsumlen)
+int aim_ssi_seticon(OscarData *od, const guint8 *iconsum, guint8 iconsumlen)
 {
 	struct aim_ssi_item *tmp;
 	guint8 *csumdata;
 
-	if (!od || !iconsum || !iconsumlen)
+	if (!od || !iconsum || !iconsumlen || !od->ssi.received_data)
 		return -EINVAL;
 
 	/* Find the ICONINFO item, or add it if it does not exist */
@@ -1091,7 +1108,8 @@
 
 	/* Need to add the 0x00d5 TLV to the TLV chain */
 	csumdata = (guint8 *)malloc((iconsumlen+2)*sizeof(guint8));
-	aimutil_put16(&csumdata[0], iconsumlen);
+	aimutil_put8(&csumdata[0], 0x00);
+	aimutil_put8(&csumdata[1], iconsumlen);
 	memcpy(&csumdata[2], iconsum, iconsumlen);
 	aim_tlvlist_replace_raw(&tmp->data, 0x00d5, (iconsumlen+2) * sizeof(guint8), csumdata);
 	free(csumdata);
@@ -1134,7 +1152,7 @@
 int aim_ssi_setpresence(OscarData *od, guint32 presence) {
 	struct aim_ssi_item *tmp;
 
-	if (!od)
+	if (!od || !od->ssi.received_data)
 		return -EINVAL;
 
 	/* Find the PRESENCEPREFS item, or add it if it does not exist */
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Mon Apr 23 06:29:50 2007 +0000
@@ -1214,7 +1214,7 @@
 int aim_ssi_deletelist(OscarData *od);
 int aim_ssi_setpermdeny(OscarData *od, guint8 permdeny, guint32 vismask);
 int aim_ssi_setpresence(OscarData *od, guint32 presence);
-int aim_ssi_seticon(OscarData *od, const guint8 *iconsum, guint16 iconsumlen);
+int aim_ssi_seticon(OscarData *od, const guint8 *iconsum, guint8 iconsumlen);
 int aim_ssi_delicon(OscarData *od);
 
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/qq/Makefile.mingw
--- a/libpurple/protocols/qq/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 	-I$(PURPLE_TOP)/win32 \
 	-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS = \
+LIB_PATHS += \
 	-L$(GTK_TOP)/lib \
 	-L$(PURPLE_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/sametime/Makefile.mingw
--- a/libpurple/protocols/sametime/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(MEANWHILE_TOP)/lib \
 			-L$(PURPLE_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -34,7 +34,7 @@
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(SILC_TOOLKIT)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(SILC_TOOLKIT)/lib
 
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/simple/Makefile.mingw
--- a/libpurple/protocols/simple/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/toc/Makefile.mingw
--- a/libpurple/protocols/toc/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(LIBPIDGIN_TREE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBPIDGIN_TREE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/yahoo/Makefile.mingw
--- a/libpurple/protocols/yahoo/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
diff -r 94843d812e69 -r 3ba37836d674 libpurple/protocols/zephyr/Makefile.mingw
--- a/libpurple/protocols/zephyr/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -42,7 +42,7 @@
    INCLUDE_PATHS += -I$(KRB4_TOP)/inc/krb4
 endif
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ifeq ($(USE_KRB4), true)
diff -r 94843d812e69 -r 3ba37836d674 pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include
 
-INCLUDE_PATHS =	\
+INCLUDE_PATHS +=	\
 			$(PURPLE_INCLUDE_PATHS) \
 			-I$(PIDGIN_IDLETRACK_TOP) \
 			-I$(PIDGIN_TOP) \
@@ -44,7 +44,7 @@
 			-I$(GTKSPELL_TOP) \
 			-I$(ASPELL_TOP)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP) \
 			-L$(PIDGIN_IDLETRACK_TOP) \
diff -r 94843d812e69 -r 3ba37836d674 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Apr 23 06:29:50 2007 +0000
@@ -2002,6 +2002,8 @@
 		(event->keyval == GDK_F10) ||
 		(event->keyval == GDK_Shift_L) ||
 		(event->keyval == GDK_Shift_R) ||
+		(event->keyval == GDK_Control_L) ||
+		(event->keyval == GDK_Control_R) ||
 		(event->keyval == GDK_Escape) ||
 		(event->keyval == GDK_Up) ||
 		(event->keyval == GDK_Down) ||
@@ -2205,25 +2207,25 @@
 	if (l)
 		return l;
 	filename = g_strdup_printf("%s.png", prpl);
-	
+
 	path = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", "16", filename, NULL);
 	pixbuf = gdk_pixbuf_new_from_file(path, NULL);
 	if (pixbuf)
 		l = g_list_append(l, pixbuf);
 	g_free(path);
-	
+
 	path = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", "22", filename, NULL);
         pixbuf = gdk_pixbuf_new_from_file(path, NULL);
         if (pixbuf)
                 l = g_list_append(l, pixbuf);
         g_free(path);
-	
+
 	path = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", "48", filename, NULL);
         pixbuf = gdk_pixbuf_new_from_file(path, NULL);
         if (pixbuf)
                 l = g_list_append(l, pixbuf);
         g_free(path);
-	
+
 	g_hash_table_insert(prpl_lists, g_strdup(prpl), l);
 	return l;
 }
@@ -2308,7 +2310,7 @@
 {
 	PidginConversation *gtkconv;
 	PidginWindow *win;
-	GList *l;	
+	GList *l;
 	GdkPixbuf *status = NULL;
 
 	g_return_if_fail(conv != NULL);
@@ -3159,7 +3161,7 @@
 	}
 
 	if (gtkwin->menu.typing_icon == NULL)
-	{	
+	{
 		gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
 		pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
 								  gtkwin->menu.typing_icon,
@@ -3465,7 +3467,7 @@
 
 	pixbuf = gtk_widget_render_icon (gtkconv->tab_cont, image, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
 				 	 "GtkTreeView");
-	
+
 	if (!pixbuf)
 		return NULL;
 
@@ -3473,6 +3475,7 @@
 	g_object_unref(pixbuf);
 
 	if (flags && purple_conv_chat_is_user_ignored(chat, name)) {
+/* TODO: the .../status/default directory isn't installed, should it be? */
 		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "default", "ignored.png", NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
@@ -7848,7 +7851,7 @@
 	return window_list;
 }
 
-static GList* 
+static GList*
 make_status_icon_list(const char *stock, GtkWidget *w)
 {
 	GList *l = NULL;
@@ -7863,8 +7866,8 @@
 	return l;
 }
 
-static void 
-create_icon_lists(GtkWidget *w) 
+static void
+create_icon_lists(GtkWidget *w)
 {
 	available_list = make_status_icon_list(PIDGIN_STOCK_STATUS_AVAILABLE, w);
 	busy_list = make_status_icon_list(PIDGIN_STOCK_STATUS_BUSY, w);
diff -r 94843d812e69 -r 3ba37836d674 pidgin/pixmaps/toolbar/22/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/toolbar/22/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintoolbarpix_DATA)'; then \
+	  mkdir -p $(pidgintoolbarpixdir); \
+	  cp $(pidgintoolbarpix_DATA) $(pidgintoolbarpixdir); \
+	fi;
+
diff -r 94843d812e69 -r 3ba37836d674 pidgin/plugins/Makefile.mingw
--- a/pidgin/plugins/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PIDGIN_TOP) \
 			-I$(PIDGIN_TOP)/win32
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -29,7 +29,7 @@
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
-LIB_PATHS = 		-L$(PERL_LIB_TOP) \
+LIB_PATHS += 		-L$(PERL_LIB_TOP) \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP) \
 			-L$(PURPLE_PERL_TOP) \
diff -r 94843d812e69 -r 3ba37836d674 pidgin/plugins/ticker/Makefile.mingw
--- a/pidgin/plugins/ticker/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -27,7 +27,7 @@
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 pidgin/plugins/win32/transparency/Makefile.mingw
--- a/pidgin/plugins/win32/transparency/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -28,7 +28,7 @@
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)
 
diff -r 94843d812e69 -r 3ba37836d674 pidgin/plugins/win32/winprefs/Makefile.mingw
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw	Mon Apr 23 06:28:18 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw	Mon Apr 23 06:29:50 2007 +0000
@@ -28,7 +28,7 @@
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)