# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1180563946 0
# Node ID 97b5bf0637cab771a9106cac3e440dde19df98fe
# Parent  deb035e6d74854cb737468e7b31d35c1e5f9b3c8# Parent  21f8cf85ff51a8165e7c5831b16511f3e8b9b773
merge of '906d9e8b2315b314b956961566ef8062cd963241'
     and 'fa6f6ed6cc661e03779696a31551f4739f4ec910'

diff -r 21f8cf85ff51 -r 97b5bf0637ca COPYRIGHT
--- a/COPYRIGHT	Wed May 30 21:02:15 2007 +0000
+++ b/COPYRIGHT	Wed May 30 22:25:46 2007 +0000
@@ -129,6 +129,7 @@
 Decklin Foster
 Francesco Fracassi
 Adam Fritzler
+Takao Fujiwara
 Max G.
 François Gagné
 Andrew Gaul
diff -r 21f8cf85ff51 -r 97b5bf0637ca pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Wed May 30 21:02:15 2007 +0000
+++ b/pidgin/Makefile.mingw	Wed May 30 22:25:46 2007 +0000
@@ -106,26 +106,21 @@
 ##
 ## LIBRARIES
 ##
-LIBPURPLES =	\
-		-lpurple \
-		-lglib-2.0 \
-		-lgthread-2.0 \
-		-lgobject-2.0 \
-		-lgmodule-2.0 \
+
+PIDGIN_LIBS =	\
 		-lintl \
-		-lws2_32 \
-		-lwinmm \
-		-lz
-
-GTKPURPLES =	\
-		$(LIBPURPLES) \
+		-lglib-2.0 \
+		-lgobject-2.0 \
+		-lpurple \
+		-lz \
 		-lidletrack \
 		-lgtk-win32-2.0 \
 		-latk-1.0 \
 		-lpango-1.0 \
 		-lgdk-win32-2.0 \
 		-lgdk_pixbuf-2.0 \
-		-lgdi32
+		-lgdi32 \
+		-lwinmm
 
 include $(PIDGIN_COMMON_RULES)
 
@@ -159,7 +154,7 @@
 $(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
 
 $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
-	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(GTKPURPLES) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
+	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 
 $(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
diff -r 21f8cf85ff51 -r 97b5bf0637ca pidgin/pixmaps/emotes/default/22/Makefile.mingw
--- a/pidgin/pixmaps/emotes/default/22/Makefile.mingw	Wed May 30 21:02:15 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.mingw	Wed May 30 22:25:46 2007 +0000
@@ -10,17 +10,13 @@
 datadir = $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
-theme: default.theme.in
-	sed -e 's/^_Name=/Name=/' \
-	    -e 's/^_Description=/Description=/' \
-	    -e 's/^_Author=/Author=/' \
-	$< > $@
+.PHONY: install clean
 
-.PHONY: install
-
-install:
+install: theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
 	fi;
 
+clean:
+	rm -f theme
diff -r 21f8cf85ff51 -r 97b5bf0637ca pidgin/pixmaps/emotes/none/Makefile.mingw
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw	Wed May 30 21:02:15 2007 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.mingw	Wed May 30 22:25:46 2007 +0000
@@ -10,17 +10,14 @@
 datadir = $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
-theme: none.theme.in
-	sed -e 's/^_Name=/Name=/' \
-	    -e 's/^_Description=/Description=/' \
-	    -e 's/^_Author=/Author=/' \
-	$< > $@
+.PHONY: install clean
 
-.PHONY: install
-
-install:
+install: theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
 	fi;
 
+clean:
+	rm -f theme
+