# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1178219588 0
# Node ID a26545a6409e2048e6a2f3151f5203327cb6ccb2
# Parent  64778903211d5002fdc7e59e2c0723495cc71da2# Parent  9f9c486a8aca9951044732a924e6661cc1159b05
merge of 'ca195759088f27094497f24bfba6f5c070ad1800'
     and 'cbc6c1d87d869287c65bf9b2340a73f904fa885f'

diff -r 9f9c486a8aca -r a26545a6409e COPYRIGHT
--- a/COPYRIGHT	Thu May 03 19:12:19 2007 +0000
+++ b/COPYRIGHT	Thu May 03 19:13:08 2007 +0000
@@ -73,6 +73,7 @@
 Eoin Coffey
 Jason Cohen
 Todd Cohen
+Graham Cole
 Jono Cole
 Lorenzo Colitti
 Jeff Connelly
diff -r 9f9c486a8aca -r a26545a6409e libpurple/plugins/tcl/tcl_ref.c
--- a/libpurple/plugins/tcl/tcl_ref.c	Thu May 03 19:12:19 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_ref.c	Thu May 03 19:13:08 2007 +0000
@@ -114,7 +114,7 @@
 	char *ptr;
 	PurpleStringref *type;
 	void *value;
-	static const char const *prefix = "purple-";
+	static const char prefix[] = "purple-";
 	static const int prefixlen = sizeof(prefix) - 1;
 
 	if (strlen(bytes) < prefixlen
diff -r 9f9c486a8aca -r a26545a6409e pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/gtkblist.c	Thu May 03 19:13:08 2007 +0000
@@ -1086,7 +1086,7 @@
 			prpl_info->can_receive_file(buddy->account->gc, buddy->name))
 		{
 			pidgin_new_item_from_stock(menu, _("_Send File"),
-									 PIDGIN_STOCK_FILE_TRANSFER,
+									 PIDGIN_STOCK_TOOLBAR_SEND_FILE,
 									 G_CALLBACK(gtk_blist_menu_send_file_cb),
 									 buddy, 0, 0, NULL);
 		}
@@ -2850,7 +2850,7 @@
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
-	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<StockItem>", PIDGIN_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
 };
 
 /*********************************************************
diff -r 9f9c486a8aca -r a26545a6409e pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/gtkconv.c	Thu May 03 19:13:08 2007 +0000
@@ -1579,7 +1579,7 @@
 		if (prpl_info && prpl_info->send_file)
 		{
 			button = pidgin_new_item_from_stock(menu, _("Send File"),
-				PIDGIN_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb),
+				PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(menu_chat_send_file_cb),
 				PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 			if (gc == NULL || prpl_info == NULL ||
@@ -2767,7 +2767,7 @@
 
 	{ "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
 
-	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER },
+	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
 	{ N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
 			0, "<Item>", NULL },
 	{ N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0,
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/pidginstock.c	Thu May 03 19:13:08 2007 +0000
@@ -36,7 +36,6 @@
 
 } const stock_icons[] =
 {
-	{ PIDGIN_STOCK_ABOUT,           "buttons", "about_menu.png"           },
 	{ PIDGIN_STOCK_ACTION,          NULL,      GTK_STOCK_EXECUTE          },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_ALIAS,           NULL,      GTK_STOCK_EDIT             },
@@ -61,7 +60,6 @@
 #endif
 	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
 	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
-	{ PIDGIN_STOCK_FILE_TRANSFER,   NULL,      GTK_STOCK_REVERT_TO_SAVED  },
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
@@ -160,6 +158,7 @@
 	{ PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
 	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pidginstock.h
--- a/pidgin/pidginstock.h	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/pidginstock.h	Thu May 03 19:13:08 2007 +0000
@@ -31,7 +31,6 @@
 /** @name Stock images                                                    */
 /**************************************************************************/
 /*@{*/
-#define PIDGIN_STOCK_ABOUT           "pidgin-about"
 #define PIDGIN_STOCK_ACTION          "pidgin-action"
 #define PIDGIN_STOCK_ALIAS           "pidgin-alias"
 #define PIDGIN_STOCK_AWAY            "pidgin-away"
@@ -45,7 +44,6 @@
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
 #define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
-#define PIDGIN_STOCK_FILE_TRANSFER   "pidgin-file-transfer"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
@@ -125,6 +123,7 @@
 #define PIDGIN_STOCK_TOOLBAR_USER_INFO    "pidgin-info"
 #define PIDGIN_STOCK_TOOLBAR_UNBLOCK      "pidgin-unblock"
 #define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"
+#define PIDGIN_STOCK_TOOLBAR_SEND_FILE    "pidgin-send-file"
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Thu May 03 19:13:08 2007 +0000
@@ -1,7 +1,6 @@
 SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray
 
 EXTRA_DIST = \
-		about_menu.png			\
 		edit.png			\
 		logo.png			\
 		pause.png			\
@@ -13,7 +12,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = about_menu.png edit.png pause.png
+pidginbuttonpix_DATA = edit.png pause.png
 
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/about_menu.png
Binary file pidgin/pixmaps/about_menu.png has changed
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Thu May 03 19:13:08 2007 +0000
@@ -21,7 +21,7 @@
 moneymouth.png      :-$
 foot-in-mouth.png   :-!
 shout.png           >:o     >:O
-! skywalker.png     C:-)
+! skywalker.png     C:-) c:-) C:) c:)
 ! monkey.png        :-(|)
 
 ### Following AIM 6.1
@@ -123,99 +123,99 @@
 
 ### Following QQ 2006
 [QQ]
-shock.png           /惊讶 /:O /jy /surprised
-curl-lip.png        /撇嘴 /:~ /pz /curl_lip
-desire.png          /色 /:* /se /desire
-dazed.png           /发呆 /:| /dazed
-party.png           /得意 /8-) /dy /revel
-crying.png          /:< /ll /cry
-bashful.png         /害羞 /:$ /hx /bashful
-shut-mouth.png      /闭嘴 /:X /bz /shut_mouth
-sleepy.png          /睡 /:Z /shui /sleep
-weep.png            /大哭 /:'( /dk /weep
-embarrassed.png     /尴尬 /:-| /gg /embarassed
-pissed-off.png      /发怒 /:@ /fn /pissed_off
-act-up.png          /调皮 /:P /tp /act_up
-smile-big.png       /呲牙 /:D /cy /toothy_smile
-smile.png           /微笑 /:) /wx /small_smile
-sad.png             /难过 /:( /ng /sad
-glasses-cool.png    /酷 /:+ /kuk /cool
-doctor.png          /非典 /:# /feid /SARS
-silly.png           /抓狂 /:Q /zk /crazy
-sick.png            /吐 /:T /tu /vomit
-snicker.png         /偷笑 /;p /tx /titter
-cute.png            /可爱 /;-D /ka /cute
-disdain.png         /白眼 /;d /by /disdain
-arrogant.png        /傲慢 /;o /am /arrogant
-starving.png        /饥饿 /:g /jie /starving
-yawn.png            /困 /|-) /kun /sleepy
-terror.png          /惊恐 /:! /jk /terror
-sweat.png           /流汗 /:L /sweat
-smirk.png           /憨笑 /:> /hanx /smirk
-soldier.png         /大兵 /:; /db /soldier
-struggle.png        /奋斗 /;f /fendou /struggle
-curse.png           /咒骂 /:-S /zhm /curse
-question.png        /疑问 /? /yiw /question
-quiet.png           /嘘... /;x /xu /shh
-hypnotized.png      /晕 /;@ /yun /dizzy
-excruciating.png    /折磨 /:8 /zhem /excrutiating
-freaked-out.png     /衰 /;! /shuai /freaked_out
-skeleton.png        /骷髅 /!!! /kl /skeleton
-hammer.png          /敲打 /xx  /qiao /hammer
-bye.png             /再见        /bye /zj /bye
-go-away.png         /闪人 /go /shan /go
-tremble.png         /发抖 /shake /fad /shake
-in-love.png         /爱情 /love /aiq /love
-jump.png            /跳 /jump /tiao /jump
-search.png          /找 /find /zhao /search
-lashes.png          /美眉 /& /mm /beautiful_eyebrows
-pig.png             /猪头 /pig /zt /pig
-cat.png             /猫咪 /cat /mm /cat
-dog.png             /小狗 /dog /xg /dog
-hug-left.png        /拥抱 /hug /yb /hug
-coins.png           /钱 /$ /qianc /money
-lamp.png            /灯泡 /! /dp /lightbulb
-bowl.png            /酒杯 /cup /bei /cup
-cake.png            /蛋糕 /cake /dg /cake
-thunder.png         /闪电 /li /shd /lightning
-bomb.png            /炸弹 /bome /zhd /bomb
-knife.png           /刀 /kn /dao /knife
-soccerball.png      /足球 /footb /zq /soccer
-musical-note.png    /音乐 /music /yy /music
-poop.png            /便便 /shit /bb /shit
-coffee.png          /咖啡 /coffee /kf /coffee
-eat.png             /饭 /eat /fan /eat
-pill.png            /药丸 /pill /yw /pill
-rose.png            /玫瑰 /rose /mg /rose
-wilt.png            /凋谢 /fade /dx /wilt
-kiss.png            /吻 /kiss /wen /kiss
-love.png            /爱心 /heart /xin /heart
-love-over.png       /心碎 /break /xs /broken_heart
-meeting.png         /会议 /meeting /hy /meeting
-present.png         /礼物 /gift /lw /gift
-phone.png           /电话 /phone /dh /phone
-clock.png           /时间 /time /sj /time
-mail.png            /邮件 /email /yj /email
-tv.png              /电视 /TV /ds /TV
-sun.png             /太阳 /sun /ty /sun
-moon.png            /月亮 /moon /yl /moon
-good.png            /强 /strong /qiang /thumbs_up
-bad.png             /弱 /weak /ruo /thumbs_down
-handshake.png       /握手 /share /ws /handshake
-victory.png         /胜利 /v /shl /victory
-beauty.png          /美女 /<J> /mn /beauty
-qq.png              /Q仔 /<QQ> /qz /qq
-blowkiss.png        /飞吻 /<L> /fw /blow_kiss
-angry.png           /怄火 /<O> /oh  /angry
-liquor.png          /白酒 /<B> /bj /baijiu
-can.png             /汽水 /<U> /qsh /soda
-watermelon.png      /西瓜 /<W> /xigua /watermelon
-rain.png            /下雨 /<!!> /xy /rain
-cloudy.png          /多云 /<~> /duoy /cloudy
-snowman.png         /雪人 /<Z> /xr /snowman
-star.png            /星星 /<*> /xixing /star
-girl.png            /女 /<00> /nv /woman
-boy.png             /男 /<11> /nan /man
+shock.png           /惊讶   /:O      /jy       /surprised
+curl-lip.png        /撇嘴   /:~      /pz       /curl_lip
+desire.png          /色     /:*      /se       /desire
+dazed.png           /发呆   /:|      /dazed
+party.png           /得意   /8-)     /dy       /revel
+crying.png          /流泪   /:<      /ll       /cry
+bashful.png         /害羞   /:$      /hx       /bashful
+shut-mouth.png      /闭嘴   /:X      /bz       /shut_mouth
+sleepy.png          /睡     /:Z      /shui     /sleep
+weep.png            /大哭   /:'(     /dk       /weep
+embarrassed.png     /尴尬   /:-|     /gg       /embarassed
+pissed-off.png      /发怒   /:@      /fn       /pissed_off
+act-up.png          /调皮   /:P      /tp       /act_up
+smile-big.png       /呲牙   /:D      /cy       /toothy_smile
+smile.png           /微笑   /:)      /wx       /small_smile
+sad.png             /难过   /:(      /ng       /sad
+glasses-cool.png    /酷     /:+      /kuk      /cool
+doctor.png          /非典   /:#      /feid     /SARS
+silly.png           /抓狂   /:Q      /zk       /crazy
+sick.png            /吐     /:T      /tu       /vomit
+snicker.png         /偷笑   /;p      /tx       /titter
+cute.png            /可爱   /;-D     /ka       /cute
+disdain.png         /白眼   /;d      /by       /disdain
+arrogant.png        /傲慢   /;o      /am       /arrogant
+starving.png        /饥饿   /:g      /jie      /starving
+yawn.png            /困     /|-)     /kun      /sleepy
+terror.png          /惊恐   /:!      /jk       /terror
+sweat.png           /流汗   /:L      /sweat
+smirk.png           /憨笑   /:>      /hanx     /smirk
+soldier.png         /大兵   /:;      /db       /soldier
+struggle.png        /奋斗   /;f      /fendou   /struggle
+curse.png           /咒骂   /:-S     /zhm      /curse
+question.png        /疑问   /?       /yiw      /question
+quiet.png           /嘘...  /;x      /xu       /shh
+hypnotized.png      /晕     /;@      /yun      /dizzy
+excruciating.png    /折磨   /:8      /zhem     /excrutiating
+freaked-out.png     /衰     /;!      /shuai    /freaked_out
+skeleton.png        /骷髅   /!!!     /kl       /skeleton
+hammer.png          /敲打   /xx      /qiao     /hammer
+bye.png             /再见   /bye     /zj       /bye
+go-away.png         /闪人   /go      /shan     /go
+tremble.png         /发抖   /shake   /fad      /shake
+in-love.png         /爱情   /love    /aiq      /love
+jump.png            /跳     /jump    /tiao     /jump
+search.png          /找     /find    /zhao     /search
+lashes.png          /美眉   /&       /mm       /beautiful_eyebrows
+pig.png             /猪头   /pig     /zt       /pig
+cat.png             /猫咪   /cat     /mm       /cat
+dog.png             /小狗   /dog     /xg       /dog
+hug-left.png        /拥抱   /hug     /yb       /hug
+coins.png           /钱     /$       /qianc    /money
+lamp.png            /灯泡   /!       /dp       /lightbulb
+bowl.png            /酒杯   /cup     /bei      /cup
+cake.png            /蛋糕   /cake    /dg       /cake
+thunder.png         /闪电   /li      /shd      /lightning
+bomb.png            /炸弹   /bome    /zhd      /bomb
+knife.png           /刀     /kn      /dao      /knife
+soccerball.png      /足球   /footb   /zq       /soccer
+musical-note.png    /音乐   /music   /yy       /music
+poop.png            /便便   /shit    /bb       /shit
+coffee.png          /咖啡   /coffee  /kf       /coffee
+eat.png             /饭     /eat     /fan      /eat
+pill.png            /药丸   /pill    /yw       /pill
+rose.png            /玫瑰   /rose    /mg       /rose
+wilt.png            /凋谢   /fade    /dx       /wilt
+kiss.png            /吻     /kiss    /wen      /kiss
+love.png            /爱心   /heart   /xin      /heart
+love-over.png       /心碎   /break   /xs       /broken_heart
+meeting.png         /会议   /meeting /hy       /meeting
+present.png         /礼物   /gift    /lw       /gift
+phone.png           /电话   /phone   /dh       /phone
+clock.png           /时间   /time    /sj       /time
+mail.png            /邮件   /email   /yj       /email
+tv.png              /电视   /TV      /ds       /TV
+sun.png             /太阳   /sun     /ty       /sun
+moon.png            /月亮   /moon    /yl       /moon
+good.png            /强     /strong  /qiang    /thumbs_up
+bad.png             /弱     /weak    /ruo      /thumbs_down
+handshake.png       /握手   /share   /ws       /handshake
+victory.png         /胜利   /v       /shl      /victory
+beauty.png          /美女   /<J>     /mn       /beauty
+qq.png              /Q仔    /<QQ>    /qz       /qq
+blowkiss.png        /飞吻   /<L>     /fw       /blow_kiss
+angry.png           /怄火   /<O>     /oh       /angry
+liquor.png          /白酒   /<B>     /bj       /baijiu
+can.png             /汽水   /<U>     /qsh      /soda
+watermelon.png      /西瓜   /<W>     /xigua    /watermelon
+rain.png            /下雨   /<!!>    /xy       /rain
+cloudy.png          /多云   /<~>     /duoy     /cloudy
+snowman.png         /雪人   /<Z>     /xr       /snowman
+star.png            /星星   /<*>     /xixing   /star
+girl.png            /女     /<00>    /nv       /woman
+boy.png             /男     /<11>    /nan      /man
 
 ### Following ICQ 5.1
 [ICQ]
@@ -300,7 +300,7 @@
 sweat.png           #:-S    #:-s
 rotfl.png           =))    
 #loser              L-)     l-)     MISSING/YAHOO 6: "Loser!"
-party.png	    <:-P    <:-p
+party.png           <:-P    <:-p
 cowboy.png          <):)
 desire.png          8->
 alien.png           =:)     >-)
@@ -333,7 +333,7 @@
 #yahoo_youkiddingme.gif  :-j     :-J     TODO
 
 ### These only work in a certain IMvironment
-#yahoo_malefighter1.gif	 o->     O->
-#yahoo_malefighter2.gif	 o=>     O=>
+#yahoo_malefighter1.gif o->     O->
+#yahoo_malefighter2.gif o=>     O=>
 #yahoo_femalefighter.gif o-+     O-+
 yin-yang.png        (%)
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/protocols/16/jabber.png
Binary file pidgin/pixmaps/protocols/16/jabber.png has changed
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/protocols/22/jabber.png
Binary file pidgin/pixmaps/protocols/22/jabber.png has changed
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/protocols/48/jabber.png
Binary file pidgin/pixmaps/protocols/48/jabber.png has changed
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/toolbar/16/Makefile.am
--- a/pidgin/pixmaps/toolbar/16/Makefile.am	Thu May 03 19:12:19 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am	Thu May 03 19:13:08 2007 +0000
@@ -10,6 +10,7 @@
 		insert-link.png \
 		message-new.png \
 		plugins.png \
+		send-file.png \
 		unblock.png
 
 pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/16
diff -r 9f9c486a8aca -r a26545a6409e pidgin/pixmaps/toolbar/16/send-file.png
Binary file pidgin/pixmaps/toolbar/16/send-file.png has changed