Merge Mxit changes from release-2.x.y

Tue, 05 Nov 2013 12:06:39 +0200

author
Andrew Victor <andrew.victor@mxit.com>
date
Tue, 05 Nov 2013 12:06:39 +0200
changeset 34508
0e7eae9a5223
parent 34504
188423493b57
child 34510
912c6885d616
child 35052
af1e4a48e628

Merge Mxit changes from release-2.x.y

libpurple/protocols/mxit/formcmds.c file | annotate | diff | comparison | revisions
pidgin/pixmaps/protocols/16/mxit.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/protocols/22/mxit.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/protocols/48/mxit.png file | annotate | diff | comparison | revisions
pidgin/pixmaps/protocols/scalable/mxit.svg file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/mxit/formcmds.c	Mon Nov 04 21:19:33 2013 +0100
+++ b/libpurple/protocols/mxit/formcmds.c	Tue Nov 05 12:06:39 2013 +0200
@@ -267,7 +267,7 @@
 
 	if (nm) {		/* indicates response must be a structured response */
 		gchar*	seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
-		gchar*	replycmd = g_strdup_printf("type=reply|nm=%s|res=%s|err=0", nm, replymsg);
+		gchar*	replycmd = g_strdup_printf("type=reply|nm=%s|res=%s|err=0", nm, purple_url_decode(replymsg));
 
 		mxit_add_html_link( mx, replycmd, TRUE, seltext );
 
@@ -298,7 +298,7 @@
 	char*	dest;
 
 	selmsg = g_hash_table_lookup(hash, "selmsg");			/* find the selection message */
-	if (selmsg) {
+	if (selmsg && (strlen(selmsg) > 0)) {
 		text = g_markup_escape_text(purple_url_decode(selmsg), -1);
 	}
 
Binary file pidgin/pixmaps/protocols/16/mxit.png has changed
Binary file pidgin/pixmaps/protocols/22/mxit.png has changed
Binary file pidgin/pixmaps/protocols/48/mxit.png has changed
--- a/pidgin/pixmaps/protocols/scalable/mxit.svg	Mon Nov 04 21:19:33 2013 +0100
+++ b/pidgin/pixmaps/protocols/scalable/mxit.svg	Tue Nov 05 12:06:39 2013 +0200
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="48px" height="48px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
-<image overflow="visible" width="34" height="39" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA
-EAMCAwYAAAH0AAACSgAAA6n/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX
-Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa
-JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACgAIwMBIgACEQEDEQH/
-xACyAAEAAwEBAAAAAAAAAAAAAAAAAQMFBAIBAAMBAQAAAAAAAAAAAAAAAAABAgMEEAABBAECBgMB
-AAAAAAAAAAABAAIDBAUREyESIhQVRRAjNQYRAAEDAgMDBwgLAAAAAAAAAAERAgMAEiETBDFRIkFh
-cUIUhcWhMlKDs9M01GKSIzNzwyRkhJQVEgABAwAGCQUAAAAAAAAAAAAAARECIUFRYYESEDFxodEy
-QoKicjNDNIT/2gAMAwEAAhEDEQAAANWbtDvwx51+eStam/NlFqUEyBo7eck8dAFoyr//2gAIAQIA
-AQUAe+RpEry7QJ4POA4FDeR3V9q//9oACAEDAAEFAAAUWjRDTTh8dC6V0r//2gAIAQEAAQUAiihn
-hNOsu1rBMr0HLks9hi7UdSE5ytyx5evM/J6dx6rCcInfp3ON2+CZfVY1z46RMm9IHyveZpW+q8Vc
-rtkr51qbF/QEx0s04eCg2//aAAgBAgIGPwBoxWSbRIyisXvNSfZsJrbFYkFblRlP1FOTHK+J8fid
-XuefE//aAAgBAwIGPwCmTDpJzsE9Tkrzs0VlXLuP/9oACAEBAQY/AIZ54GanU6mJk8sksTZnEyNa
-9Be11rW3IAMK+ChH8SP3dY6KH+pH7uvhNORy2wxscOhzGtc01n9rmvzP85bup2zs2b+JZ1q0csgJ
-adHC3hRVMcR5SN1XWSIqLw7fr0GNa8KQ242oC7Aea4moCAFc14cd4FqV3n4lWjP7KL2cNXfT/Kph
-3ZPtDUL0Nrbmk7i61K7z8SrQyNAd+khaQSm2OPmO6s5G3XXWrgllm1KLyjCjbUN2LSXLsFBha0BW
-kkOJ80g7Leau8vEqy9HPEdO0/ZRTxOe6NvoNeyWPhHIow31wt0rvVS/MVjHph6qX5iuKXTQr1mwv
-Lhzi+dwXpFZWdNZk5SX9fMzs/Z95fivkr//Z" transform="matrix(0.9999 0 0 0.9999 7.0146 6.0142)">
-</image>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-0.5654" y1="38.3721" x2="-1.3676" y2="-7.5858" gradientTransform="matrix(1 0 0 -1 24.9448 39.3594)">
+		<stop  offset="0" style="stop-color:#D67B43"/>
+		<stop  offset="0.2638" style="stop-color:#D16841"/>
+		<stop  offset="1" style="stop-color:#CB222B"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M1,23.964c0,17.022,5.954,22.978,22.978,22.978s22.978-5.953,22.978-22.978
+		C46.956,7.315,41.254,1.259,25.077,1h-2.194C6.702,1.259,1,7.315,1,23.964"/>
+	<g>
+		<rect x="20.251" y="22.668" fill="#FFFFFF" width="6.656" height="12.984"/>
+		<path fill="#FFFFFF" d="M30.659,12.288h-20.03v5.796l0,0c0,0.003,0,0.007,0,0.011c0,0.478,0.387,0.864,0.865,0.864
+			c0.008,0,0.017-0.002,0.027-0.002c0,0.002,0,0.003,0.002,0.005h15.795c0,0,3.34,0,3.34,3.34v10.012
+			c0,1.947,1.39,3.338,3.336,3.338h3.331V18.714C37.156,12.291,30.659,12.288,30.659,12.288z"/>
+		<path fill="#FFFFFF" d="M10.629,32.314c0,1.949,1.391,3.338,3.337,3.338h3.322V22.657h-6.659V32.314z"/>
+	</g>
+</g>
 </svg>

mercurial