# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1187354710 0
# Node ID 5f2c062cc40c55838ebea8d6eec859459914c7a3
# Parent  c4d72aa4a52d05b1ff6033d54241a5836532fbd3# Parent  b748d240866189e4da6f281ed86af99d39512671
merge of '248776630a5ac63bd46aba2e4fd73d05f06098e0'
     and '94297ecf31d12a6bbabd789e067e758d486a69f3'

diff -r c4d72aa4a52d -r 5f2c062cc40c finch/gntsound.c
--- a/finch/gntsound.c	Sun Jul 22 07:35:28 2007 +0000
+++ b/finch/gntsound.c	Fri Aug 17 12:45:10 2007 +0000
@@ -300,15 +300,15 @@
 	purple_prefs_add_none(make_pref(""));
 	purple_prefs_add_none(make_pref("/enabled"));
 	purple_prefs_add_none(make_pref("/file"));
-	purple_prefs_add_bool(make_pref("/enabled/login"), TRUE);
+	purple_prefs_add_bool(make_pref("/enabled/login"), FALSE);
 	purple_prefs_add_path(make_pref("/file/login"), "");
-	purple_prefs_add_bool(make_pref("/enabled/logout"), TRUE);
+	purple_prefs_add_bool(make_pref("/enabled/logout"), FALSE);
 	purple_prefs_add_path(make_pref("/file/logout"), "");
-	purple_prefs_add_bool(make_pref("/enabled/im_recv"), TRUE);
+	purple_prefs_add_bool(make_pref("/enabled/im_recv"), FALSE);
 	purple_prefs_add_path(make_pref("/file/im_recv"), "");
 	purple_prefs_add_bool(make_pref("/enabled/first_im_recv"), FALSE);
 	purple_prefs_add_path(make_pref("/file/first_im_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/send_im"), TRUE);
+	purple_prefs_add_bool(make_pref("/enabled/send_im"), FALSE);
 	purple_prefs_add_path(make_pref("/file/send_im"), "");
 	purple_prefs_add_bool(make_pref("/enabled/join_chat"), FALSE);
 	purple_prefs_add_path(make_pref("/file/join_chat"), "");
@@ -320,9 +320,9 @@
 	purple_prefs_add_path(make_pref("/file/chat_msg_recv"), "");
 	purple_prefs_add_bool(make_pref("/enabled/nick_said"), FALSE);
 	purple_prefs_add_path(make_pref("/file/nick_said"), "");
-	purple_prefs_add_bool(make_pref("/enabled/pounce_default"), TRUE);
+	purple_prefs_add_bool(make_pref("/enabled/pounce_default"), FALSE);
 	purple_prefs_add_path(make_pref("/file/pounce_default"), "");
-	purple_prefs_add_bool(make_pref("/conv_focus"), TRUE);
+	purple_prefs_add_bool(make_pref("/conv_focus"), FALSE);
 	purple_prefs_add_bool(make_pref("/mute"), FALSE);
 	purple_prefs_add_path(make_pref("/command"), "");
 	purple_prefs_add_string(make_pref("/method"), "automatic");
diff -r c4d72aa4a52d -r 5f2c062cc40c pidgin/pixmaps/status/11/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/11/Makefile.mingw	Fri Aug 17 12:45:10 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 c4d72aa4a52d -r 5f2c062cc40c pidgin/pixmaps/status/Makefile.am
--- a/pidgin/pixmaps/status/Makefile.am	Sun Jul 22 07:35:28 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.am	Fri Aug 17 12:45:10 2007 +0000
@@ -2,6 +2,7 @@
 
 EXTRA_DIST = \
 	Makefile.mingw \
+	11/Makefile.mingw \
 	16/Makefile.mingw \
 	16/rtl/Makefile.mingw \
 	22/Makefile.mingw \