# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1172449823 0
# Node ID 1f7106b999d5c043ae2b2b689fed96c844d36291
# Parent  72a63319582ea0caa7618d06bdbf72449007e540
Use ~/.face (or ~/.face.icon) as the default avatar. GDM and KDM both use these. Daniel should make it use the default Windows icon too. Evan can probably do OS X if he wants.

diff -r 72a63319582e -r 1f7106b999d5 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Mon Feb 26 00:11:58 2007 +0000
+++ b/pidgin/gtkaccount.c	Mon Feb 26 00:30:23 2007 +0000
@@ -2563,11 +2563,23 @@
 void
 pidgin_account_init(void)
 {
+	char *default_avatar = NULL;
 	gaim_prefs_add_none("/gaim/gtk/accounts");
 	gaim_prefs_add_none("/gaim/gtk/accounts/dialog");
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/width",  520);
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/height", 321);
-	gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", NULL);
+	default_avatar = g_build_filename(g_get_home_dir(), ".face.icon", NULL);
+	if (!g_file_test(default_avatar, G_FILE_TEST_EXISTS)) {
+		g_free(default_avatar);
+		default_avatar = g_build_filename(g_get_home_dir(), ".face", NULL);
+		if (!g_file_test(default_avatar, G_FILE_TEST_EXISTS)) {
+			g_free(default_avatar);
+			default_avatar = NULL;
+		}
+	}
+		
+printf("AVATAR: %s\n", default_avatar);
+	gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", default_avatar);
 
 	gaim_signal_register(pidgin_account_get_handle(), "account-modified",
 						 gaim_marshal_VOID__POINTER, NULL, 1,
diff -r 72a63319582e -r 1f7106b999d5 pidgin/pixmaps/tray/22/Makefile.am
--- a/pidgin/pixmaps/tray/22/Makefile.am	Mon Feb 26 00:11:58 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Mon Feb 26 00:30:23 2007 +0000
@@ -14,5 +14,5 @@
 		tray-offline.ico \
 		tray-online.ico 
 
-pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16
+pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/22
 pidgintraypix_DATA = $(TRAY_ICONS)