# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177641282 0
# Node ID 3c01acbf3478b393bf6339efb9c7c3cbaf55422b
# Parent  f6acb38ae250721751cf9ddc97120ff16049fe94# Parent  fe792a7b7ee344b3cdf7b7bc1b96295ca0760a22
merge of '18631760bee4d073adc9d9f976d7655b5d0671d4'
     and 'a68d7229a1ca81474634888b5bef86223f05555a'

diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/icons/Makefile.mingw
--- a/pidgin/pixmaps/icons/Makefile.mingw	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/icons/Makefile.mingw	Fri Apr 27 02:34:42 2007 +0000
@@ -7,8 +7,11 @@
 include ./Makefile.am
 
 install:
+
+install_real:
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
 	  done; \
 	fi;
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/16/Makefile.mingw
--- a/pidgin/pixmaps/status/16/Makefile.mingw	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.mingw	Fri Apr 27 02:34:42 2007 +0000
@@ -18,3 +18,5 @@
 	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
 
+	$(MAKE) -C rtl -f Makefile.mingw install || exit 1; \
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/16/rtl/Makefile.am
--- a/pidgin/pixmaps/status/16/rtl/Makefile.am	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/16/rtl/Makefile.am	Fri Apr 27 02:34:42 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST = 	chat.png extended-away.png 
+EXTRA_DIST = 	extended-away.png 
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/16/rtl
 
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/16/rtl/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/16/rtl/Makefile.mingw	Fri Apr 27 02:34:42 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/16/rtl/chat.png
Binary file pidgin/pixmaps/status/16/rtl/chat.png has changed
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/16/rtl/extended-away.png
Binary file pidgin/pixmaps/status/16/rtl/extended-away.png has changed
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/22/Makefile.mingw
--- a/pidgin/pixmaps/status/22/Makefile.mingw	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/22/Makefile.mingw	Fri Apr 27 02:34:42 2007 +0000
@@ -18,3 +18,5 @@
 	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
 
+	$(MAKE) -C rtl -f Makefile.mingw install || exit 1; \
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/22/rtl/Makefile.am
--- a/pidgin/pixmaps/status/22/rtl/Makefile.am	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/22/rtl/Makefile.am	Fri Apr 27 02:34:42 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST = 	chat.png extended-away.png
+EXTRA_DIST = 	extended-away.png
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/22/rtl
 
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/22/rtl/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/22/rtl/Makefile.mingw	Fri Apr 27 02:34:42 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/22/rtl/chat.png
Binary file pidgin/pixmaps/status/22/rtl/chat.png has changed
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/32/Makefile.mingw
--- a/pidgin/pixmaps/status/32/Makefile.mingw	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/32/Makefile.mingw	Fri Apr 27 02:34:42 2007 +0000
@@ -18,3 +18,5 @@
 	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
 
+	$(MAKE) -C rtl -f Makefile.mingw install || exit 1; \
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/32/rtl/Makefile.am
--- a/pidgin/pixmaps/status/32/rtl/Makefile.am	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/32/rtl/Makefile.am	Fri Apr 27 02:34:42 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST = 	chat.png extended-away.png
+EXTRA_DIST = 	extended-away.png
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/32/rtl
 
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/32/rtl/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/32/rtl/Makefile.mingw	Fri Apr 27 02:34:42 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/32/rtl/chat.png
Binary file pidgin/pixmaps/status/32/rtl/chat.png has changed
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/48/Makefile.mingw
--- a/pidgin/pixmaps/status/48/Makefile.mingw	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/48/Makefile.mingw	Fri Apr 27 02:34:42 2007 +0000
@@ -18,3 +18,5 @@
 	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
 
+	$(MAKE) -C rtl -f Makefile.mingw install || exit 1; \
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/48/rtl/Makefile.am
--- a/pidgin/pixmaps/status/48/rtl/Makefile.am	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/48/rtl/Makefile.am	Fri Apr 27 02:34:42 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST = 	chat.png extended-away.png
+EXTRA_DIST = 	extended-away.png
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/48/rtl
 
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/48/rtl/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/48/rtl/Makefile.mingw	Fri Apr 27 02:34:42 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/48/rtl/chat.png
Binary file pidgin/pixmaps/status/48/rtl/chat.png has changed
diff -r f6acb38ae250 -r 3c01acbf3478 pidgin/pixmaps/status/Makefile.am
--- a/pidgin/pixmaps/status/Makefile.am	Fri Apr 27 02:29:55 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.am	Fri Apr 27 02:34:42 2007 +0000
@@ -3,7 +3,11 @@
 EXTRA_DIST = \
 	Makefile.mingw \
 	16/Makefile.mingw \
+	16/rtl/Makefile.mingw \
 	22/Makefile.mingw \
+	22/rtl/Makefile.mingw \
 	32/Makefile.mingw \
-	48/Makefile.mingw
+	32/rtl/Makefile.mingw \
+	48/Makefile.mingw \
+	48/rtl/Makefile.mingw