im.pidgin.pidgin: 5eed7d5d3539cd18c81cb4d709080ea5bc109bac

[seanegan at pidgin.im]

revision:            5eed7d5d3539cd18c81cb4d709080ea5bc109bac
date:                2007-10-03T00:33:44
author:              seanegan at pidgin.im
branch:              im.pidgin.pidgin
changelog:
Hylke made a new win32 installer pixmap

manifest:
format_version "1"

new_manifest [98682bf4bb8d1c6cdba3db49fbeebbae494d51b8]

old_revision [45b8a011cd84e0e69d7ac5a6fb84f55cdb0809cb]

add_dir "pidgin/pixmaps/toolbar/11"

add_file "pidgin/pixmaps/status/11/log-in.png"
 content [0be4a0be280cce09c33ae144538a098abfe260ab]

add_file "pidgin/pixmaps/status/11/log-out.png"
 content [e201025bec5d6e617f6803194d47bcf687b9adc7]

add_file "pidgin/pixmaps/toolbar/11/message-new.png"
 content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]

patch "libpurple/protocols/msn/soap.c"
 from [b4246c343cc7a5051c673f14257ab0918a4db156]
   to [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]

patch "pidgin/pidginstock.c"
 from [a1a460cffd8fa050434e5402f4800f561f2528c5]
   to [2c265aa9d5a211ec43e10e414febf9937bb03420]

patch "pidgin/pixmaps/status/11/Makefile.am"
 from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
   to [206419b4c8fd3cec428f705dab89a09c27326636]

patch "pidgin/pixmaps/toolbar/Makefile.am"
 from [497746a6a16a636054c83cdb0f459206aa1ad609]
   to [c5081b872303b49b303ca69d9ae94176f98e00e1]

patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
 from [743fe3b36d453397c445fe08ea301f9163b07923]
   to [a286d035366a6522fa166cc53fcbfbaa2f2de370]

  set "pidgin/pixmaps/status/11/log-in.png"
 attr "mtn:manual_merge"
value "true"

  set "pidgin/pixmaps/status/11/log-out.png"
 attr "mtn:manual_merge"
value "true"

  set "pidgin/pixmaps/toolbar/11/message-new.png"
 attr "mtn:manual_merge"
value "true"
-------------- next part --------------
#
#
# add_dir "pidgin/pixmaps/toolbar/11"
# 
# add_file "pidgin/pixmaps/status/11/log-in.png"
#  content [0be4a0be280cce09c33ae144538a098abfe260ab]
# 
# add_file "pidgin/pixmaps/status/11/log-out.png"
#  content [e201025bec5d6e617f6803194d47bcf687b9adc7]
# 
# add_file "pidgin/pixmaps/toolbar/11/message-new.png"
#  content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]
# 
# patch "libpurple/protocols/msn/soap.c"
#  from [b4246c343cc7a5051c673f14257ab0918a4db156]
#    to [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
# 
# patch "pidgin/pidginstock.c"
#  from [a1a460cffd8fa050434e5402f4800f561f2528c5]
#    to [2c265aa9d5a211ec43e10e414febf9937bb03420]
# 
# patch "pidgin/pixmaps/status/11/Makefile.am"
#  from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
#    to [206419b4c8fd3cec428f705dab89a09c27326636]
# 
# patch "pidgin/pixmaps/toolbar/Makefile.am"
#  from [497746a6a16a636054c83cdb0f459206aa1ad609]
#    to [c5081b872303b49b303ca69d9ae94176f98e00e1]
# 
# patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
#  from [743fe3b36d453397c445fe08ea301f9163b07923]
#    to [a286d035366a6522fa166cc53fcbfbaa2f2de370]
# 
#   set "pidgin/pixmaps/status/11/log-in.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "pidgin/pixmaps/status/11/log-out.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "pidgin/pixmaps/toolbar/11/message-new.png"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# pidgin/pixmaps/status/11/log-in.png is binary
============================================================
# pidgin/pixmaps/status/11/log-out.png is binary
============================================================
# pidgin/pixmaps/toolbar/11/message-new.png is binary
============================================================
--- libpurple/protocols/msn/soap.c	b4246c343cc7a5051c673f14257ab0918a4db156
+++ libpurple/protocols/msn/soap.c	8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7
@@ -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);
 
============================================================
--- pidgin/pidginstock.c	a1a460cffd8fa050434e5402f4800f561f2528c5
+++ pidgin/pidginstock.c	2c265aa9d5a211ec43e10e414febf9937bb03420
@@ -114,11 +114,11 @@ static struct SizedStockIcon {
 	{ 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  },
============================================================
--- pidgin/pixmaps/status/11/Makefile.am	9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b
+++ pidgin/pixmaps/status/11/Makefile.am	206419b4c8fd3cec428f705dab89a09c27326636
@@ -6,6 +6,8 @@ EXTRA_DIST = 	available.png \
 		chat.png \
 		extended-away.png \
 		invisible.png \
+		log-in.png \
+		log-out.png \
 		offline.png \
 		person.png
 
============================================================
--- pidgin/pixmaps/toolbar/Makefile.am	497746a6a16a636054c83cdb0f459206aa1ad609
+++ pidgin/pixmaps/toolbar/Makefile.am	c5081b872303b49b303ca69d9ae94176f98e00e1
@@ -1,6 +1,11 @@ SUBDIRS = 16 22
 SUBDIRS = 16 22
 
+TINY_ICONS = 11/message-new.png
 EXTRA_DIST = \
 	Makefile.mingw \
 	16/Makefile.mingw \
+	22/Makefile.mingw \
+	$(TINY_ICONS)
+
+pidgintinytoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/11
+pidgintinytoolbarpix_DATA = $(TINY_ICONS)
-	22/Makefile.mingw
============================================================
# pidgin/win32/nsis/pixmaps/pidgin-intro.bmp is binary