changeset 20760:47fed8fe4884

merge of '5eed7d5d3539cd18c81cb4d709080ea5bc109bac' and 'c180c5d69d4c73b8c1f08f48824d93fbeb3b44e8'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 03 Oct 2007 00:45:12 +0000
parents 989f5906ca17 (diff) 398bfc680c63 (current diff)
children fb70e89180a9
files
diffstat 8 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/soap.c	Tue Oct 02 21:47:50 2007 +0000
+++ b/libpurple/protocols/msn/soap.c	Wed Oct 03 00:45:12 2007 +0000
@@ -26,7 +26,7 @@
 #include "msn.h"
 #include "soap.h"
 
-
+#define MSN_SOAP_DEBUG
 /*local function prototype*/
 void msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step);
 
--- a/pidgin/pidginstock.c	Tue Oct 02 21:47:50 2007 +0000
+++ b/pidgin/pidginstock.c	Wed Oct 03 00:45:12 2007 +0000
@@ -114,11 +114,11 @@
 	{ PIDGIN_STOCK_STATUS_CHAT, 	"status", "chat.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
 	{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
 	{ PIDGIN_STOCK_STATUS_XA, 	"status", "extended-away.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },
-	{ PIDGIN_STOCK_STATUS_LOGIN, 	"status", "log-in.png",		FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
-	{ PIDGIN_STOCK_STATUS_LOGOUT, 	"status", "log-out.png",	FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+	{ PIDGIN_STOCK_STATUS_LOGIN, 	"status", "log-in.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+	{ PIDGIN_STOCK_STATUS_LOGOUT, 	"status", "log-out.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
 	{ PIDGIN_STOCK_STATUS_OFFLINE, 	"status", "offline.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I  },
 	{ PIDGIN_STOCK_STATUS_PERSON, 	"status", "person.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"toolbar", "message-new.png",   FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"toolbar", "message-new.png",   TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	
 	{ PIDGIN_STOCK_STATUS_IGNORED,	"emblems", "blocked.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_STATUS_FOUNDER,	"emblems", "founder.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
--- a/pidgin/pixmaps/status/11/Makefile.am	Tue Oct 02 21:47:50 2007 +0000
+++ b/pidgin/pixmaps/status/11/Makefile.am	Wed Oct 03 00:45:12 2007 +0000
@@ -6,6 +6,8 @@
 		chat.png \
 		extended-away.png \
 		invisible.png \
+		log-in.png \
+		log-out.png \
 		offline.png \
 		person.png
 
Binary file pidgin/pixmaps/status/11/log-in.png has changed
Binary file pidgin/pixmaps/status/11/log-out.png has changed
Binary file pidgin/pixmaps/toolbar/11/message-new.png has changed
--- a/pidgin/pixmaps/toolbar/Makefile.am	Tue Oct 02 21:47:50 2007 +0000
+++ b/pidgin/pixmaps/toolbar/Makefile.am	Wed Oct 03 00:45:12 2007 +0000
@@ -1,6 +1,11 @@
 SUBDIRS = 16 22
 
+TINY_ICONS = 11/message-new.png
 EXTRA_DIST = \
 	Makefile.mingw \
 	16/Makefile.mingw \
-	22/Makefile.mingw
+	22/Makefile.mingw \
+	$(TINY_ICONS)
+
+pidgintinytoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/11
+pidgintinytoolbarpix_DATA = $(TINY_ICONS)
Binary file pidgin/win32/nsis/pixmaps/pidgin-intro.bmp has changed