Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

35 files changed, 12126 insertions, 0 deletions

diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..e48667d52
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=bitlbee
+pkgname=bitlbee-libre-nonprism
+pkgver=3.2
+pkgrel=3
+pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
+url='http://www.bitlbee.org/'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('gnutls' 'glib2')
+makedepends=('asciidoc' 'libotr3')
+optdepends=('libotr3: for OTR encryption support'
+            'xinetd: to run bitlbee through xinetd')
+provides=$_pkgname=$pkgver
+conflicts=$_pkgname
+replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
+source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
+        'xinetd'
+        'bitlbee.tmpfiles')
+sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+        'etc/bitlbee/motd.txt'
+        'etc/xinetd.d/bitlbee')
+install=bitlbee.install
+
+build() {
+  cd "$_pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --etcdir=/etc/bitlbee \
+    --sbindir=/usr/bin \
+    --pidfile=/run/bitlbee/bitlbee.pid \
+    --ipcsocket=/run/bitlbee/bitlbee.sock \
+    --systemdsystemunitdir=/usr/lib/systemd/system \
+    --jabber=1 \
+    --msn=0 \
+    --oscar=0 \
+    --yahoo=0 \
+    --twitter=0 \
+    --purple=0 \
+    --ssl=gnutls \
+    --strip=0 \
+    --otr=plugin \
+    --skype=0
+
+  # hacky: build against libotr3
+  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
+  sed -i 's,#include.*libotr,&3,' otr.h
+
+  make
+}
+
+package() {
+  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+
+  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
+  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
+  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-libre-nonprism/bitlbee.install
new file mode 100644
index 000000000..aa5a81a70
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.install
@@ -0,0 +1,15 @@
+post_install() {
+	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
+	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+	systemd-tmpfiles --create bitlbee.conf
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
+	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+	true
+}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd
new file mode 100644
index 000000000..68d5663b3
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/xinetd
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/bin/bitlbee
+        port = 6667
+        disable = yes
+}
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
new file mode 100644
index 000000000..378664976
--- /dev/null
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: uvok <uvok at online dot de>
+# Contributor: Urist <9362773 at gmail.com>
+
+_pkgname=bti
+pkgname=bti-nonprism
+pkgver=033
+pkgrel=1.1
+pkgdesc='Console client for status.net, without Twitter support'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://gregkh.github.com/bti/'
+license=('GPL')
+depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
+provides=$_pkgname
+conflicts=$_pkgname
+replaces=$_pkgname
+source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
+        nonprism.patch)
+sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753'
+            '184f2a134d44ae4c901ffdc824f833b477148f146e23f5d3680496658c9ca393')
+
+prepare() {
+  cd ${srcdir}/$_pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/nonprism.patch
+}
+
+build() {
+  cd ${srcdir}/$_pkgname-$pkgver
+  ./configure --prefix=/usr
+
+  make
+}
+
+package() {
+  cd ${srcdir}/$_pkgname-$pkgver
+  
+  make DESTDIR=${pkgdir} install
+}
+
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch
new file mode 100644
index 000000000..009c26d1e
--- /dev/null
+++ b/nonprism/bti-nonprism/nonprism.patch
@@ -0,0 +1,443 @@
+diff -Nur bti-033/bti.1 bti-nonprism/bti.1
+--- bti-033/bti.1	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.1	2013-08-21 18:24:32.693871946 -0300
+@@ -28,23 +28,23 @@
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+ .SH "NAME"
+-bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
++bti \- send a tweet to status\&.net from the command line
+ .SH "SYNOPSIS"
+ .HP \w'\fBbti\fR\ 'u
+ \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
+ .SH "DESCRIPTION"
+ .PP
+-bti sends a tweet message to twitter\&.com or identi\&.ca\&.
++bti sends a tweet message to status\&.net\&.
+ .SH "OPTIONS"
+ .PP
+ \fB\-\-account account\fR
+ .RS 4
+-Specify the twitter\&.com or identi\&.ca account name\&.
++Specify the status\&.net account name\&.
+ .RE
+ .PP
+ \fB\-\-password password\fR
+ .RS 4
+-Specify the password of your twitter\&.com or identi\&.ca account\&.
++Specify the password of your status\&.net account\&.
+ .RE
+ .PP
+ \fB\-\-action action\fR
+@@ -59,9 +59,9 @@
+ .PP
+ \fB\-\-host HOST_NAME\fR
+ .RS 4
+-Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com and "identica" to send to identi\&.ca\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses
++Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses
+ .sp
+-If no host is specified, the default is to send to twitter\&.com\&.
++If no host is specified, the default is to send to status\&.net\&.
+ .RE
+ .PP
+ \fB\-\-proxy PROXY:PORT\fR
+@@ -85,8 +85,6 @@
+ .RS 4
+ Status ID of a single post to which you want to create a threaded reply to\&.
+ .sp
+-For twitter, this is ignored unless the message starts with the @name of the owner of the post with the status ID\&.
+-.sp
+ For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&.
+ .RE
+ .PP
+@@ -167,12 +165,12 @@
+ .PP
+ \fBaccount\fR
+ .RS 4
+-The twitter\&.com or identi\&.ca account name you wish to use to send this message with\&.
++The status\&.net account name you wish to use to send this message with\&.
+ .RE
+ .PP
+ \fBpassword\fR
+ .RS 4
+-The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
++The status\&.net password for the account you wish to use to send this message with\&.
+ .RE
+ .PP
+ \fB\-\-action action\fR
+@@ -187,7 +185,7 @@
+ .PP
+ \fBhost\fR
+ .RS 4
+-The host you want to use to send the message to\&. Valid options are either "twitter" or "identica" to send to twitter\&.com or identi\&.ca respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses\&.
++The host you want to use to send the message to\&. Valid options are either "statusnet" to send to status\&.net respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses\&.
+ .RE
+ .PP
+ \fBproxy\fR
+diff -Nur bti-033/bti-bashcompletion bti-nonprism/bti-bashcompletion
+--- bti-033/bti-bashcompletion	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti-bashcompletion	2013-08-21 18:19:46.889928804 -0300
+@@ -12,7 +12,7 @@
+ 	fi
+ 
+ 	if [[ "${prev}" == "--host" ]] ; then
+-		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
++		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
+ 	fi
+ 
+ 	if [[ "${prev}" == "--action" ]] ; then
+diff -Nur bti-033/bti.c bti-nonprism/bti.c
+--- bti-033/bti.c	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.c	2013-08-21 18:31:54.013583020 -0300
+@@ -53,7 +53,7 @@
+ 
+ static void display_help(void)
+ {
+-	fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"
++	fprintf(stdout, "bti - send tweet to status.net\n"
+ 		"Version: %s\n"
+ 		"Usage:\n"
+ 		"  bti [options]\n"
+@@ -258,19 +258,12 @@
+ 	free(buffer);
+ }
+ 
+-const char twitter_host[]  = "http://api.twitter.com/1.1/statuses";
+-const char twitter_host_stream[]  = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */
+-const char twitter_host_simple[]  = "http://api.twitter.com/1.1";
+-const char identica_host[] = "https://identi.ca/api/statuses";
+-const char twitter_name[]  = "twitter";
+-const char identica_name[] = "identi.ca";
+-
+-static const char twitter_request_token_uri[]  = "https://twitter.com/oauth/request_token";
+-static const char twitter_access_token_uri[]   = "https://twitter.com/oauth/access_token";
+-static const char twitter_authorize_uri[]      = "https://twitter.com/oauth/authorize?oauth_token=";
+-static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
+-static const char identica_access_token_uri[]  = "https://identi.ca/api/oauth/access_token";
+-static const char identica_authorize_uri[]     = "https://identi.ca/api/oauth/authorize?oauth_token=";
++const char statusnet_host[] = "https://status.net/api/statuses";
++const char statusnet_name[] = "status.net";
++
++static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
++static const char statusnet_access_token_uri[]  = "https://status.net/api/oauth/access_token";
++static const char statusnet_authorize_uri[]     = "https://status.net/api/oauth/authorize?oauth_token=";
+ static const char custom_request_token_uri[]   = "/../oauth/request_token?oauth_callback=oob";
+ static const char custom_access_token_uri[]    = "/../oauth/access_token";
+ static const char custom_authorize_uri[]       = "/../oauth/authorize?oauth_token=";
+@@ -855,14 +848,9 @@
+ 	if (!session)
+ 		return -EINVAL;
+ 
+-	if (session->host == HOST_TWITTER)
+-		request_url = oauth_sign_url2(
+-				twitter_request_token_uri, NULL,
+-				OA_HMAC, NULL, session->consumer_key,
+-				session->consumer_secret, NULL, NULL);
+-	else if (session->host == HOST_IDENTICA)
++	if (session->host == HOST_STATUSNET)
+ 		request_url = oauth_sign_url2(
+-				identica_request_token_uri, NULL,
++				statusnet_request_token_uri, NULL,
+ 				OA_HMAC, NULL, session->consumer_key,
+ 				session->consumer_secret, NULL, NULL);
+ 	else {
+@@ -893,16 +881,11 @@
+ 		"Please open the following link in your browser, and "
+ 		"allow 'bti' to access your account. Then paste "
+ 		"back the provided PIN in here.\n");
+-	if (session->host == HOST_TWITTER) {
+-		fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
++	if (session->host == HOST_STATUSNET) {
++		fprintf(stdout, "%s%s\nPIN: ", statusnet_authorize_uri, at_key);
+ 		verifier = session->readline(NULL);
+ 		sprintf(at_uri, "%s?oauth_verifier=%s",
+-			twitter_access_token_uri, verifier);
+-	} else if (session->host == HOST_IDENTICA) {
+-		fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
+-		verifier = session->readline(NULL);
+-		sprintf(at_uri, "%s?oauth_verifier=%s",
+-			identica_access_token_uri, verifier);
++			statusnet_access_token_uri, verifier);
+ 	} else {
+ 		fprintf(stdout, "%s%s%s\nPIN: ",
+ 			session->hosturl, custom_authorize_uri, at_key);
+@@ -956,7 +939,7 @@
+ 		return -EINVAL;
+ 
+ 	if (!session->hosturl)
+-		session->hosturl = strdup(twitter_host);
++		session->hosturl = strdup(statusnet_host);
+ 
+ 	if (session->no_oauth || session->guest) {
+ 		curl_buf = bti_curl_buffer_alloc(session->action);
+@@ -971,7 +954,7 @@
+ 		}
+ 
+ 		if (!session->hosturl)
+-			session->hosturl = strdup(twitter_host);
++			session->hosturl = strdup(statusnet_host);
+ 
+ 		switch (session->action) {
+ 		case ACTION_UPDATE:
+@@ -1032,7 +1015,7 @@
+ 
+ 		case ACTION_PUBLIC:
+ 			/*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/
+-			snprintf(endpoint, endpoint_size, "%s%s", twitter_host_stream,
++			snprintf(endpoint, endpoint_size, "%s%s", statusnet_host,
+ 				public_uri);
+ 			curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+ 			break;
+@@ -1045,7 +1028,6 @@
+ 			break;
+ 
+ 		case ACTION_DIRECT:
+-		    /* NOT IMPLEMENTED - twitter requires authentication anyway */
+ 			break;
+ 
+ 		default:
+@@ -1125,7 +1107,6 @@
+ 	} else {
+ 		switch (session->action) {
+ 		case ACTION_UPDATE:
+-			/* dont test it here, let twitter return an error that we show */
+ 			if (strlen_utf8(session->tweet) > 140 + 1000 ) {
+ 				printf("E: tweet is too long!\n");
+ 				goto skip_tweet;
+@@ -1156,7 +1137,7 @@
+ 				mentions_uri, session->page);
+ 			break;
+ 		case ACTION_PUBLIC:
+-			sprintf(endpoint, "%s%s", twitter_host_stream,
++			sprintf(endpoint, "%s%s", statusnet_host,
+ 				public_uri);
+ 			break;
+ 		case ACTION_GROUP:
+@@ -1175,7 +1156,7 @@
+ 			break;
+ 		case ACTION_DIRECT:
+ 			escaped_tweet = oauth_url_escape(session->tweet);
+-			sprintf(endpoint, "%s%s?user=%s&text=%s", twitter_host_simple,
++			sprintf(endpoint, "%s%s?user=%s&text=%s", statusnet_host,
+ 				direct_uri, session->user, escaped_tweet);
+ 			is_post = 1;
+ 			break;
+@@ -1766,14 +1747,10 @@
+ 				free(session->hosturl);
+ 			if (session->hostname)
+ 				free(session->hostname);
+-			if (strcasecmp(optarg, "twitter") == 0) {
+-				session->host = HOST_TWITTER;
+-				session->hosturl = strdup(twitter_host);
+-				session->hostname = strdup(twitter_name);
+-			} else if (strcasecmp(optarg, "identica") == 0) {
+-				session->host = HOST_IDENTICA;
+-				session->hosturl = strdup(identica_host);
+-				session->hostname = strdup(identica_name);
++			if (strcasecmp(optarg, "statusnet") == 0) {
++				session->host = HOST_STATUSNET;
++				session->hosturl = strdup(statusnet_host);
++				session->hostname = strdup(statusnet_name);
+ 			} else {
+ 				session->host = HOST_CUSTOM;
+ 				session->hosturl = strdup(optarg);
+@@ -1829,31 +1806,8 @@
+ 	if (debug)
+ 		display_version();
+ 
+-	if (session->host == HOST_TWITTER) {
+-		if (!session->consumer_key || !session->consumer_secret) {
+-			if (session->action == ACTION_USER ||
+-					session->action == ACTION_PUBLIC) {
+-				/*
+-				 * Some actions may still work without
+-				 * authentication
+-				 */
+-				session->guest = 1;
+-			} else {
+-				fprintf(stderr,
+-						"Twitter no longer supports HTTP basic authentication.\n"
+-						"Both consumer key, and consumer secret are required"
+-						" for bti in order to behave as an OAuth consumer.\n");
+-				goto exit;
+-			}
+-		}
+-		if (session->action == ACTION_GROUP) {
+-			fprintf(stderr, "Groups only work in Identi.ca.\n");
+-			goto exit;
+-		}
+-	} else {
+-		if (!session->consumer_key || !session->consumer_secret)
+-			session->no_oauth = 1;
+-	}
++	if (!session->consumer_key || !session->consumer_secret)
++		session->no_oauth = 1;
+ 
+ 	if (session->no_oauth) {
+ 		if (!session->account) {
+diff -Nur bti-033/bti.example bti-nonprism/bti.example
+--- bti-033/bti.example	2012-06-22 18:45:42.000000000 -0300
++++ bti-nonprism/bti.example	2013-08-21 18:24:54.398011375 -0300
+@@ -5,7 +5,7 @@
+ # a message.
+ account=twitmaster
+ password=icanhascheezburger
+-host=identica
++host=statusnet
+ # Example of a custom StatusNet installation
+ #host=http://army.twit.tv/api/statuses
+ logfile=.bti.log
+diff -Nur bti-033/bti.h bti-nonprism/bti.h
+--- bti-033/bti.h	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.h	2013-08-21 18:19:22.865702111 -0300
+@@ -17,8 +17,7 @@
+ #define __BTI_H
+ 
+ enum host {
+-	HOST_TWITTER  = 0,
+-	HOST_IDENTICA = 1,
++	HOST_STATUSNET = 1,
+ 	HOST_CUSTOM   = 2
+ };
+ 
+@@ -76,10 +75,8 @@
+ 	int length;
+ };
+ 
+-extern const char twitter_host[];
+-extern const char identica_host[];
+-extern const char twitter_name[];
+-extern const char identica_name[];
++extern const char statusnet_host[];
++extern const char statusnet_name[];
+ extern int debug;
+ 
+ extern void bti_parse_configfile(struct session *session);
+diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
+--- bti-033/bti.xml	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.xml	2013-08-21 18:22:20.722310079 -0300
+@@ -21,7 +21,7 @@
+ 
+       <refnamediv>
+         <refname>bti</refname>
+-        <refpurpose>send a tweet to twitter.com or identi.ca from the command line</refpurpose>
++        <refpurpose>send a tweet to status.net from the command line</refpurpose>
+       </refnamediv>
+ 
+       <refsynopsisdiv>
+@@ -49,7 +49,7 @@
+       </refsynopsisdiv>
+ 
+       <refsect1><title>DESCRIPTION</title>
+-        <para>bti sends a tweet message to twitter.com or identi.ca.
++        <para>bti sends a tweet message or status.net.
+         </para>
+       </refsect1>
+ 
+@@ -59,7 +59,7 @@
+             <term><option>--account account</option></term>
+             <listitem>
+               <para>
+-	        Specify the twitter.com or identi.ca account name.
++	        Specify the status.net account name.
+ 	      </para>
+             </listitem>
+           </varlistentry>
+@@ -67,7 +67,7 @@
+             <term><option>--password password</option></term>
+             <listitem>
+               <para>
+-                Specify the password of your twitter.com or identi.ca account.
++                Specify the password of your status.net account.
+               </para>
+             </listitem>
+           </varlistentry>
+@@ -100,15 +100,15 @@
+             <listitem>
+               <para>
+ 		Specify the host which you want to send your message to.  Valid
+-		options are "twitter" to send to twitter.com and "identica" to
+-        send to identi.ca.
++		options are "statusnet" to
++        send to status.net.
+ 
+         If you want to send the message to a custom StatusNet installation,
+-        you should specify the API URI. For example identi.ca's URI is:
+-        https://identi.ca/api/statuses
++        you should specify the API URI. For example status.net's URI is:
++        https://status.net/api/statuses
+               </para>
+               <para>
+-		If no host is specified, the default is to send to twitter.com.
++		If no host is specified, the default is to send to status.net.
+               </para>
+             </listitem>
+           </varlistentry>
+@@ -154,10 +154,6 @@
+ 		reply to.
+ 	      </para>
+ 	      <para>
+-	        For twitter, this is ignored unless the message starts with the
+-		@name of the owner of the post with the status ID.
+-	      </para>
+-	      <para>
+ 	        For status.net, this can link any two messages into context with
+ 		each other. Status.net will also link a message that contains an
+ 		@name without this without regard to context.
+@@ -306,7 +302,7 @@
+              <term><option>account</option></term>
+              <listitem>
+                <para>
+-                 The twitter.com or identi.ca account name you wish to use to send this
++                 The status.net account name you wish to use to send this
+                  message with.
+                </para>
+              </listitem>
+@@ -315,7 +311,7 @@
+              <term><option>password</option></term>
+              <listitem>
+                <para>
+-                 The twitter.com or identi.ca password for the account you wish to use
++                 The status.net password for the account you wish to use
+                  to send this message with.
+                </para>
+              </listitem>
+@@ -346,12 +342,12 @@
+              <listitem>
+                <para>
+ 		 The host you want to use to send the message to.  Valid
+-		 options are either "twitter" or "identica" to send to
+-		 twitter.com or identi.ca respectively.
++		 options are either "statusnet" to send to
++		 status.net respectively.
+ 
+          If you want to send the message to a custom StatusNet installation,
+-         you should specify the API URI. For example identi.ca's URI is:
+-         https://identi.ca/api/statuses.
++         you should specify the API URI. For example status.net's URI is:
++         https://status.net/api/statuses.
+                </para>
+              </listitem>
+            </varlistentry>
+diff -Nur bti-033/config.c bti-nonprism/config.c
+--- bti-033/config.c	2013-04-23 20:18:04.000000000 -0300
++++ bti-nonprism/config.c	2013-08-21 18:17:39.798533227 -0300
+@@ -219,14 +219,10 @@
+ 
+ static int host_callback(struct session *session, char *value)
+ {
+-	if (strcasecmp(value, "twitter") == 0) {
+-		session->host = HOST_TWITTER;
+-		session->hosturl = strdup(twitter_host);
+-		session->hostname = strdup(twitter_name);
+-	} else if (strcasecmp(value, "identica") == 0) {
+-		session->host = HOST_IDENTICA;
+-		session->hosturl = strdup(identica_host);
+-		session->hostname = strdup(identica_name);
++	if (strcasecmp(value, "statusnet") == 0) {
++		session->host = HOST_STATUSNET;
++		session->hosturl = strdup(statusnet_host);
++		session->hostname = strdup(statusnet_name);
+ 	} else {
+ 		session->host = HOST_CUSTOM;
+ 		session->hosturl = strdup(value);
diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim-nonprism/PKGBUILD
new file mode 100644
index 000000000..1863e006b
--- /dev/null
+++ b/nonprism/centerim-nonprism/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: shild <sxp@bk.ru>
+
+_pkgname=centerim
+pkgname=centerim-nonprism
+pkgver=4.22.10
+pkgrel=2
+pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface, without support for unsafe and dangerous for privacy protocols"
+arch=('i686' 'x86_64')
+url="http://www.centerim.org"
+license=('GPL')
+depends=('python2' 'libjpeg' 'gpgme')
+replaces=("$_pkgname" 'centericq')
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://www.centerim.org/download/releases/$_pkgname-$pkgver.tar.gz"
+        'nonprism.patch')
+md5sums=('7565c3c8cac98a4e2d8524076a44676f'
+         '74887744683b68ea37d4d020c80fb675')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  # add patch to remove more protocols
+  patch -Np1 -i "${srcdir}/nonprism.patch"
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  sed -i 's#python#python2#' misc/CenterIMLog2HTML.py
+  sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
+  ./configure --prefix=/usr \
+              --with-ssl \
+              --with-openssl \
+              --enable-locales-fix \
+              --disable-icq \
+              --disable-yahoo \
+              --disable-aim \
+              --disable-gg \
+              --disable-msn
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/centerim-nonprism/nonprism.patch b/nonprism/centerim-nonprism/nonprism.patch
new file mode 100644
index 000000000..43c732966
--- /dev/null
+++ b/nonprism/centerim-nonprism/nonprism.patch
@@ -0,0 +1,14 @@
+diff --git a/firetalk/Makefile.am b/firetalk/Makefile.am
+index cf14403..dab773d 100644
+--- a/firetalk/Makefile.am
++++ b/firetalk/Makefile.am
+@@ -1,7 +1,7 @@
+ noinst_LIBRARIES = libfiretalk.a
+-EXTRA_DIST = aim.c irc.c toc.c firetalk.c safestring.c oscar.c aim.h toc.h firetalk-int.h firetalk.h safestring.h oscar.h toc2_uuids.h
++EXTRA_DIST = irc.c firetalk.c safestring.c firetalk-int.h firetalk.h safestring.h
+ AUTOMAKE_OPTIONS = foreign
+-libfiretalk_a_SOURCES =  aim.c irc.c toc.c firetalk.c safestring.c oscar.c
++libfiretalk_a_SOURCES =  irc.c firetalk.c safestring.c
+ 
+ SUBDIRS = 
+ AM_CPPFLAGS = -I$(top_srcdir)/../connwrap -I$(top_srcdir)/../connwrap
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
new file mode 100644
index 000000000..cf5c374b0
--- /dev/null
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $
+# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Emanuele Rossi <newdna1510@yahoo.it>
+# Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=choqok
+pkgname=choqok-nonprism
+pkgver=1.4
+pkgrel=1
+pkgdesc="A status.net client for KDE, without Twitter support"
+url='http://choqok.gnufolks.org/'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+optdepends=('kdebase-konqueror-libre: proxy support')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
+makedepends=('cmake' 'automoc4')
+optdepends=('kdebase-konqueror-libre: proxy support')
+install="${_pkgname}.install"
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
+md5sums=('2efe34ed903b448a21d9233d8033dbdb')
+
+prepare() {
+  mkdir build
+
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services
+  sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt
+  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp
+  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp
+
+  # remove uploaders plugin (with only nonprivacy services)
+  sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt
+  sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop
+
+  # remove twitter on docbook
+  sed -i 's| and Twitter.com||
+          s| and another with the alias|.</para>|
+          s|while a post using Twitter is called a tweet||
+          \|Twitter|d;\|twitter|d' doc/index.docbook
+}
+
+build() {
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/choqok-nonprism/choqok.install b/nonprism/choqok-nonprism/choqok.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/choqok-nonprism/choqok.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..099b6e1a0
--- /dev/null
+++ b/nonprism/claws-mail-libre-nonprism/PKGBUILD
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=claws-mail
+pkgname=$_pkgname-libre-nonprism
+pkgver=3.9.2
+pkgrel=3.1
+pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support'
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL3')
+url="http://www.$_pkgname.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
+         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
+             # dependencies for plugins
+             'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
+             #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+optdepends=('python2:           needed for some tools and python plugin'
+            'perl:              needed for some tools and perl plugin'
+            'spamassassin:      adds support for spamfiltering'
+            'bogofilter:        adds support for spamfiltering'
+            'libnotify:         for notification plugin'
+            'libcanberra:       for notification plugin'
+            'dbus:              for notification plugin'
+            'libxml2:           for gtkhtml2_viewer and rssyl plugins'
+            'curl:              for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive:        for archive plugin and various other plugins'
+            'libytnef:          for tnef_parse plugin'
+            'webkitgtk2:        for the fancy webkit html plugin'
+            'libsoup:           for the fancy webkit html plugin'
+	        'poppler-glib:      for pdf viewer plugin'
+	        'ghostscript:       for pdf viewer plugin')
+replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre")
+conflicts=("$_pkgname" "$_pkgname-extra-plugins")
+provides=("$_pkgname=$pkgver" 'claws')
+options=(!libtool)
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
+         'SKIP')
+
+build() {
+  cd $srcdir/$_pkgname-$pkgver
+
+  # fixes for python2
+  export PYTHON="/usr/bin/python2"
+  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+  sed -i 's:python -c:python2 -c:g' configure
+
+  setarch $CARCH ./configure --prefix=/usr --disable-static \
+    --enable-enchant \
+    --enable-gnutls \
+    --enable-ldap \
+    --enable-crash-dialog \
+    --enable-pgpmime-plugin \
+    --enable-spamassassin-plugin \
+    --enable-bogofilter-plugin \
+    --disable-jpilot \
+    --disable-gdata-plugin
+    #--help
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  # build and install extra tools
+  cd tools
+  setarch $CARCH make
+   # all executables and .conf files ; only top directory
+  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
+    install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
+  done
+}
diff --git a/nonprism/claws-mail-libre-nonprism/claws-mail.install b/nonprism/claws-mail-libre-nonprism/claws-mail.install
new file mode 100644
index 000000000..4d2f155d4
--- /dev/null
+++ b/nonprism/claws-mail-libre-nonprism/claws-mail.install
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
diff --git a/nonprism/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
new file mode 100644
index 000000000..50c3fa399
--- /dev/null
+++ b/nonprism/empathy-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 194415 2013-09-16 09:02:51Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+_pkgname=empathy
+pkgname=empathy-nonprism
+pkgver=3.8.4
+pkgrel=1
+pkgdesc="A GNOME instant messaging client using the Telepathy framework, without telepathy-haze recommendation"
+arch=(i686 x86_64)
+url="http://live.gnome.org/Empathy"
+license=(GPL2)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+makedepends=(intltool itstool docbook-xsl python2)
+optdepends=('telepathy-gabble: XMPP/Jabber support'
+            'telepathy-idle: IRC support'
+            'telepathy-salut: Link-local XMPP support'
+            'telepathy-rakia: SIP support')
+options=('!libtool' '!makeflags')
+groups=(gnome)
+install=empathy.install
+replaces=("$_pkgname" 'empathy-coherence')
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9')
+
+build() {
+  cd $_pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --sysconfdir=/etc  \
+      --libexecdir=/usr/lib/empathy \
+      --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/empathy-nonprism/empathy.install b/nonprism/empathy-nonprism/empathy.install
new file mode 100644
index 000000000..4c5b64313
--- /dev/null
+++ b/nonprism/empathy-nonprism/empathy.install
@@ -0,0 +1,16 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    echo "To use Empathy you need to install at least one Telepathy connection manager."
+}
+
+post_upgrade() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_remove() {
+    post_upgrade
+}
\ No newline at end of file
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD
new file mode 100644
index 000000000..010f3eb7b
--- /dev/null
+++ b/nonprism/eog-plugins-nonprism/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=eog-plugins
+pkgname=eog-plugins-nonprism
+pkgver=3.8.1
+pkgrel=2
+pkgdesc="Plugins for Eye of Gnome, without libgdata support"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/"
+license=('GPL2')
+depends=('eog' 'libchamplain')
+makedepends=('intltool')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+replaces=$_pkgname
+install=eog-plugins.install
+options=('!libtool')
+source=(http://download.gnome.org/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9')
+
+build() {
+  cd $_pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/nonprism/eog-plugins-nonprism/eog-plugins.install b/nonprism/eog-plugins-nonprism/eog-plugins.install
new file mode 100644
index 000000000..24072f316
--- /dev/null
+++ b/nonprism/eog-plugins-nonprism/eog-plugins.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
new file mode 100644
index 000000000..96caee984
--- /dev/null
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+
+_pkgname=evolution-data-server
+pkgname=evolution-data-server-nonprism
+pkgver=3.8.5
+pkgrel=1
+pkgdesc="Centralized access to appointments and contacts without libgdata support"
+arch=(i686 x86_64)
+depends=(nss krb5 libical db libxml2 libsoup gtk3 libsecret gcr)
+makedepends=(intltool gperf gobject-introspection vala python2 gnome-common)
+options=('!libtool')
+install=$_pkgname.install
+url="http://www.gnome.org"
+license=(GPL)
+replaces=("$_pkgname" 'evolution-data-server-coherence')
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a')
+
+
+build() {
+  cd "$_pkgname-$pkgver"
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --with-openldap=yes \
+      --libexecdir=/usr/lib/evolution-data-server \
+      --with-krb5=/usr --with-libdb=/usr \
+      --without-libgdata \
+      --disable-goa \
+      --disable-google \
+      --disable-weather \
+      --enable-vala-bindings --disable-uoa PYTHON=python2
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  make
+}
+
+package() {
+  cd "$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/evolution-data-server-nonprism/evolution-data-server.install b/nonprism/evolution-data-server-nonprism/evolution-data-server.install
new file mode 100644
index 000000000..e75920e11
--- /dev/null
+++ b/nonprism/evolution-data-server-nonprism/evolution-data-server.install
@@ -0,0 +1,11 @@
+post_install () {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade () {
+    post_install
+}
+
+post_remove () {
+    post_install
+}
\ No newline at end of file
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
new file mode 100644
index 000000000..d91e396f5
--- /dev/null
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 193763 2013-08-30 13:15:23Z heftig $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=gnome-online-accounts
+pkgname=gnome-online-accounts-nonprism
+pkgver=3.8.3
+pkgrel=1
+pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
+arch=(i686 x86_64 mips64el)
+url="http://www.gnome.org"
+license=('GPL')
+depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
+makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+replaces=($_pkgname $pkgname-coherence)
+options=(!libtool)
+install=$_pkgname.install
+source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b')
+ 
+build() {
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts \
+    --disable-google \
+    --enable-owncloud \
+    --disable-facebook \
+    --disable-windows-live \
+    --disable-exchange \
+    --disable-flickr \
+    --enable-imap-smtp \
+    --disable-kerberos
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
new file mode 100644
index 000000000..525ecff63
--- /dev/null
+++ b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
@@ -0,0 +1,11 @@
+post_install () {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..bd4532a4f
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=kdenetwork-kopete
+pkgname=kdenetwork-kopete-libre-nonprism
+pkgver=4.11.1
+pkgrel=1
+pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
+url='http://kde.org/applications/internet/kopete/'
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libidn'
+         'qimageblitz' 'mediastreamer' 'jsoncpp')
+makedepends=('cmake' 'automoc4' 'boost')
+install=${_pkgname}.install
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
+        'libotr3.patch'
+        'mediastreamer29.patch'
+        'libre-nonprism.patch')
+sha1sums=('1dd677e6fd4335e6d0bb906f4c981395ca204e12'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+          '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
+          '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
+
+prepare() {
+  cd kopete-${pkgver}
+  patch -p2 -i "${srcdir}"/libotr3.patch
+  patch -p1 -i "${srcdir}"/mediastreamer29.patch
+  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
+  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/skype
+  # remove unsafe/dangerous services
+  sed -i 's/Oscar (ICQ and AIM) protocol" ON/Oscar (ICQ and AIM) protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/oscar
+  sed -i 's/Yahoo protocol" ON/Yahoo protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/yahoo
+  sed -i 's/QQ protocol" ON/QQ protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/qq
+  sed -i 's/Novell GroupWise Messenger protocol" ON/Novell GroupWise Messenger protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/groupwise
+  sed -i 's/Gadu-Gadu protocol" ON/Gadu-Gadu protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/gadu
+  sed -i 's/Google Talk support" ON/Google Talk support" OFF/g' protocols/CMakeLists.txt
+  sed -i 's/Window Live Messenger support" ON/Window Live Messenger support" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/wlm
+  sed -i 's/Windows Live Messenger voice clip support" ON/Windows Live Messenger voice clip support" OFF/g' protocols/CMakeLists.txt
+  sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
+  rm -rf protocols/meanwhile
+  patch -p1 -i "${srcdir}"/libre-nonprism.patch
+}
+
+build() {
+  mkdir build
+  cd build
+  cmake ../kopete-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
new file mode 100644
index 000000000..1e96c98d6
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
@@ -0,0 +1,71 @@
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
+@@ -13,13 +13,13 @@
+     SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+ 
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+ 
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+ 
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+-  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+   # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
new file mode 100644
index 000000000..b6915cbb5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
@@ -0,0 +1,110 @@
+diff --git a/doc/index.docbook b/doc/index.docbook
+index 1576dc9..daf7170 100644
+--- a/doc/index.docbook
++++ b/doc/index.docbook
+@@ -20,7 +20,6 @@
+   <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
+   <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
+   <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
+-  <!ENTITY kopete-icq SYSTEM "icq.docbook">
+ ]>
+ <!--
+ Intro (1st draft, Will)
+@@ -112,15 +111,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+ <keyword>Messaging</keyword>
+ <keyword>Jabber</keyword>
+ <keyword>IRC</keyword>
+-<keyword>MSN</keyword>
+-<keyword>ICQ</keyword>
+-<keyword>AIM</keyword>
+-<keyword>Yahoo</keyword>
+-<keyword>Gadu-Gadu</keyword>
+-<keyword>GroupWise</keyword>
+-<keyword>Novell</keyword>
+ <keyword>WinPopup</keyword>
+-<keyword>SMS</keyword>
+ </keywordset>
+ 
+ </bookinfo>
+@@ -174,13 +165,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+ <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
+ <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
+ <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
+-<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>MSN</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
++<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
+ <sect1 id="creating-accounts">
+ <title>Creating Accounts</title>
+ <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
+ <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>New</guibutton> to display the <interface>Account Wizard</interface>.</para>
+ <para>The <interface>Account Wizard</interface> helps you create an &im; account.  After the <guilabel>Introduction</guilabel> page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
+-<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
++<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
+ <variablelist>
+ <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
+ <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
+@@ -256,7 +247,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+ <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
+ <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
+ <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
+-<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization (such as <trademark>ICQ</trademark>) to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
++<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
+ </orderedlist>
+ 
+ <para>You can add contacts to an existing Metacontact using its context menu.</para>
+@@ -699,47 +690,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+ 	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
+ 	<sect1 id="protocols-list">
+ 		<title>Protocols</title>
+-		<sect2 id="protocols-aim">
+-			<title>AIM</title>
+-			<para>AIM supports chatrooms.  Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para>
+-		</sect2>
+-		<sect2 id="protocols-icq">
+-			<title>ICQ</title>
+-			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
+-		</sect2>
+-		<sect2 id="protocols-msn">
+-			<title>MSN</title> 
+-			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &konqueror; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, MSN supports custom emoticons.</para>
+-			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
+-		</sect2>
+-		<sect2 id="protocols-yahoo">
+-			<title>Yahoo</title>
+-			<para>Yahoo can send and receive webcam video.  It also supports Yahoo mail and the Yahoo address book from the account menu.  Conferencing is also possible.</para>
+-		</sect2>
+ 		<sect2 id="protocols-jabber">
+ 			<title>Jabber</title>
+ 			<para>Jabber, also known as XMPP, supports file transfer, conferencing and any other services supplied by the Jabber server.  For example, many Jabber servers have a user directory, and some provide transports to other messaging systems.  To access services, use <menuchoice><guimenu>Services...</guimenu></menuchoice> on the account menu.  Jabber file transfer can work without port forwarding, but enjoys better performance where a direct connection is possible.  By default, port 8010 is used for port forwarding, but this is configurable in each account's settings.</para>
+ 		</sect2>
+-		<sect2 id="protocols-gtalk">
+-			<title>Google Talk</title>
+-			<para>Since Google Talk is based upon Jabber, it is well supported in &kopete; with the exception of voice chat, which is worked upon.</para>
+-			<para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name.  Check <guilabel>Use protocol encryption (SSL)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>.  The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
+-		</sect2>
+-		<sect2 id="protocols-groupwise">
+-			<title>Novell GroupWise</title>
+-			<para>GroupWise Messenger is an enterprise messenging system from Novell Inc.  The full range of features are supported, including privacy, group chat, rich text and user search.</para>
+-		</sect2>
+-		<sect2 id="protocols-gadu-gadu">
+-			<title>Gadu-Gadu</title>
+-			<para>Gadu-Gadu is a chat system originating from Poland.  At present, &kopete; supports basic chat functions.</para>
+-		</sect2>
+ 		<sect2 id="protocols-winpopup">
+ 			<title>WinPopup</title>
+ 			<para>WinPopup is a way to use &kopete; to send and receive messages with &Windows; computers on the local network.  The WinPopup protocol only supports single, plain-text messages.</para>
+ 		</sect2>
+ 		<sect2 id="protocols-others">
+ 			<title>Other protocols</title>
+-			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS, Skype and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
++			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
+ 		</sect2>
+ 	</sect1>
+ </chapter>
+@@ -1120,7 +1081,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
+ &kopete-chatstyle;
+ &kopete-pipes;
+ &kopete-jabber;
+-&kopete-icq;
+ 
+ &documentation.index;
+ </book>
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
new file mode 100644
index 000000000..eb0b2297e
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
@@ -0,0 +1,22 @@
+diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
new file mode 100644
index 000000000..79f9b9221
--- /dev/null
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=kdepim-runtime
+pkgname=kdepim-runtime-nonprism
+pkgver=4.11.1
+pkgrel=1
+pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdepim-runtime'
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime' 'libkolab')
+makedepends=('cmake' 'automoc4' 'boost')
+install="${_pkgname}.install"
+replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
+conflicts=kdepim-runtime
+provides=kdepim-runtime=$pkgver
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
+sha1sums=('a61c1b4cafe16b88213c8cf2f4f64b38a20ed74d')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+	cd build
+	cmake ../${_pkgname}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE4_BUILD_TESTS=OFF \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd build
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install b/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
new file mode 100644
index 000000000..c77e68041
--- /dev/null
+++ b/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
new file mode 100644
index 000000000..ccf2a9af6
--- /dev/null
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -0,0 +1,131 @@
+# $Id: PKGBUILD 185869 2013-05-19 16:42:53Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+
+_pkgname=pidgin
+pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
+pkgver=2.10.7
+pkgrel=4
+arch=('i686' 'x86_64' 'mips64el')
+url="http://pidgin.im/"
+license=('GPL')
+makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
+             'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
+             'tk' 'ca-certificates' 'intltool' 'networkmanager')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2
+        pidgin-2.10.7-link-libirc-to-libsasl2.patch nonprism.patch)
+sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
+            '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f'
+            '54c185493f7139768e316b989a5d23aa9d46662bf69026a92efbf69ad7d00973')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  msg 'remove nonfree services'
+  patch -Np1 -i $srcdir/nonprism.patch
+  #rm -vrf libpurple/protocols/{gg,jabber/google,msn,mxit,myspace,novell,oscar,yahoo}
+  #rm -v pidgin/pixmaps/protocols/16/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png
+  #rm -v pidgin/pixmaps/protocols/16/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg
+  #rm -v pidgin/pixmaps/protocols/22/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png
+  #rm -v pidgin/pixmaps/protocols/22/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg
+  #rm -v pidgin/pixmaps/protocols/48/{aim,facebook,gadu-gadu,icq,msn,mxit,myspace,novell,yahoo}.png
+  #rm -v pidgin/pixmaps/protocols/scalable/{aim,gadu-gadu,google-talk,icq,msn,mxit,novell,yahoo}.svg
+  msg 'remove wrong OS term'
+  sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h
+  sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # https://developer.pidgin.im/ticket/15517
+  patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
+  autoreconf -vi
+
+  # Use Python 2
+  sed -i 's/env python$/&2/' */plugins/*.py \
+    libpurple/purple-{remote,notifications-example,url-handler}
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-schemas-install \
+    --disable-meanwhile \
+    --disable-gnutls \
+    --enable-cyrus-sasl \
+    --disable-doxygen \
+    --enable-nm \
+    --with-python=/usr/bin/python2 \
+    --with-system-ssl-certs=/etc/ssl/certs
+    make
+}
+
+package_pidgin-nonprism(){
+  pkgdesc="Multi-protocol instant messaging client"
+  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+           'hicolor-icon-theme')
+  optdepends=('aspell: for spelling correction')
+  provides=("$_pkgname=$pkgver")
+  conflicts=$_pkgname
+  replaces=$_pkgname
+  install=pidgin.install
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C pidgin DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+  rm "$pkgdir/usr/share/man/man1/finch.1"
+}
+
+package_libpurple-nonprism(){
+  pkgdesc="IM library extracted from Pidgin"
+  depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+  optdepends=('avahi: Bonjour protocol support'
+              'ca-certificates: SSL CA certificates'
+              'python2-dbus: for purple-remote and purple-url-handler'
+              'tk: Tcl/Tk scripting support')
+  provides=("${pkgname%-nonprism}=$pkgver")
+  conflicts=${pkgname%-nonprism}
+  replaces=${pkgname%-nonprism}
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+    make -C "$_dir" DESTDIR="$pkgdir" install
+  done
+}
+
+package_finch-nonprism(){
+  pkgdesc="A ncurses-based messaging client"
+  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
+  provides=("${pkgname%-nonprism}=$pkgver")
+  conflicts=${pkgname%-nonprism}
+  replaces=${pkgname%-nonprism}
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C finch DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  rm "$pkgdir"/usr/share/man/man1/pidgin.1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/nonprism/pidgin-nonprism/nonprism-b.patch b/nonprism/pidgin-nonprism/nonprism-b.patch
new file mode 100644
index 000000000..8e64b73d5
--- /dev/null
+++ b/nonprism/pidgin-nonprism/nonprism-b.patch
@@ -0,0 +1,5623 @@
+diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in
+--- pidgin-2.10.7/config.h.in	2013-02-11 07:17:16.000000000 -0200
++++ pidgin-2.10.7-nonprism/config.h.in	2013-08-16 22:16:16.833531712 -0300
+@@ -151,9 +151,6 @@
+ /* Define to 1 if you have the `db' library (-ldb). */
+ #undef HAVE_LIBDB
+ 
+-/* Define to 1 if you have libgadu. */
+-#undef HAVE_LIBGADU
+-
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+ 
+diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure
+--- pidgin-2.10.7/configure	2013-02-11 07:17:26.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure	2013-08-27 16:47:16.890662082 -0300
+@@ -716,45 +716,23 @@
+ STATIC_LINK_LIBS
+ STATIC_ZEPHYR_FALSE
+ STATIC_ZEPHYR_TRUE
+-STATIC_YAHOO_FALSE
+-STATIC_YAHOO_TRUE
+ STATIC_SIMPLE_FALSE
+ STATIC_SIMPLE_TRUE
+ STATIC_SILC_FALSE
+ STATIC_SILC_TRUE
+-STATIC_SAMETIME_FALSE
+-STATIC_SAMETIME_TRUE
+-STATIC_OSCAR_FALSE
+-STATIC_OSCAR_TRUE
+-STATIC_NOVELL_FALSE
+-STATIC_NOVELL_TRUE
+-STATIC_MXIT_FALSE
+-STATIC_MXIT_TRUE
+-STATIC_MYSPACE_FALSE
+-STATIC_MYSPACE_TRUE
+-STATIC_MSN_FALSE
+-STATIC_MSN_TRUE
+ STATIC_JABBER_FALSE
+ STATIC_JABBER_TRUE
+ STATIC_IRC_FALSE
+ STATIC_IRC_TRUE
+-STATIC_GG_FALSE
+-STATIC_GG_TRUE
+ STATIC_BONJOUR_FALSE
+ STATIC_BONJOUR_TRUE
+ STATIC_PRPLS
+ DISTRIB_FALSE
+ DISTRIB_TRUE
+-USE_INTERNAL_LIBGADU_FALSE
+-USE_INTERNAL_LIBGADU_TRUE
+-GADU_LIBS
+-GADU_CFLAGS
+ SILC_LIBS
+ SILC_CFLAGS
+ AVAHI_LIBS
+ AVAHI_CFLAGS
+-MEANWHILE_LIBS
+-MEANWHILE_CFLAGS
+ IDN_LIBS
+ IDN_CFLAGS
+ USE_VV_FALSE
+@@ -1021,14 +999,11 @@
+ enable_farstream
+ enable_vv
+ enable_idn
+-enable_meanwhile
+ enable_avahi
+ with_avahi_client_includes
+ with_avahi_client_libs
+ with_silc_includes
+ with_silc_libs
+-with_gadu_includes
+-with_gadu_libs
+ enable_distrib
+ with_static_prpls
+ with_dynamic_prpls
+@@ -1100,14 +1075,10 @@
+ FARSTREAM_LIBS
+ IDN_CFLAGS
+ IDN_LIBS
+-MEANWHILE_CFLAGS
+-MEANWHILE_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ SILC_CFLAGS
+ SILC_LIBS
+-GADU_CFLAGS
+-GADU_LIBS
+ DBUS_CFLAGS
+ DBUS_LIBS
+ NETWORKMANAGER_CFLAGS
+@@ -1773,8 +1744,6 @@
+   --disable-farstream     compile without farstream support
+   --disable-vv            compile without voice and video support
+   --disable-idn           compile without IDN support
+-  --disable-meanwhile     compile without meanwhile (required for Sametime
+-                          support)
+   --disable-avahi         compile without avahi (required for Bonjour support)
+ 
+   --disable-plugins       compile without plugin support
+@@ -1826,9 +1795,6 @@
+   --with-silc-includes=DIR
+                           compile the SILC plugin against includes in DIR
+   --with-silc-libs=DIR    compile the SILC plugin against the SILC libs in DIR
+-  --with-gadu-includes=DIR
+-                          compile the Gadu-Gadu plugin against includes in DIR
+-  --with-gadu-libs=DIR    compile the Gadu-Gadu plugin against the libs in DIR
+   --with-static-prpls     Link to certain protocols statically
+   --with-dynamic-prpls    specify which protocols to build dynamically
+   --with-krb4=PREFIX      compile Zephyr plugin with Kerberos 4 support
+@@ -1905,17 +1871,11 @@
+               linker flags for FARSTREAM, overriding pkg-config
+   IDN_CFLAGS  C compiler flags for IDN, overriding pkg-config
+   IDN_LIBS    linker flags for IDN, overriding pkg-config
+-  MEANWHILE_CFLAGS
+-              C compiler flags for MEANWHILE, overriding pkg-config
+-  MEANWHILE_LIBS
+-              linker flags for MEANWHILE, overriding pkg-config
+   AVAHI_CFLAGS
+               C compiler flags for AVAHI, overriding pkg-config
+   AVAHI_LIBS  linker flags for AVAHI, overriding pkg-config
+   SILC_CFLAGS C compiler flags for SILC, overriding pkg-config
+   SILC_LIBS   linker flags for SILC, overriding pkg-config
+-  GADU_CFLAGS C compiler flags for GADU, overriding pkg-config
+-  GADU_LIBS   linker flags for GADU, overriding pkg-config
+   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+   NETWORKMANAGER_CFLAGS
+@@ -18487,105 +18447,6 @@
+ fi
+ fi
+ 
+-# Check whether --enable-meanwhile was given.
+-if test "${enable_meanwhile+set}" = set; then :
+-  enableval=$enable_meanwhile; enable_meanwhile="$enableval"
+-else
+-  enable_meanwhile="yes"
+-fi
+-
+-if test "x$enable_meanwhile" = "xyes"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5
+-$as_echo_n "checking for MEANWHILE... " >&6; }
+-
+-if test -n "$MEANWHILE_CFLAGS"; then
+-    pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$MEANWHILE_LIBS"; then
+-    pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        else
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$MEANWHILE_PKG_ERRORS" >&5
+-
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-else
+-	MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS
+-	MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		have_meanwhile="yes"
+-
+-fi
+-fi
+-
+-
+-
+ # Check whether --enable-avahi was given.
+ if test "${enable_avahi+set}" = set; then :
+   enableval=$enable_avahi; enable_avahi="$enableval"
+@@ -19207,267 +19068,6 @@
+ fi
+ 
+ 
+-# Check whether --with-gadu-includes was given.
+-if test "${with_gadu_includes+set}" = set; then :
+-  withval=$with_gadu_includes; ac_gadu_includes="$withval"
+-else
+-  ac_gadu_includes="no"
+-fi
+-
+-
+-# Check whether --with-gadu-libs was given.
+-if test "${with_gadu_libs+set}" = set; then :
+-  withval=$with_gadu_libs; ac_gadu_libs="$withval"
+-else
+-  ac_gadu_libs="no"
+-fi
+-
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5
+-$as_echo_n "checking for GADU... " >&6; }
+-
+-if test -n "$GADU_CFLAGS"; then
+-    pkg_cv_GADU_CFLAGS="$GADU_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GADU_LIBS"; then
+-    pkg_cv_GADU_LIBS="$GADU_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        else
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GADU_PKG_ERRORS" >&5
+-
+-
+-		gadu_includes="no"
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		gadu_includes="no"
+-
+-else
+-	GADU_CFLAGS=$pkg_cv_GADU_CFLAGS
+-	GADU_LIBS=$pkg_cv_GADU_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-
+-fi
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libgadu_h" = xyes; then :
+-  gadu_includes=yes
+-fi
+-
+-
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5
+-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; }
+-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgadu $GADU_LIBS $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gg_libgadu_version ();
+-int
+-main ()
+-{
+-return gg_libgadu_version ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gadu_gg_libgadu_version=yes
+-else
+-  ac_cv_lib_gadu_gg_libgadu_version=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5
+-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; }
+-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then :
+-  gadu_libs=yes
+-fi
+-
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5
+-$as_echo_n "checking for libgadu GPL compatibility... " >&6; }
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h
+-
+-
+-else
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-else
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+- if test "x$gadu_libs" != "xyes"; then
+-  USE_INTERNAL_LIBGADU_TRUE=
+-  USE_INTERNAL_LIBGADU_FALSE='#'
+-else
+-  USE_INTERNAL_LIBGADU_TRUE='#'
+-  USE_INTERNAL_LIBGADU_FALSE=
+-fi
+-
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+ 
+ 
+ 
+@@ -19500,10 +19100,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19519,46 +19116,22 @@
+ extern_init=
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+-			if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -19571,14 +19144,6 @@
+   STATIC_BONJOUR_FALSE=
+ fi
+ 
+- if test "x$static_gg" = "xyes"; then
+-  STATIC_GG_TRUE=
+-  STATIC_GG_FALSE='#'
+-else
+-  STATIC_GG_TRUE='#'
+-  STATIC_GG_FALSE=
+-fi
+-
+  if test "x$static_irc" = "xyes"; then
+   STATIC_IRC_TRUE=
+   STATIC_IRC_FALSE='#'
+@@ -19595,54 +19160,6 @@
+   STATIC_JABBER_FALSE=
+ fi
+ 
+- if test "x$static_msn" = "xyes"; then
+-  STATIC_MSN_TRUE=
+-  STATIC_MSN_FALSE='#'
+-else
+-  STATIC_MSN_TRUE='#'
+-  STATIC_MSN_FALSE=
+-fi
+-
+- if test "x$static_myspace" = "xyes"; then
+-  STATIC_MYSPACE_TRUE=
+-  STATIC_MYSPACE_FALSE='#'
+-else
+-  STATIC_MYSPACE_TRUE='#'
+-  STATIC_MYSPACE_FALSE=
+-fi
+-
+- if test "x$static_mxit" = "xyes"; then
+-  STATIC_MXIT_TRUE=
+-  STATIC_MXIT_FALSE='#'
+-else
+-  STATIC_MXIT_TRUE='#'
+-  STATIC_MXIT_FALSE=
+-fi
+-
+- if test "x$static_novell" = "xyes"; then
+-  STATIC_NOVELL_TRUE=
+-  STATIC_NOVELL_FALSE='#'
+-else
+-  STATIC_NOVELL_TRUE='#'
+-  STATIC_NOVELL_FALSE=
+-fi
+-
+- if test "x$static_oscar" = "xyes"; then
+-  STATIC_OSCAR_TRUE=
+-  STATIC_OSCAR_FALSE='#'
+-else
+-  STATIC_OSCAR_TRUE='#'
+-  STATIC_OSCAR_FALSE=
+-fi
+-
+- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then
+-  STATIC_SAMETIME_TRUE=
+-  STATIC_SAMETIME_FALSE='#'
+-else
+-  STATIC_SAMETIME_TRUE='#'
+-  STATIC_SAMETIME_FALSE=
+-fi
+-
+  if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then
+   STATIC_SILC_TRUE=
+   STATIC_SILC_FALSE='#'
+@@ -19659,14 +19176,6 @@
+   STATIC_SIMPLE_FALSE=
+ fi
+ 
+- if test "x$static_yahoo" = "xyes"; then
+-  STATIC_YAHOO_TRUE=
+-  STATIC_YAHOO_FALSE='#'
+-else
+-  STATIC_YAHOO_TRUE='#'
+-  STATIC_YAHOO_FALSE=
+-fi
+-
+  if test "x$static_zephyr" = "xyes"; then
+   STATIC_ZEPHYR_TRUE=
+   STATIC_ZEPHYR_FALSE='#'
+@@ -19689,10 +19198,7 @@
+ fi
+ 
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19707,22 +19213,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -21001,7 +20497,7 @@
+ fi
+ 
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ if test "x$enable_gnutls" != "xno"; then
+ 	enable_gnutls="no"
+@@ -21871,19 +21367,17 @@
+ 	as_fn_error $? "
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
++
+ " "$LINENO" 5
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ fi
+ 
+@@ -23176,7 +22670,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23344,10 +22838,6 @@
+   as_fn_error $? "conditional \"USE_VV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then
+-  as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then
+   as_fn_error $? "conditional \"DISTRIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23356,10 +22846,6 @@
+   as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_GG\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_IRC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23368,30 +22854,6 @@
+   as_fn_error $? "conditional \"STATIC_JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MSN\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MXIT\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_SILC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23400,10 +22862,6 @@
+   as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24425,20 +23883,12 @@
+     "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;;
+     "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;;
+     "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;;
+-    "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;;
+     "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
+     "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
+-    "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+-    "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
+-    "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;;
+-    "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
+     "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
+-    "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
+-    "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;;
+     "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;;
+     "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;;
+     "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;;
+-    "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;;
+     "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;;
+     "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;;
+     "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;;
+@@ -25863,7 +25313,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac
+--- pidgin-2.10.7/configure.ac	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure.ac	2013-08-16 23:44:41.800496326 -0300
+@@ -854,28 +854,6 @@
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Meanwhile headers (for Sametime)
+-dnl #######################################################################
+-AC_ARG_ENABLE(meanwhile,
+-	[AC_HELP_STRING([--disable-meanwhile],
+-		[compile without meanwhile (required for Sametime support)])],
+-	enable_meanwhile="$enableval", enable_meanwhile="yes")
+-if test "x$enable_meanwhile" = "xyes"; then
+-	PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+-		have_meanwhile="yes"
+-	], [
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			AC_MSG_ERROR([
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-])
+-		fi])
+-fi
+-AC_SUBST(MEANWHILE_CFLAGS)
+-AC_SUBST(MEANWHILE_LIBS)
+-
+-dnl #######################################################################
+ dnl # Check for Native Avahi headers (for Bonjour)
+ dnl #######################################################################
+ AC_ARG_ENABLE(avahi,
+@@ -1020,100 +998,6 @@
+ 	CPPFLAGS="$CPPFLAGS_save"
+ fi
+ 
+-dnl #######################################################################
+-dnl # Check for Gadu-Gadu client includes and libraries
+-dnl #######################################################################
+-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-	PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-	], [
+-		gadu_includes="no"
+-	])
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	AC_MSG_CHECKING(for libgadu GPL compatibility)
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-	]])], [
+-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-		]])], [
+-			AC_MSG_RESULT(yes)
+-			AC_DEFINE([HAVE_LIBGADU], [1],
+-				[Define to 1 if you have libgadu.])
+-		], [
+-			AC_MSG_RESULT(no)
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-		])
+-	], [
+-		AC_MSG_RESULT(no)
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-	])
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+-AC_SUBST(GADU_LIBS)
+-AC_SUBST(GADU_CFLAGS)
+-
+ AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
+ DYNAMIC_PRPLS=all
+@@ -1123,10 +1007,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1143,64 +1024,31 @@
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+ 	dnl Ugly special case for "libsilcpurple.la":
+-	dnl ... and Ugly special case for multi-protocol oscar and yahoo
+-	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+ done
+ AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
+ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
+ AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
+-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
+-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
+-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
+-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
+ AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
+ AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
+-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
+ AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+ AC_SUBST(STATIC_LINK_LIBS)
+ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
+@@ -1208,10 +1056,7 @@
+ 
+ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1226,22 +1071,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -1713,7 +1548,7 @@
+ 	[enable_nss="$enableval"],
+ 	[enable_nss="yes"])
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ dnl #
+ dnl # Check for GnuTLS if it's specified.
+@@ -2124,19 +1959,16 @@
+ 	AC_MSG_ERROR([
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+ ])
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ fi
+ 
+@@ -2577,20 +2409,12 @@
+ 		   libpurple/Makefile
+ 		   libpurple/protocols/Makefile
+ 		   libpurple/protocols/bonjour/Makefile
+-		   libpurple/protocols/gg/Makefile
+ 		   libpurple/protocols/irc/Makefile
+ 		   libpurple/protocols/jabber/Makefile
+-		   libpurple/protocols/msn/Makefile
+-		   libpurple/protocols/myspace/Makefile
+-		   libpurple/protocols/mxit/Makefile
+-		   libpurple/protocols/novell/Makefile
+ 		   libpurple/protocols/null/Makefile
+-		   libpurple/protocols/oscar/Makefile
+-		   libpurple/protocols/sametime/Makefile
+ 		   libpurple/protocols/silc/Makefile
+ 		   libpurple/protocols/silc10/Makefile
+ 		   libpurple/protocols/simple/Makefile
+-		   libpurple/protocols/yahoo/Makefile
+ 		   libpurple/protocols/zephyr/Makefile
+ 		   libpurple/tests/Makefile
+ 		   libpurple/purple.h
+@@ -2635,7 +2459,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in
+--- pidgin-2.10.7/doc/finch.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/finch.1.in	2013-08-16 21:01:16.682280145 -0300
+@@ -30,11 +30,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBfinch\fR is a console-based modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ 
+ .SH OPTIONS
+ The following options are provided by \fBfinch\fR using the standard GNU
+diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt
+--- pidgin-2.10.7/doc/funniest_home_convos.txt	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt	2013-08-16 23:08:16.148841464 -0300
+@@ -301,8 +301,6 @@
+ ---
+ 
+ 18:33:26 <NoName> hello there
+-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of
+-                  unsafe when using GAIM with yahoo messenges accounts
+ 18:34:43 <NoName> Whenever you transfer files between users, no receiving
+                   confirmation is requested, the file gets transfered
+                   automatically
+diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in
+--- pidgin-2.10.7/doc/pidgin.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in	2013-08-16 21:00:30.964181946 -0300
+@@ -29,11 +29,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBpidgin\fR is a graphical modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ .PP
+ Pidgin can be extended by plugins written in multiple programming languages and
+ controlled through DBus or \fBpurple-remote\fR.
+diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c
+--- pidgin-2.10.7/libpurple/account.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/account.c	2013-08-16 23:31:48.026518940 -0300
+@@ -482,55 +482,6 @@
+ /*********************************************************************
+  * Reading from disk                                                 *
+  *********************************************************************/
+-static void
+-migrate_yahoo_japan(PurpleAccount *account)
+-{
+-	/* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+-	 * to use the new prpl-yahoojp.  Also remove the account-specific settings
+-	 * we no longer need */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+-		if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+-			const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+-			const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+-
+-			g_return_if_fail(serverjp != NULL);
+-			g_return_if_fail(xferjp_host != NULL);
+-
+-			purple_account_set_string(account, "server", serverjp);
+-			purple_account_set_string(account, "xfer_host", xferjp_host);
+-
+-			purple_account_set_protocol_id(account, "prpl-yahoojp");
+-		}
+-
+-		/* these should always be nuked */
+-		purple_account_remove_setting(account, "yahoojp");
+-		purple_account_remove_setting(account, "serverjp");
+-		purple_account_remove_setting(account, "xferjp_host");
+-
+-	}
+-}
+-
+-static void
+-migrate_icq_server(PurpleAccount *account)
+-{
+-	/* Migrate the login server setting for ICQ accounts.  See
+-	 * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+-	 * for details on the change. */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+-		const char *tmp = purple_account_get_string(account, "server", NULL);
+-
+-		/* Non-secure server */
+-		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+-				purple_strequal(tmp, "login.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "login.icq.com");
+-
+-		/* Secure server */
+-		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "slogin.icq.com");
+-	}
+-}
+ 
+ static void
+ migrate_xmpp_encryption(PurpleAccount *account)
+@@ -615,12 +566,6 @@
+ 		g_free(data);
+ 	}
+ 
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an old Yahoo! JAPAN account */
+-	migrate_yahoo_japan(account);
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an ICQ account's server setting */
+-	migrate_icq_server(account);
+ 	/* we do this here because we need to do it before the user views the
+ 	 * Edit Account dialog. */
+ 	migrate_xmpp_encryption(account);
+@@ -874,7 +819,6 @@
+ 		return NULL;
+ 	}
+ 
+-	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+ 	g_free(name);
+ 	g_free(protocol_id);
+ 
+diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c
+--- pidgin-2.10.7/libpurple/blist.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/blist.c	2013-08-16 22:53:19.640535242 -0300
+@@ -466,9 +466,7 @@
+ 
+ 	acct_name = xmlnode_get_attrib(bnode, "account");
+ 	protocol = xmlnode_get_attrib(bnode, "protocol");
+-	protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 	proto = xmlnode_get_attrib(bnode, "proto");
+-	proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
+ 
+ 	if (!acct_name || (!proto && !protocol))
+ 		return;
+diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c
+--- pidgin-2.10.7/libpurple/buddyicon.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c	2013-08-16 23:28:49.244233493 -0300
+@@ -1099,18 +1099,6 @@
+ 			{
+ 				PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
+ 				const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-				if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
+-				{
+-					int checksum = purple_blist_node_get_int(node, "icon_checksum");
+-					if (checksum != 0)
+-					{
+-						char *checksum_str = g_strdup_printf("%i", checksum);
+-						purple_blist_node_remove_setting(node, "icon_checksum");
+-						purple_blist_node_set_string(node, "icon_checksum", checksum_str);
+-						g_free(checksum_str);
+-					}
+-				}
+ 			}
+ 		}
+ 	}
+diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h
+--- pidgin-2.10.7/libpurple/ft.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/ft.h	2013-08-16 22:51:20.590085226 -0300
+@@ -470,8 +470,6 @@
+  * can be used to jump backward in the file if the protocol detects
+  * that some bit of data needs to be resent or has been sent twice.
+  *
+- * It's used for pausing and resuming an oscar file transfer.
+- *
+  * @param xfer       The file transfer.
+  * @param bytes_sent The new current position in the file.  If we're
+  *                   sending a file then this is the byte that we will
+diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h
+--- pidgin-2.10.7/libpurple/gaim-compat.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h	2013-08-16 23:33:16.372629159 -0300
+@@ -2302,16 +2302,8 @@
+ #define gaim_init_ssl_plugin			purple_init_ssl_plugin
+ #define gaim_init_ssl_openssl_plugin	purple_init_ssl_openssl_plugin
+ #define gaim_init_ssl_gnutls_plugin		purple_init_ssl_gnutls_plugin
+-#define gaim_init_gg_plugin				purple_init_gg_plugin
+ #define gaim_init_jabber_plugin			purple_init_jabber_plugin
+-#define gaim_init_sametime_plugin		purple_init_sametime_plugin
+-#define gaim_init_msn_plugin			purple_init_msn_plugin
+-#define gaim_init_novell_plugin			purple_init_novell_plugin
+-#define gaim_init_qq_plugin				purple_init_qq_plugin
+ #define gaim_init_simple_plugin			purple_init_simple_plugin
+-#define gaim_init_yahoo_plugin			purple_init_yahoo_plugin
+ #define gaim_init_zephyr_plugin			purple_init_zephyr_plugin
+-#define gaim_init_aim_plugin			purple_init_aim_plugin
+-#define gaim_init_icq_plugin			purple_init_icq_plugin
+ 
+ #endif /* _GAIM_COMPAT_H_ */
+diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h
+--- pidgin-2.10.7/libpurple/internal.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/internal.h	2013-08-17 00:24:37.244172407 -0300
+@@ -43,7 +43,7 @@
+  *
+  * The Singular/Plural/Number ngettext dummy definition below was
+  * taken from an email to the texinfo mailing list by Manuel Guerrero.
+- * Thank you Manuel, and thank you Alex's good friend Google.
++ * Thank you Manuel.
+  */
+ #ifdef ENABLE_NLS
+ #  include <locale.h>
+diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c
+--- pidgin-2.10.7/libpurple/media/backend-fs2.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c	2013-08-17 00:23:19.488440821 -0300
+@@ -1661,18 +1661,6 @@
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+-	/*
+-	 * Hack to make x264 work with Gmail video.
+-	 */
+-	if (is_nice && !strcmp(sess_id, "google-video")) {
+-		FsElementAddedNotifier *notifier =
+-				fs_element_added_notifier_new();
+-		g_signal_connect(G_OBJECT(notifier), "element-added",
+-				G_CALLBACK(gst_element_added_cb), NULL);
+-		fs_element_added_notifier_add(notifier,
+-				GST_BIN(priv->conference));
+-	}
+-
+ 	session->id = g_strdup(sess_id);
+ 	session->backend = self;
+ 	session->type = type;
+diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c
+--- pidgin-2.10.7/libpurple/plugins/psychic.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c	2013-08-27 21:18:22.251908751 -0300
+@@ -20,8 +20,7 @@
+ #define PLUGIN_NAME     N_("Psychic Mode")
+ #define PLUGIN_SUMMARY  N_("Psychic mode for incoming conversation")
+ #define PLUGIN_DESC     N_("Causes conversation windows to appear as other" \
+-			   " users begin to message you.  This works for" \
+-			   " AIM, ICQ, XMPP, Sametime, and Yahoo!")
++			   " users begin to message you.  This works for XMPP")
+ #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
+ 
+ 
+diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c
+--- pidgin-2.10.7/libpurple/pounce.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/pounce.c	2013-08-16 23:02:20.671021669 -0300
+@@ -409,7 +409,6 @@
+ 		g_free(data->account_name);
+ 		data->account_name = g_strdup(buffer);
+ 		tmp = data->protocol_id;
+-		data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp));
+ 		g_free(tmp);
+ 	}
+ 	else if (purple_strequal(element_name, "pouncee")) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c	2013-08-17 00:14:13.334946817 -0300
+@@ -320,7 +320,7 @@
+ 		xmlnode_set_namespace(auth, NS_XMPP_SASL);
+ 		xmlnode_set_attrib(auth, "mechanism", js->current_mech);
+ 
+-		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
++		xmlnode_set_attrib(auth, "xmlns:ga", "");
+ 		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+ 
+ 		if (clientout) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c	2013-08-17 00:19:44.801822370 -0300
+@@ -40,7 +40,7 @@
+ 	auth = xmlnode_new("auth");
+ 	xmlnode_set_namespace(auth, NS_XMPP_SASL);
+ 
+-	xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
++	xmlnode_set_attrib(auth, "xmlns:ga", "");
+ 	xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+ 
+ 	response = g_string_new("");
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/buddy.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/buddy.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c	2013-08-17 00:22:49.080836449 -0300
+@@ -38,7 +38,6 @@
+ #include "xdata.h"
+ #include "pep.h"
+ #include "adhoccommands.h"
+-#include "google/google.h"
+ 
+ typedef struct {
+ 	long idle_seconds;
+@@ -945,17 +944,7 @@
+ 
+ 	/* Republish our vcard if the photo is different than the server's */
+ 	if (js->initial_avatar_hash && !purple_strequal(vcard_hash, js->initial_avatar_hash)) {
+-		/*
+-		 * Google Talk has developed the behavior that it will not accept
+-		 * a vcard set in the first 10 seconds (or so) of the connection;
+-		 * it returns an error (namespaces trimmed):
+-		 * <error code="500" type="wait"><internal-server-error/></error>.
+-		 */
+-		if (js->googletalk)
+-			js->vcard_timer = purple_timeout_add_seconds(10, set_own_vcard_cb,
+-			                                             js);
+-		else
+-			jabber_set_info(js->gc, purple_account_get_user_info(account));
++		jabber_set_info(js->gc, purple_account_get_user_info(account));
+ 	} else if (vcard_hash) {
+ 		/* A photo is in the vCard. Advertise its hash */
+ 		js->avatar_hash = vcard_hash;
+@@ -1861,13 +1850,6 @@
+ 		                           NULL, NULL);
+ 		m = g_list_append(m, act);
+ 	}
+-
+-	if (js->googletalk) {
+-		act = purple_menu_action_new(_("Initiate _Chat"),
+-		                           PURPLE_CALLBACK(google_buddy_node_chat),
+-		                           NULL, NULL);
+-		m = g_list_append(m, act);
+-	}
+ 
+ 	/*
+ 	 * This if-condition implements parts of XEP-0100: Gateway Interaction
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/disco.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/disco.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c	2013-08-27 22:49:34.275219711 -0300
+@@ -30,9 +30,6 @@
+ #include "adhoccommands.h"
+ #include "buddy.h"
+ #include "disco.h"
+-#include "google/google.h"
+-#include "google/gmail.h"
+-#include "google/jingleinfo.h"
+ #include "iq.h"
+ #include "jabber.h"
+ #include "jingle/jingle.h"
+@@ -142,44 +139,6 @@
+ 					xmlnode_set_attrib(feature, "var", feat->namespace);
+ 				}
+ 			}
+-#ifdef USE_VV
+-		} else if (g_str_equal(node, CAPS0115_NODE "#" "voice-v1")) {
+-			/*
+-			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+-			 * where we add <c/> to the <presence/>) for the Google Talk
+-			 * clients that don't actually check disco#info features.
+-			 *
+-			 * This specific feature is redundant but is what
+-			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+-			 * advertises as 'voice-v1'.
+-			 */
+-			xmlnode *feature = xmlnode_new_child(query, "feature");
+-			xmlnode_set_attrib(feature, "var", NS_GOOGLE_VOICE);
+-		} else if (g_str_equal(node, CAPS0115_NODE "#" "video-v1")) {
+-			/*
+-			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+-			 * where we add <c/> to the <presence/>) for the Google Talk
+-			 * clients that don't actually check disco#info features.
+-			 *
+-			 * This specific feature is redundant but is what
+-			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+-			 * advertises as 'video-v1'.
+-			 */
+-			xmlnode *feature = xmlnode_new_child(query, "feature");
+-			xmlnode_set_attrib(feature, "var", NS_GOOGLE_VIDEO);
+-		} else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) {
+-			/*
+-			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+-			 * where we add <c/> to the <presence/>) for the Google Talk
+-			 * clients that don't actually check disco#info features.
+-			 *
+-			 * This specific feature is redundant but is what
+-			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+-			 * advertises as 'camera-v1'.
+-			 */
+-			xmlnode *feature = xmlnode_new_child(query, "feature");
+-			xmlnode_set_attrib(feature, "var", NS_GOOGLE_CAMERA);
+-#endif
+ 		} else {
+ 			xmlnode *error, *inf;
+ 
+@@ -419,7 +378,7 @@
+ 
+ }
+ 
+-/* should probably share this code with google.c, or maybe from 2.7.0
++/* maybe from 2.7.0
+  introduce an abstracted hostname -> IP function in dns.c */
+ static void
+ jabber_disco_stun_lookup_cb(GSList *hosts, gpointer data,
+@@ -538,16 +497,7 @@
+ 
+ 		g_free(js->server_name);
+ 		js->server_name = g_strdup(name);
+-		if (!strcmp(name, "Google Talk")) {
+-			purple_debug_info("jabber", "Google Talk!\n");
+-			js->googletalk = TRUE;
+-
+-			/* autodiscover stun and relays */
+-			if (purple_network_get_stun_ip() == NULL ||
+-		    	purple_strequal(purple_network_get_stun_ip(), "")) {
+-				jabber_google_send_jingle_info(js);
+-			}
+-		} else if (purple_network_get_stun_ip() == NULL ||
++		if (purple_network_get_stun_ip() == NULL ||
+ 		    purple_strequal(purple_network_get_stun_ip(), "")) {
+ 			js->srv_query_data =
+ 				purple_srv_resolve_account(
+@@ -565,12 +515,7 @@
+ 		if (!var)
+ 			continue;
+ 
+-		if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) {
+-			js->server_caps |= JABBER_CAP_GMAIL_NOTIFY;
+-			jabber_gmail_init(js);
+-		} else if (!strcmp(NS_GOOGLE_ROSTER, var)) {
+-			js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
+-		} else if (!strcmp("http://jabber.org/protocol/commands", var)) {
++		if (!strcmp("http://jabber.org/protocol/commands", var)) {
+ 			js->server_caps |= JABBER_CAP_ADHOC;
+ 		} else if (!strcmp(NS_SIMPLE_BLOCKING, var)) {
+ 			js->server_caps |= JABBER_CAP_BLOCKING;
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/iq.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/iq.c       2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c      2013-08-17 00:19:05.943958296 -0300
+@@ -28,10 +28,6 @@
+ 
+ #include "buddy.h"
+ #include "disco.h"
+-#include "google/gmail.h"
+-#include "google/google.h"
+-#include "google/jingleinfo.h"
+-#include "google/google_session.h"
+ #include "iq.h"
+ #include "jingle/jingle.h"
+ #include "oob.h"
+@@ -461,13 +457,7 @@
+ 	signal_iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+ 
+ 	jabber_iq_register_handler("jingle", JINGLE, jingle_parse);
+-	jabber_iq_register_handler("mailbox", NS_GOOGLE_MAIL_NOTIFY,
+-			jabber_gmail_poke);
+-	jabber_iq_register_handler("new-mail", NS_GOOGLE_MAIL_NOTIFY,
+-			jabber_gmail_poke);
+ 	jabber_iq_register_handler("ping", NS_PING, jabber_ping_parse);
+-	jabber_iq_register_handler("query", NS_GOOGLE_JINGLE_INFO,
+-			jabber_google_handle_jingle_info);
+ 	jabber_iq_register_handler("query", NS_BYTESTREAMS,
+ 			jabber_bytestreams_parse);
+ 	jabber_iq_register_handler("query", NS_DISCO_INFO, jabber_disco_info_parse);
+@@ -481,8 +471,6 @@
+ 	jabber_iq_register_handler("query", "jabber:iq:version",
+ 			jabber_iq_version_parse);
+ #ifdef USE_VV
+-	jabber_iq_register_handler("session", NS_GOOGLE_SESSION,
+-		jabber_google_session_parse);
+ #endif
+ 	jabber_iq_register_handler("block", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+ 	jabber_iq_register_handler("unblock", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c	2013-08-27 23:23:55.191865468 -0300
+@@ -51,9 +51,6 @@
+ #include "chat.h"
+ #include "data.h"
+ #include "disco.h"
+-#include "google/google.h"
+-#include "google/google_roster.h"
+-#include "google/google_session.h"
+ #include "ibb.h"
+ #include "iq.h"
+ #include "jutil.h"
+@@ -1003,9 +1000,6 @@
+ 	js->stun_ip = NULL;
+ 	js->stun_port = 0;
+ 	js->stun_query = NULL;
+-	js->google_relay_token = NULL;
+-	js->google_relay_host = NULL;
+-	js->google_relay_requests = NULL;
+ 
+ 	/* if we are idle, set idle-ness on the stream (this could happen if we get
+ 		disconnected and the reconnects while being idle. I don't think it makes
+@@ -1679,8 +1673,6 @@
+ 	}
+ 	g_free(js->server_name);
+ 	g_free(js->certificate_CN);
+-	g_free(js->gmail_last_time);
+-	g_free(js->gmail_last_tid);
+ 	g_free(js->old_msg);
+ 	g_free(js->old_avatarhash);
+ 	g_free(js->old_artist);
+@@ -1709,21 +1701,6 @@
+ 		js->stun_query = NULL;
+ 	}
+ 
+-	/* remove Google relay-related stuff */
+-	g_free(js->google_relay_token);
+-	g_free(js->google_relay_host);
+-	if (js->google_relay_requests) {
+-		while (js->google_relay_requests) {
+-			PurpleUtilFetchUrlData *url_data =
+-				(PurpleUtilFetchUrlData *) js->google_relay_requests->data;
+-			purple_util_fetch_url_cancel(url_data);
+-			g_free(url_data);
+-			js->google_relay_requests =
+-				g_list_delete_link(js->google_relay_requests,
+-					js->google_relay_requests);
+-		}
+-	}
+-
+ 	g_free(js);
+ 
+ 	gc->proto_data = NULL;
+@@ -1916,12 +1893,6 @@
+ 	if (js == NULL)
+ 		return;
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+-	{
+-		jabber_google_roster_add_deny(js, who);
+-		return;
+-	}
+-
+ 	if (!(js->server_caps & JABBER_CAP_BLOCKING))
+ 	{
+ 		purple_notify_error(NULL, _("Server doesn't support blocking"),
+@@ -1952,12 +1923,6 @@
+ 	if (js == NULL)
+ 		return;
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+-	{
+-		jabber_google_roster_rem_deny(js, who);
+-		return;
+-	}
+-
+ 	if (!(js->server_caps & JABBER_CAP_BLOCKING))
+ 		return;
+ 
+@@ -3310,13 +3275,7 @@
+ 		jbr = jabber_buddy_find_resource(jb, resource);
+ 		g_free(resource);
+ 
+-		if (type & PURPLE_MEDIA_AUDIO &&
+-			!jabber_resource_has_capability(jbr,
+-			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+-			jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
+-			return jabber_google_session_initiate(js, who, type);
+-		else
+-			return jingle_rtp_initiate_media(js, who, type);
++		return jingle_rtp_initiate_media(js, who, type);
+ 	}
+ 
+ 	jb = jabber_buddy_find(js, who, FALSE);
+@@ -3500,11 +3459,6 @@
+ 				caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
+ 						PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
+ 		}
+-		if (jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE)) {
+-			caps |= PURPLE_MEDIA_CAPS_AUDIO;
+-			if (jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))
+-				caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
+-		}
+ 
+ 		total |= caps;
+ 	}
+@@ -3869,10 +3823,6 @@
+ 	jabber_add_feature(JINGLE, 0);
+ 
+ #ifdef USE_VV
+-	jabber_add_feature(NS_GOOGLE_PROTOCOL_SESSION, jabber_audio_enabled);
+-	jabber_add_feature(NS_GOOGLE_VOICE, jabber_audio_enabled);
+-	jabber_add_feature(NS_GOOGLE_VIDEO, jabber_video_enabled);
+-	jabber_add_feature(NS_GOOGLE_CAMERA, jabber_video_enabled);
+ 	jabber_add_feature(JINGLE_APP_RTP, 0);
+ 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
+ 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.h	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h	2013-08-17 00:10:38.778345348 -0300
+@@ -36,12 +36,6 @@
+ 	JABBER_CAP_IQ_SEARCH      = 1 << 7,
+ 	JABBER_CAP_IQ_REGISTER    = 1 << 8,
+ 
+-	/* Google Talk extensions:
+-	 * http://code.google.com/apis/talk/jep_extensions/extensions.html
+-	 */
+-	JABBER_CAP_GMAIL_NOTIFY   = 1 << 9,
+-	JABBER_CAP_GOOGLE_ROSTER  = 1 << 10,
+-
+ 	JABBER_CAP_PING			  = 1 << 11,
+ 	JABBER_CAP_ADHOC		  = 1 << 12,
+ 	JABBER_CAP_BLOCKING       = 1 << 13,
+@@ -195,12 +189,8 @@
+ 	gboolean reinit;
+ 
+ 	JabberCapabilities server_caps;
+-	gboolean googletalk;
+ 	char *server_name;
+ 
+-	char *gmail_last_time;
+-	char *gmail_last_tid;
+-
+ 	char *serverFQDN;
+ 
+ #ifdef HAVE_CYRUS_SASL
+@@ -276,12 +266,6 @@
+ 	gchar *stun_ip;
+ 	int stun_port;
+ 	PurpleDnsQueryData *stun_query;
+-
+-	/* stuff for Google's relay handling */
+-	gchar *google_relay_token;
+-	gchar *google_relay_host;
+-	GList *google_relay_requests; /* the HTTP requests to get */
+-												/* relay info */
+ };
+ 
+ typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c	2013-08-17 00:17:51.991679891 -0300
+@@ -486,13 +486,11 @@
+ 
+ 		if (has_account_stun) {
+ 			purple_debug_info("jabber",
+-				"setting param stun-ip for stream using Google auto-config: %s\n",
+ 				js->stun_ip);
+ 			params[next_index].name = "stun-ip";
+ 			g_value_init(&params[next_index].value, G_TYPE_STRING);
+ 			g_value_set_string(&params[next_index].value, js->stun_ip);
+ 			purple_debug_info("jabber",
+-				"setting param stun-port for stream using Google auto-config: %d\n",
+ 				js->stun_port);
+ 			next_index++;
+ 			params[next_index].name = "stun-port";
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h	2013-08-27 23:02:43.456476444 -0300
+@@ -79,8 +79,7 @@
+ void jingle_terminate_sessions(JabberStream *js);
+ 
+ #ifdef USE_VV
+-/* create a GParam array given autoconfigured STUN (and later perhaps TURN).
+-	if google_talk is TRUE, set compatability mode to GOOGLE_TALK */
++/* create a GParam array given autoconfigured STUN (and later perhaps TURN).*/
+ GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip,
+ 	guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+     const gchar *relay_username, const gchar *relay_password, guint *num_params);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c	2013-08-17 00:13:06.222881329 -0300
+@@ -41,7 +41,6 @@
+ #include "si.h"
+ #include "message.h"
+ #include "presence.h"
+-#include "google/google.h"
+ #include "pep.h"
+ #include "usermood.h"
+ #include "usertune.h"
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am	2013-08-17 00:18:17.592468560 -0300
+@@ -27,20 +27,6 @@
+ 			  data.h \
+ 			  disco.c \
+ 			  disco.h \
+-			  google/gmail.c \
+-			  google/gmail.h \
+-			  google/google.c \
+-			  google/google.h \
+-			  google/google_presence.c \
+-			  google/google_presence.h \
+-			  google/google_roster.c \
+-			  google/google_roster.h \
+-			  google/google_session.c \
+-			  google/google_session.h \
+-			  google/jingleinfo.c \
+-			  google/jingleinfo.h \
+-			  google/relay.c \
+-			  google/relay.h \
+ 			  ibb.c \
+ 			  ibb.h \
+ 			  iq.c \
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in	2013-02-11 07:17:20.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in	2013-08-17 00:12:44.605549467 -0300
+@@ -104,12 +104,7 @@
+ 	auth.h auth_digest_md5.c auth_digest_md5.h auth_plain.c \
+ 	auth_scram.c auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c \
+ 	caps.h chat.c chat.h data.c data.h disco.c disco.h \
+-	google/gmail.c google/gmail.h google/google.c google/google.h \
+-	google/google_presence.c google/google_presence.h \
+-	google/google_roster.c google/google_roster.h \
+-	google/google_session.c google/google_session.h \
+-	google/jingleinfo.c google/jingleinfo.h google/relay.c \
+-	google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
++	ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
+ 	jingle/jingle.c jingle/jingle.h jingle/content.c \
+ 	jingle/content.h jingle/iceudp.c jingle/iceudp.h \
+ 	jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \
+@@ -126,9 +121,7 @@
+ 	libjabber_la-auth_scram.lo libjabber_la-buddy.lo \
+ 	libjabber_la-bosh.lo libjabber_la-caps.lo libjabber_la-chat.lo \
+ 	libjabber_la-data.lo libjabber_la-disco.lo \
+-	libjabber_la-gmail.lo libjabber_la-google.lo \
+-	libjabber_la-google_presence.lo libjabber_la-google_roster.lo \
+-	libjabber_la-google_session.lo libjabber_la-jingleinfo.lo \
++	libjabber_la-jingleinfo.lo \
+ 	libjabber_la-relay.lo libjabber_la-ibb.lo libjabber_la-iq.lo \
+ 	libjabber_la-jabber.lo libjabber_la-jingle.lo \
+ 	libjabber_la-content.lo libjabber_la-iceudp.lo \
+@@ -244,8 +237,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -307,8 +298,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -457,13 +446,8 @@
+ JABBERSOURCES = adhoccommands.c adhoccommands.h auth.c auth.h \
+ 	auth_digest_md5.c auth_digest_md5.h auth_plain.c auth_scram.c \
+ 	auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c caps.h \
+-	chat.c chat.h data.c data.h disco.c disco.h google/gmail.c \
+-	google/gmail.h google/google.c google/google.h \
+-	google/google_presence.c google/google_presence.h \
+-	google/google_roster.c google/google_roster.h \
+-	google/google_session.c google/google_session.h \
+-	google/jingleinfo.c google/jingleinfo.h google/relay.c \
+-	google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
++	chat.c chat.h data.c data.h disco.c disco.h \
++	ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
+ 	jingle/jingle.c jingle/jingle.h jingle/content.c \
+ 	jingle/content.h jingle/iceudp.c jingle/iceudp.h \
+ 	jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \
+@@ -600,11 +584,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-content.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-data.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-disco.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-gmail.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_presence.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_roster.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_session.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-ibb.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iceudp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iq.Plo@am__quote@
+@@ -731,55 +710,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-disco.lo `test -f 'disco.c' || echo '$(srcdir)/'`disco.c
+ 
+-libjabber_la-gmail.lo: google/gmail.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-gmail.lo -MD -MP -MF $(DEPDIR)/libjabber_la-gmail.Tpo -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-gmail.Tpo $(DEPDIR)/libjabber_la-gmail.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/gmail.c' object='libjabber_la-gmail.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c
+-
+-libjabber_la-google.lo: google/google.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google.Tpo -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google.Tpo $(DEPDIR)/libjabber_la-google.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google.c' object='libjabber_la-google.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c
+-
+-libjabber_la-google_presence.lo: google/google_presence.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_presence.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_presence.Tpo -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_presence.Tpo $(DEPDIR)/libjabber_la-google_presence.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google_presence.c' object='libjabber_la-google_presence.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c
+-
+-libjabber_la-google_roster.lo: google/google_roster.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_roster.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_roster.Tpo -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_roster.Tpo $(DEPDIR)/libjabber_la-google_roster.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google_roster.c' object='libjabber_la-google_roster.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c
+-
+-libjabber_la-google_session.lo: google/google_session.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_session.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_session.Tpo -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_session.Tpo $(DEPDIR)/libjabber_la-google_session.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google_session.c' object='libjabber_la-google_session.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c
+-
+-libjabber_la-jingleinfo.lo: google/jingleinfo.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-jingleinfo.lo -MD -MP -MF $(DEPDIR)/libjabber_la-jingleinfo.Tpo -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-jingleinfo.Tpo $(DEPDIR)/libjabber_la-jingleinfo.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/jingleinfo.c' object='libjabber_la-jingleinfo.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c
+-
+-libjabber_la-relay.lo: google/relay.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-relay.lo -MD -MP -MF $(DEPDIR)/libjabber_la-relay.Tpo -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-relay.Tpo $(DEPDIR)/libjabber_la-relay.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/relay.c' object='libjabber_la-relay.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c
+-
+ libjabber_la-ibb.lo: ibb.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-ibb.lo -MD -MP -MF $(DEPDIR)/libjabber_la-ibb.Tpo -c -o libjabber_la-ibb.lo `test -f 'ibb.c' || echo '$(srcdir)/'`ibb.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-ibb.Tpo $(DEPDIR)/libjabber_la-ibb.Plo
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/message.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/message.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c	2013-08-17 00:20:08.115874207 -0300
+@@ -30,7 +30,6 @@
+ #include "buddy.h"
+ #include "chat.h"
+ #include "data.h"
+-#include "google/google.h"
+ #include "message.h"
+ #include "xmlnode.h"
+ #include "pep.h"
+@@ -151,11 +150,6 @@
+ 			jbr->thread_id = g_strdup(jbr->thread_id);
+ 		}
+ 
+-		if (jm->js->googletalk && jm->xhtml == NULL) {
+-			char *tmp = jm->body;
+-			jm->body = jabber_google_format_to_html(jm->body);
+-			g_free(tmp);
+-		}
+ 		serv_got_im(gc, jm->from, jm->xhtml ? jm->xhtml : jm->body, 0, jm->sent);
+ 	}
+ 
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h	2013-08-17 00:11:17.449534779 -0300
+@@ -95,18 +95,4 @@
+ /* XEP-0264 File Transfer Thumbnails (Thumbs) */
+ #define NS_THUMBS "urn:xmpp:thumbs:0"
+ 
+-/* Google extensions */
+-#define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1"
+-#define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1"
+-#define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1"
+-#define NS_GOOGLE_JINGLE_INFO "google:jingleinfo"
+-
+-#define NS_GOOGLE_MAIL_NOTIFY "google:mail:notify"
+-#define NS_GOOGLE_ROSTER "google:roster"
+-
+-#define NS_GOOGLE_PROTOCOL_SESSION "http://www.google.com/xmpp/protocol/session"
+-#define NS_GOOGLE_SESSION "http://www.google.com/session"
+-#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
+-#define NS_GOOGLE_SESSION_VIDEO "http://www.google.com/session/video"
+-
+ #endif /* PURPLE_JABBER_NAMESPACES_H_ */
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/presence.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/presence.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c	2013-08-17 00:16:58.436696950 -0300
+@@ -34,8 +34,6 @@
+ 
+ #include "buddy.h"
+ #include "chat.h"
+-#include "google/google.h"
+-#include "google/google_presence.h"
+ #include "presence.h"
+ #include "iq.h"
+ #include "jutil.h"
+@@ -208,9 +206,6 @@
+ 	/* changing the buzz state has to trigger a re-broadcasting of the presence for caps */
+ 
+ 	tune = purple_presence_get_status(p, "tune");
+-	if (js->googletalk && !stripped && purple_status_is_active(tune)) {
+-		stripped = jabber_google_presence_outgoing(tune);
+-	}
+ 
+ #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \
+ 					  (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b)))
+@@ -361,11 +356,6 @@
+ #ifdef USE_VV
+ 	/*
+ 	 * MASSIVE HUGE DISGUSTING HACK
+-	 * This is a huge hack. As far as I can tell, Google Talk's gmail client
+-	 * doesn't bother to check the actual features we advertise; they
+-	 * just assume that if we specify a 'voice-v1' ext (ignoring that
+-	 * these are to be assigned no semantic value), we support receiving voice
+-	 * calls.
+ 	 *
+ 	 * Ditto for 'video-v1'.
+ 	 */
+@@ -883,7 +873,6 @@
+ 
+ 	jbr = jabber_buddy_find_resource(presence->jb, NULL);
+ 	if (jbr) {
+-		jabber_google_presence_incoming(js, buddy_name, jbr);
+ 		purple_prpl_got_user_status(account, buddy_name,
+ 				jabber_buddy_state_get_status_id(jbr->state),
+ 				"priority", jbr->priority,
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/roster.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/roster.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c	2013-08-17 00:09:16.245807467 -0300
+@@ -27,8 +27,6 @@
+ 
+ #include "buddy.h"
+ #include "chat.h"
+-#include "google/google.h"
+-#include "google/google_roster.h"
+ #include "presence.h"
+ #include "roster.h"
+ #include "iq.h"
+@@ -83,11 +81,6 @@
+ 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
+ 	query = xmlnode_get_child(iq->node, "query");
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+-		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+-		xmlnode_set_attrib(query, "gr:ext", "2");
+-	}
+-
+ 	jabber_iq_set_callback(iq, roster_request_cb, NULL);
+ 	jabber_iq_send(iq);
+ }
+@@ -244,10 +237,6 @@
+ 		} else {
+ 			GSList *groups = NULL;
+ 
+-			if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+-				if (!jabber_google_roster_incoming(js, item))
+-					continue;
+-
+ 			for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) {
+ 				char *group_name = xmlnode_get_data(group);
+ 
+@@ -349,11 +338,6 @@
+ 
+ 	g_slist_free(groups);
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+-		jabber_google_roster_outgoing(js, query, item);
+-		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+-		xmlnode_set_attrib(query, "gr:ext", "2");
+-	}
+ 	jabber_iq_send(iq);
+ }
+ 
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/Makefile.am	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am	2013-08-16 22:37:55.011207011 -0300
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+ 
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ 
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/Makefile.in	2013-02-11 07:17:19.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in	2013-08-16 23:50:36.651423353 -0300
+@@ -160,8 +160,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -223,8 +221,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -365,7 +361,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Makefile.mingw
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+ all: all-recursive
+ 
+diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h
+--- pidgin-2.10.7/libpurple/prpl.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/prpl.h	2013-08-16 22:29:46.145754932 -0300
+@@ -161,15 +161,11 @@
+ 
+ 	/**
+ 	 * Notify on new mail.
+-	 *
+-	 * MSN and Yahoo notify you when you have new mail.
+ 	 */
+ 	OPT_PROTO_MAIL_CHECK = 0x00000020,
+ 
+ 	/**
+ 	 * Images in IMs.
+-	 *
+-	 * Oscar lets you send images in direct IMs.
+ 	 */
+ 	OPT_PROTO_IM_IMAGE = 0x00000040,
+ 
+@@ -184,16 +180,13 @@
+ 	/**
+ 	 * Allows font size to be specified in sane point size
+ 	 *
+-	 * Probably just XMPP and Y!M
++	 * Probably just XMPP
+ 	 */
+ 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
+ 
+ 	/**
+ 	 * Set the Register button active even when the username has not
+ 	 * been specified.
+-	 *
+-	 * Gadu-Gadu doesn't need a username to register new account (because
+-	 * usernames are assigned by the server).
+ 	 */
+ 	OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
+ 
+@@ -467,9 +460,7 @@
+ 	void (*convo_closed)(PurpleConnection *, const char *who);
+ 
+ 	/**
+-	 *  Convert the username @a who to its canonical form.  (For example,
+-	 *  AIM treats "fOo BaR" and "foobar" as the same user; this function
+-	 *  should return the same normalized string for both of those.)
++	 *  Convert the username @a who to its canonical form.
+ 	 */
+ 	const char *(*normalize)(const PurpleAccount *, const char *who);
+ 
+@@ -923,7 +914,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  *        of the attention request command to send. 0 if prpl only defines one
+- *        (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ *        , but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler
+--- pidgin-2.10.7/libpurple/purple-url-handler	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler	2013-08-16 21:16:42.951304560 -0300
+@@ -117,70 +117,6 @@
+ def addbuddy(account, screenname, group="", alias=""):
+     cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
+ 
+-
+-def aim(uri):
+-    protocol = "prpl-aim"
+-    match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid aim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+-def gg(uri):
+-    protocol = "prpl-gg"
+-    match = re.match(r"^gg:(.*)", uri)
+-    if not match:
+-        print "Invalid gg URI: %s" % uri
+-        return
+-
+-    screenname = urllib.unquote_plus(match.group(1))
+-    account = findaccount(protocol)
+-    goim(account, screenname)
+-
+-def icq(uri):
+-    protocol = "prpl-icq"
+-    match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid icq URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+ def irc(uri):
+     protocol = "prpl-irc"
+     match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
+@@ -221,34 +157,6 @@
+                 channel = "#" + channel
+             gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
+ 
+-def msnim(uri):
+-    protocol = "prpl-msn"
+-    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid msnim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    screenname = params.get("contact", "")
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "chat":
+-        goim(account, screenname)
+-    elif command.lower() == "add":
+-        addbuddy(account, screenname)
+-
+-def myim(uri):
+-        protocol = "prpl-myspace"
+-        print "TODO: send uri: ", uri
+-        assert False, "Not implemented"
+-
+ def sip(uri):
+     protocol = "prpl-simple"
+     match = re.match(r"^sip:(.*)", uri)
+@@ -300,57 +208,6 @@
+     else:
+         goim(account, screenname)
+ 
+-def gtalk(uri):
+-    protocol = "prpl-jabber"
+-    match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid gtalk URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("from_jid", "")
+-    jid = params.get("jid", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "chat":
+-        goim(account, jid)
+-    elif command.lower() == "call":
+-        # XXX V&V prompt to establish call
+-        goim(account, jid)
+-
+-def ymsgr(uri):
+-    protocol = "prpl-yahoo"
+-    match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+-    if not match:
+-        print "Invalid ymsgr URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    screenname = urllib.unquote_plus(match.group(3))
+-    paramstring = match.group(5)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "sendim":
+-        goim(account, screenname, params.get("m"))
+-    elif command.lower() == "chat":
+-        gochat(account, {"room": screenname})
+-    elif command.lower() == "addfriend":
+-        addbuddy(account, screenname)
+-
+-
+ def main(argv=sys.argv):
+     if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
+         print "Usage: %s URI" % argv[0]
+diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c
+--- pidgin-2.10.7/libpurple/savedstatuses.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c	2013-08-16 22:52:44.582754543 -0300
+@@ -387,7 +387,6 @@
+ 		const char *protocol;
+ 		acct_name = xmlnode_get_data(node);
+ 		protocol = xmlnode_get_attrib(node, "protocol");
+-		protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 		if ((acct_name != NULL) && (protocol != NULL))
+ 			ret->account = purple_accounts_find(acct_name, protocol);
+ 		g_free(acct_name);
+diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h
+--- pidgin-2.10.7/libpurple/server.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/server.h	2013-08-16 23:30:04.149920853 -0300
+@@ -69,7 +69,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  * 	of the attention request command to send. 0 if prpl only defines one
+- * 	(for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * 	, but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h
+--- pidgin-2.10.7/libpurple/status.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/status.h	2013-08-16 22:52:22.542054119 -0300
+@@ -43,8 +43,7 @@
+  * one of your AIM buddies has set himself as "away."  You have a
+  * PurpleBuddy node for this person in your buddy list.  Purple wants
+  * to mark this buddy as "away," so it creates a new PurpleStatus.
+- * The PurpleStatus has its PurpleStatusType set to the "away" state
+- * for the oscar PRPL.  The PurpleStatus also contains the buddy's
++ * The PurpleStatus also contains the buddy's
+  * away message.  PurpleStatuses are sometimes saved, depending on
+  * the context.  The current PurpleStatuses associated with each of
+  * your accounts are saved so that the next time you start Purple,
+diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c
+--- pidgin-2.10.7/libpurple/tests/check_libpurple.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c	2013-08-16 22:55:33.731462302 -0300
+@@ -88,8 +88,6 @@
+ 	srunner_add_suite(sr, jabber_digest_md5_suite());
+ 	srunner_add_suite(sr, jabber_jutil_suite());
+ 	srunner_add_suite(sr, jabber_scram_suite());
+-	srunner_add_suite(sr, oscar_util_suite());
+-	srunner_add_suite(sr, yahoo_util_suite());
+ 	srunner_add_suite(sr, util_suite());
+ 	srunner_add_suite(sr, xmlnode_suite());
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am
+--- pidgin-2.10.7/libpurple/tests/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am	2013-08-16 22:56:03.189064778 -0300
+@@ -14,8 +14,6 @@
+ 		test_jabber_digest_md5.c \
+ 		test_jabber_jutil.c \
+ 		test_jabber_scram.c \
+-		test_oscar_util.c \
+-		test_yahoo_util.c \
+ 		test_util.c \
+ 		test_xmlnode.c \
+ 		$(top_builddir)/libpurple/util.h
+@@ -31,8 +29,6 @@
+ 
+ check_libpurple_LDADD=\
+ 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ 		$(top_builddir)/libpurple/libpurple.la \
+         @CHECK_LIBS@ \
+ 		$(GLIB_LIBS)
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in
+--- pidgin-2.10.7/libpurple/tests/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in	2013-08-16 23:53:20.713146759 -0300
+@@ -65,8 +65,8 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \
+ 	test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \
+-	test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \
+-	test_yahoo_util.c test_util.c test_xmlnode.c \
++	test_jabber_jutil.c test_jabber_scram.c \
++	 test_util.c test_xmlnode.c \
+ 	$(top_builddir)/libpurple/util.h
+ @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS =  \
+ @HAVE_CHECK_TRUE@	check_libpurple-check_libpurple.$(OBJEXT) \
+@@ -75,15 +75,11 @@
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_digest_md5.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_jutil.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_scram.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_oscar_util.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_yahoo_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_xmlnode.$(OBJEXT)
+ check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -177,8 +173,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -240,8 +234,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -389,8 +381,6 @@
+ @HAVE_CHECK_TRUE@		test_jabber_digest_md5.c \
+ @HAVE_CHECK_TRUE@		test_jabber_jutil.c \
+ @HAVE_CHECK_TRUE@		test_jabber_scram.c \
+-@HAVE_CHECK_TRUE@		test_oscar_util.c \
+-@HAVE_CHECK_TRUE@		test_yahoo_util.c \
+ @HAVE_CHECK_TRUE@		test_util.c \
+ @HAVE_CHECK_TRUE@		test_xmlnode.c \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/util.h
+@@ -406,8 +396,6 @@
+ 
+ @HAVE_CHECK_TRUE@check_libpurple_LDADD = \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@        @CHECK_LIBS@ \
+ @HAVE_CHECK_TRUE@		$(GLIB_LIBS)
+@@ -471,10 +459,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -581,34 +567,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi`
+ 
+-check_libpurple-test_oscar_util.o: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-
+-check_libpurple-test_oscar_util.obj: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-
+-check_libpurple-test_yahoo_util.o: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-
+-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-
+ check_libpurple-test_util.o: test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c	2013-08-17 00:25:08.235128437 -0300
+@@ -33,7 +33,7 @@
+ START_TEST(test_calculate_caps)
+ {
+ 	assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+-	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
++	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+ }
+ END_TEST
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c	2013-08-27 22:53:21.524229291 -0300
+@@ -99,19 +99,19 @@
+ 
+ START_TEST(test_jabber_id_new)
+ {
+-	assert_valid_jid("gmail.com");
+-	assert_valid_jid("gmail.com/Test");
+-	assert_valid_jid("gmail.com/Test@");
+-	assert_valid_jid("gmail.com/@");
+-	assert_valid_jid("gmail.com/Test@alkjaweflkj");
+-	assert_valid_jid("mark.doliner@gmail.com");
+-	assert_valid_jid("mark.doliner@gmail.com/Test12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
++	assert_valid_jid("mail.com");
++	assert_valid_jid("mail.com/Test");
++	assert_valid_jid("mail.com/Test@");
++	assert_valid_jid("mail.com/@");
++	assert_valid_jid("mail.com/Test@alkjaweflkj");
++	assert_valid_jid("mark.doliner@mail.com");
++	assert_valid_jid("mark.doliner@mail.com/Test12345");
++	assert_valid_jid("mark.doliner@mail.com/Test@12345");
++	assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345");
+ 	assert_valid_jid("わいど@conference.jabber.org");
+ 	assert_valid_jid("まりるーむ@conference.jabber.org");
+-	assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+-	assert_valid_jid("mark.doliner@gmail/stuff.org");
++	assert_valid_jid("mark.doliner@mail.com/まりるーむ");
++	assert_valid_jid("mark.doliner@mail/stuff.org");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+ 	assert_valid_jid("mark.doliner@わいど.org");
+@@ -123,17 +123,17 @@
+ 	assert_valid_jid("pa=ul@10.0.42.230");
+ 	assert_valid_jid("pa,ul@10.0.42.230");
+ 
+-	assert_invalid_jid("@gmail.com");
+-	assert_invalid_jid("@@gmail.com");
+-	assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+-	assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+-	assert_invalid_jid("@gmail.com/Test@12345");
++	assert_invalid_jid("@mail.com");
++	assert_invalid_jid("@@mail.com");
++	assert_invalid_jid("mark.doliner@@mail.com/Test12345");
++	assert_invalid_jid("mark@doliner@mail.com/Test12345");
++	assert_invalid_jid("@mail.com/Test@12345");
+ 	assert_invalid_jid("/Test@12345");
+ 	assert_invalid_jid("mark.doliner@");
+ 	assert_invalid_jid("mark.doliner/");
+-	assert_invalid_jid("mark.doliner@gmail_stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail[stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail\\stuff.org");
++	assert_invalid_jid("mark.doliner@mail_stuff.org");
++	assert_invalid_jid("mark.doliner@mail[stuff.org");
++	assert_invalid_jid("mark.doliner@mail\\stuff.org");
+ 	assert_invalid_jid("paul@[::1]124");
+ 	assert_invalid_jid("paul@2[::1]124/as");
+ 	assert_invalid_jid("paul@まつ.おおかみ/\x01");
+diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h
+--- pidgin-2.10.7/libpurple/tests/tests.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h	2013-08-16 22:56:18.999567027 -0300
+@@ -13,8 +13,6 @@
+ Suite * jabber_digest_md5_suite(void);
+ Suite * jabber_jutil_suite(void);
+ Suite * jabber_scram_suite(void);
+-Suite * oscar_util_suite(void);
+-Suite * yahoo_util_suite(void);
+ Suite * util_suite(void);
+ Suite * xmlnode_suite(void);
+ 
+diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c
+--- pidgin-2.10.7/libpurple/util.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.c	2013-08-16 23:29:38.062434329 -0300
+@@ -3451,8 +3451,7 @@
+  *       is set to TRUE if this URL is https, otherwise it is set to
+  *       FALSE.  But that change will break the API.
+  *
+- *       This is important for Yahoo! web messenger login.  They now
+- *       force https login, and if you access the web messenger login
++ *       They now force https login, and if you access the web messenger login
+  *       page via http then it redirects you to the https version, but
+  *       purple_util_fetch_url() ignores the "https" and attempts to
+  *       fetch the URL via http again, which gets redirected again.
+@@ -4943,18 +4942,6 @@
+ 	return buf;
+ }
+ 
+-const char *_purple_oscar_convert(const char *act, const char *protocol)
+-{
+-	if (act && purple_strequal(protocol, "prpl-oscar")) {
+-		int i;
+-		for (i = 0; act[i] != '\0'; i++)
+-			if (!isdigit(act[i]))
+-				return "prpl-aim";
+-		return "prpl-icq";
+-	}
+-	return protocol;
+-}
+-
+ void purple_restore_default_signal_handlers(void)
+ {
+ #ifndef _WIN32
+diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h
+--- pidgin-2.10.7/libpurple/util.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.h	2013-08-16 23:31:12.535403448 -0300
+@@ -456,8 +456,7 @@
+ /**
+  * Extracts a field of data from HTML.
+  *
+- * This is a scary function. See protocols/msn/msn.c and
+- * protocols/yahoo/yahoo_profile.c for example usage.
++ * This is a scary function.
+  *
+  * @param str            The string to parse.
+  * @param len            The size of str.
+@@ -1450,16 +1449,6 @@
+ const char *purple_escape_filename(const char *str);
+ 
+ /**
+- * This is added temporarily to assist the split of oscar into aim and icq.
+- * This should not be used by plugins.
+- *
+- * @deprecated This function should not be used in new code and should be
+- *             removed in 3.0.0.  The aim/icq prpl split happened a long
+- *             time ago, and we don't need to keep migrating old data.
+- */
+-const char *_purple_oscar_convert(const char *act, const char *protocol);
+-
+-/**
+  * Restore default signal handlers for signals which might reasonably have
+  * handlers. This should be called by a fork()'d child process, since child processes
+  * inherit the handlers of the parent.
+diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c
+--- pidgin-2.10.7/pidgin/gtkaccount.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c	2013-08-27 22:45:35.495576079 -0300
+@@ -563,16 +563,11 @@
+ 		if (value == NULL)
+ 			value = purple_account_user_split_get_default_value(split);
+ 
+-		/* Google Talk default domain hackery! */
+ 		menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
+ 		item = gtk_menu_get_active(GTK_MENU(menu));
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
++		if (value == NULL && g_object_get_data(G_OBJECT(item), "") &&
+ 			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "gmail.com";
+-
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "chat.facebook.com";
++			value = "";
+ 
+ 		if (value != NULL)
+ 			gtk_entry_set_text(GTK_ENTRY(entry), value);
+@@ -925,10 +920,6 @@
+ 				model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ 				opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+ 
+-				if (g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-					!strcmp(opt_entry->setting, "connection_security"))
+-					str_value = "opportunistic_tls";
+-
+ 				/* Loop through list of PurpleKeyValuePair items */
+ 				for (node = list; node != NULL; node = node->next) {
+ 					if (node->data != NULL) {
+diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c
+--- pidgin-2.10.7/pidgin/gtkblist.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c	2013-08-16 23:10:16.549286879 -0300
+@@ -2126,10 +2126,6 @@
+ 	char *temp_vcard;
+ 	char *s, *c;
+ 	char *alias    = NULL;
+-	GList *aims    = NULL;
+-	GList *icqs    = NULL;
+-	GList *yahoos  = NULL;
+-	GList *msns    = NULL;
+ 	GList *jabbers = NULL;
+ 
+ 	s = temp_vcard = g_strdup(vcard);
+@@ -2168,24 +2164,14 @@
+ 		/* We only want to worry about a few fields here. */
+ 		if (!strcmp(field, "FN"))
+ 			alias = g_strdup(value);
+-		else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
+-				 !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
+-				 !strcmp(field, "X-JABBER"))
++		else if (!strcmp(field, "X-JABBER"))
+ 		{
+ 			char **values = g_strsplit(value, ":", 0);
+ 			char **im;
+ 
+ 			for (im = values; *im != NULL; im++)
+ 			{
+-				if (!strcmp(field, "X-AIM"))
+-					aims = g_list_append(aims, g_strdup(*im));
+-				else if (!strcmp(field, "X-ICQ"))
+-					icqs = g_list_append(icqs, g_strdup(*im));
+-				else if (!strcmp(field, "X-YAHOO"))
+-					yahoos = g_list_append(yahoos, g_strdup(*im));
+-				else if (!strcmp(field, "X-MSN"))
+-					msns = g_list_append(msns, g_strdup(*im));
+-				else if (!strcmp(field, "X-JABBER"))
++				if (!strcmp(field, "X-JABBER"))
+ 					jabbers = g_list_append(jabbers, g_strdup(*im));
+ 			}
+ 
+@@ -2195,18 +2181,13 @@
+ 
+ 	g_free(temp_vcard);
+ 
+-	if (aims == NULL && icqs == NULL && yahoos == NULL &&
+-		msns == NULL && jabbers == NULL)
++	if (jabbers == NULL)
+ 	{
+ 		g_free(alias);
+ 
+ 		return FALSE;
+ 	}
+ 
+-	add_buddies_from_vcard("prpl-aim",    group, aims,    alias);
+-	add_buddies_from_vcard("prpl-icq",    group, icqs,    alias);
+-	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
+-	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
+ 	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+ 
+ 	g_free(alias);
+diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c
+--- pidgin-2.10.7/pidgin/gtkdialogs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c	2013-08-16 21:37:21.863154130 -0300
+@@ -615,16 +615,6 @@
+ #endif
+ #endif
+ 
+-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
+-#else
+-#ifdef HAVE_LIBGADU
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
+-#else
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
+-#endif
+-#endif
+-
+ #ifdef USE_GTKSPELL
+ 	g_string_append(str, "    <b>GtkSpell:</b> Enabled<br/>");
+ #else
+diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c
+--- pidgin-2.10.7/pidgin/gtkimhtml.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c	2013-08-16 22:59:51.862994429 -0300
+@@ -2440,7 +2440,6 @@
+ static gboolean smooth_scroll_cb(gpointer data);
+ 
+ /*
+- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
+ 
+ 
+ [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
+diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c
+--- pidgin-2.10.7/pidgin/gtknotify.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c	2013-08-27 23:37:23.037593200 -0300
+@@ -1263,10 +1263,6 @@
+ 			command = g_strdup_printf("xdg-open %s", escaped);
+ 		g_free(tmp);
+ 	}
+-	else if (purple_running_osx() == TRUE)
+-	{
+-		command = g_strdup_printf("open %s", escaped);
+-	}
+ 	else if (!strcmp(web_browser, "epiphany") ||
+ 		!strcmp(web_browser, "galeon"))
+ 	{
+@@ -1289,30 +1285,31 @@
+ 	{
+ 		command = g_strdup_printf("kfmclient openURL %s", escaped);
+ 		/*
+-		 * Does Konqueror have options to open in new tab
++		 * Does Konqueror-libre have options to open in new tab
+ 		 * and/or current window?
+ 		 */
+ 	}
+-	else if (!strcmp(web_browser, "mozilla") ||
+-			 !strcmp(web_browser, "mozilla-firebird") ||
+-			 !strcmp(web_browser, "firefox") ||
+-			 !strcmp(web_browser, "seamonkey"))
++	else if (!strcmp(web_browser, "iceweasel") ||
++			 !strcmp(web_browser, "icecat") ||
++			 !strcmp(web_browser, "iceape"))
+ 	{
+ 		char *args = "";
+ 
+ 		command = g_strdup_printf("%s %s", web_browser, escaped);
+ 
+ 		/*
+-		 * Firefox 0.9 and higher require a "-a firefox" option when
++		 * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when
+ 		 * using -remote commands.  This breaks older versions of
+ 		 * mozilla.  So we include this other handly little string
+-		 * when calling firefox.  If the API for remote calls changes
+-		 * any more in firefox then firefox should probably be split
++		 * when calling iceweasel.  If the API for remote calls changes
++		 * any more in iceweasel then iceweasel should probably be split
+ 		 * apart from mozilla-firebird and mozilla... but this is good
+ 		 * for now.
+ 		 */
+-		if (!strcmp(web_browser, "firefox"))
+-			args = "-a firefox";
++		if (!strcmp(web_browser, "iceweasel"))
++			args = "-a iceweasel";
++		else if (!strcmp(web_browser, "icecat"))
++			args = "-a icecat";
+ 
+ 		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+ 			remote_command = g_strdup_printf("%s %s -remote "
+@@ -1327,58 +1324,12 @@
+ 											 "openURL(%s)",
+ 											 web_browser, args, escaped);
+ 	}
+-	else if (!strcmp(web_browser, "netscape"))
+-	{
+-		command = g_strdup_printf("netscape %s", escaped);
+-
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s,new-window)",
+-											 escaped);
+-		}
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s)", escaped);
+-		}
+-	}
+-	else if (!strcmp(web_browser, "opera"))
+-	{
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-			command = g_strdup_printf("opera -newwindow %s", escaped);
+-		else if (place == PIDGIN_BROWSER_NEW_TAB)
+-			command = g_strdup_printf("opera -newpage %s", escaped);
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("opera -remote "
+-											 "openURL(%s)", escaped);
+-			command = g_strdup_printf("opera %s", escaped);
+-		}
+-		else
+-			command = g_strdup_printf("opera %s", escaped);
+-
+-	}
+-	else if (!strcmp(web_browser, "google-chrome"))
+-	{
+-		/* Google Chrome doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Google Chrome. */
+-		command = g_strdup_printf("google-chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chrome"))
+-	{
+-		/* Chromium doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chromium-browser"))
++	else if (!strcmp(web_browser, "chromium"))
+ 	{
+-		/* Chromium doesn't have command-line arguments that control the
++		/* Chromium-libre doesn't have command-line arguments that control the
+ 		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chromium-browser %s", escaped);
++		 * a preference within Chromium-libre. */
++		command = g_strdup_printf("chromium %s", escaped);
+ 	}
+ 	else if (!strcmp(web_browser, "custom"))
+ 	{
+diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c
+--- pidgin-2.10.7/pidgin/gtkprefs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c	2013-08-27 22:55:58.523782666 -0300
+@@ -1851,24 +1851,15 @@
+ 
+ 	/* Sorted reverse alphabetically */
+ 	static const struct browser possible_browsers[] = {
+-		{N_("Seamonkey"), "seamonkey"},
+-		{N_("Opera"), "opera"},
+-		{N_("Netscape"), "netscape"},
+-		{N_("Mozilla"), "mozilla"},
+-		{N_("Konqueror"), "kfmclient"},
+-		{N_("Google Chrome"), "google-chrome"},
+-		/* Do not move the line below.  Code below expects gnome-open to be in
+-		 * this list immediately after xdg-open! */
++		{N_("Iceape-libre"), "iceape"},
++		{N_("Konqueror-libre"), "kfmclient"},
+ 		{N_("Desktop Default"), "xdg-open"},
+ 		{N_("GNOME Default"), "gnome-open"},
+-		{N_("Galeon"), "galeon"},
+-		{N_("Firefox"), "firefox"},
+-		{N_("Firebird"), "mozilla-firebird"},
+-		{N_("Epiphany"), "epiphany"},
+-		/* Translators: please do not translate "chromium-browser" here! */
+-		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+-		/* Translators: please do not translate "chrome" here! */
+-		{N_("Chromium (chrome)"), "chrome"}
++		{N_("Iceweasel-libre"), "iceweasel"},
++		{N_("Icecat"), "icecat"},
++		{N_("Epiphany-libre"), "epiphany"},
++		/* Translators: please do not translate "chromium" here! */
++		{N_("Chromium-libre (chromium)"), "chromium"},
+ 	};
+ 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
+ 
+diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
+--- pidgin-2.10.7/pidgin/gtkutils.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkutils.c	2013-08-16 19:59:22.633298587 -0300
+@@ -677,7 +677,6 @@
+ 	GdkPixbuf *pixbuf = NULL;
+ 	GtkSizeGroup *sg;
+ 	GList *p;
+-	const char *gtalk_name = NULL, *facebook_name = NULL;
+ 	int i;
+ 
+ 	aop_menu = g_malloc0(sizeof(AopMenu));
+@@ -686,55 +685,12 @@
+ 	gtk_widget_show(aop_menu->menu);
+ 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-	if (purple_find_prpl("prpl-jabber")) {
+-		gtalk_name = _("Google Talk");
+-		facebook_name = _("Facebook (XMPP)");
+-	}
+-
+ 	for (p = purple_plugins_get_protocols(), i = 0;
+ 		 p != NULL;
+ 		 p = p->next, i++) {
+ 
+ 		plugin = (PurplePlugin *)p->data;
+ 
+-		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
+-			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+-			                                  "16", "google-talk.png", NULL);
+-			GtkWidget *item;
+-
+-			pixbuf = pidgin_pixbuf_new_from_file(filename);
+-			g_free(filename);
+-
+-			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+-				item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));
+-			g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1));
+-
+-			if (pixbuf)
+-				g_object_unref(pixbuf);
+-
+-			gtalk_name = NULL;
+-			i++;
+-		}
+-
+-		if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
+-			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+-			                                  "16", "facebook.png", NULL);
+-			GtkWidget *item;
+-
+-			pixbuf = pidgin_pixbuf_new_from_file(filename);
+-			g_free(filename);
+-
+-			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+-				item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol"));
+-			g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1));
+-
+-			if (pixbuf)
+-				g_object_unref(pixbuf);
+-
+-			facebook_name = NULL;
+-			i++;
+-		}
+-
+ 		pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
+ 
+ 		gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c	2013-08-16 23:25:21.614375960 -0300
+@@ -339,13 +339,10 @@
+ 	 */
+ 	/* XXXX because otherwise gettext will see this string, even though it's
+ 	 * in an #if 0 block. Remove the XXXX if you want to use this code.
+-	 * But, it really shouldn't be a Yahoo-specific string. ;) */
++	 */
+ 	purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."),
+ 					   PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL));
+ 
+-	yahoo_doodle_command_send_request(gc, to);
+-	yahoo_doodle_command_send_ready(gc, to);
+-
+ 	/* Insert this 'session' in the list.  At this point, it's only a requested
+ 	 * session.
+ 	 */
+@@ -554,15 +551,13 @@
+ 	if(event->button == 1 && pixmap != NULL)
+ 	{
+ 		/* If the brush was never moved, express two sets of two deltas That's a
+-		 * 'point,' but not for Yahoo!
++		 * 'point,'
+ 		 */
+ 		/* if((event->x == LastX) && (event->y == LastY)) */
+ 		if(MotionCount == 0)
+ 		{
+ 			int index;
+ 
+-			/* For Yahoo!, a (0 0) indicates the end of drawing */
+-			/* FIXME: Yahoo Doodle specific! */
+ 			for(index = 0; index < 2; index++)
+ 			{
+ 				draw_list = g_list_append(draw_list, 0);
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h	2013-08-27 23:28:41.018759351 -0300
+@@ -37,8 +37,7 @@
+ #define BRUSH_STATE_DOWN    1
+ #define BRUSH_STATE_MOTION  2
+ 
+-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code.
+- * XXX: How should they work together? */
++/* XXX: How should they work together? */
+ #define PALETTE_NUM_COLORS  7
+ 
+ /**
+diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am
+--- pidgin-2.10.7/pidgin/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am	2013-08-16 21:03:34.936610745 -0300
+@@ -160,10 +160,6 @@
+ 	$(GTK_LIBS) \
+ 	$(top_builddir)/libpurple/libpurple.la
+ 
+-if USE_INTERNAL_LIBGADU
+-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+-endif
+-
+ AM_CPPFLAGS = \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLIBDIR=\"$(libdir)/pidgin/\" \
+@@ -179,6 +175,5 @@
+ 	$(GTK_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GTKSPELL_CFLAGS) \
+-	$(LIBXML_CFLAGS) \
+-	$(INTGG_CFLAGS)
++	$(LIBXML_CFLAGS)
+ endif  # ENABLE_GTK
+diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in
+--- pidgin-2.10.7/pidgin/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in	2013-08-16 23:56:44.729405978 -0300
+@@ -286,8 +286,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -349,8 +347,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -645,7 +641,6 @@
+ @ENABLE_GTK_TRUE@	$(GTK_LIBS) \
+ @ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la
+ 
+-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
+ @ENABLE_GTK_TRUE@	-DDATADIR=\"$(datadir)\" \
+ @ENABLE_GTK_TRUE@	-DLIBDIR=\"$(libdir)/pidgin/\" \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-08-16 23:13:41.759061988 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.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
+-sleeping.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
+-excited.png         /:D      /cy       /toothy_smile
+-happy.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
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.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
+-afraid.png          /shake   /fad      /shake
+-amorous.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
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_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              /<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
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme	2013-08-16 23:15:55.929941297 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.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
+-sleeping.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
+-excited.png         /:D      /cy       /toothy_smile
+-happy.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
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.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
+-afraid.png          /shake   /fad      /shake
+-amorous.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
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_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              /<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
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-08-16 23:19:01.815778718 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme	2013-08-16 23:17:03.828740061 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am	2013-08-17 00:00:17.335924146 -0300
+@@ -204,37 +204,19 @@
+ 		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ PROTOCOLS_16_SCALABLE = \
+-		protocols/16/scalable/aim.svg \
+ 		protocols/16/scalable/bonjour.svg \
+-		protocols/16/scalable/gadu-gadu.svg \
+-		protocols/16/scalable/novell.svg \
+-		protocols/16/scalable/icq.svg \
+ 		protocols/16/scalable/irc.svg \
+ 		protocols/16/scalable/jabber.svg \
+-		protocols/16/scalable/meanwhile.svg \
+-		protocols/16/scalable/msn.svg \
+ 		protocols/16/scalable/silc.svg \
+ 		protocols/16/scalable/simple.svg \
+-		protocols/16/scalable/yahoo.svg \
+ 		protocols/16/scalable/zephyr.svg
+ 
+ PROTOCOLS_16 = \
+-		protocols/16/aim.png \
+ 		protocols/16/bonjour.png \
+-		protocols/16/facebook.png \
+-		protocols/16/gadu-gadu.png \
+-		protocols/16/google-talk.png \
+-		protocols/16/novell.png \
+-		protocols/16/icq.png \
+ 		protocols/16/irc.png \
+ 		protocols/16/jabber.png \
+-		protocols/16/meanwhile.png \
+-		protocols/16/msn.png \
+-		protocols/16/mxit.png \
+-		protocols/16/myspace.png \
+ 		protocols/16/silc.png \
+ 		protocols/16/simple.png \
+-		protocols/16/yahoo.png \
+ 		protocols/16/zephyr.png
+ 
+ ICONS_16_SCALABLE = \
+@@ -259,72 +241,35 @@
+ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ 
+ PROTOCOLS_22_SCALABLE = \
+-		protocols/22/scalable/aim.svg \
+ 		protocols/22/scalable/bonjour.svg \
+-		protocols/22/scalable/gadu-gadu.svg \
+-		protocols/22/scalable/novell.svg \
+-		protocols/22/scalable/icq.svg \
+ 		protocols/22/scalable/irc.svg \
+ 		protocols/22/scalable/jabber.svg \
+-		protocols/22/scalable/meanwhile.svg \
+-		protocols/22/scalable/msn.svg \
+ 		protocols/22/scalable/silc.svg \
+ 		protocols/22/scalable/simple.svg \
+-		protocols/22/scalable/yahoo.svg \
+ 		protocols/22/scalable/zephyr.svg
+ 
+ PROTOCOLS_22 = \
+-		protocols/22/aim.png \
+ 		protocols/22/bonjour.png \
+-		protocols/22/facebook.png \
+-		protocols/22/gadu-gadu.png \
+-		protocols/22/google-talk.png \
+-		protocols/22/novell.png \
+-		protocols/22/icq.png \
+ 		protocols/22/irc.png \
+ 		protocols/22/jabber.png \
+-		protocols/22/meanwhile.png \
+-		protocols/22/msn.png \
+-		protocols/22/mxit.png \
+-		protocols/22/myspace.png \
+ 		protocols/22/silc.png \
+ 		protocols/22/simple.png \
+-		protocols/22/yahoo.png \
+ 		protocols/22/zephyr.png
+ 
+ PROTOCOLS_48 = \
+-		protocols/48/aim.png \
+ 		protocols/48/bonjour.png \
+-		protocols/48/facebook.png \
+-		protocols/48/gadu-gadu.png \
+-		protocols/48/novell.png \
+-		protocols/48/icq.png \
+ 		protocols/48/irc.png \
+ 		protocols/48/jabber.png \
+-		protocols/48/meanwhile.png \
+-		protocols/48/msn.png \
+-		protocols/48/mxit.png \
+-		protocols/48/myspace.png \
+ 		protocols/48/silc.png \
+ 		protocols/48/simple.png \
+-		protocols/48/yahoo.png \
+ 		protocols/48/zephyr.png
+ 
+ PROTOCOLS_SCALABLE = \
+-		protocols/scalable/aim.svg \
+ 		protocols/scalable/bonjour.svg \
+-		protocols/scalable/gadu-gadu.svg \
+-		protocols/scalable/google-talk.svg \
+-		protocols/scalable/novell.svg \
+-		protocols/scalable/icq.svg \
+ 		protocols/scalable/irc.svg \
+ 		protocols/scalable/jabber.svg \
+-		protocols/scalable/meanwhile.svg \
+-		protocols/scalable/msn.svg \
+-		protocols/scalable/mxit.svg \
+ 		protocols/scalable/silc.svg \
+ 		protocols/scalable/simple.svg \
+-		protocols/scalable/yahoo.svg \
+ 		protocols/scalable/zephyr.svg
+ 
+ STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in	2013-08-16 23:59:52.918508551 -0300
+@@ -240,40 +240,19 @@
+ 	emblems/scalable/male.svg emblems/scalable/not-authorized.svg \
+ 	emblems/scalable/secure.svg emblems/scalable/unavailable.svg \
+ 	emblems/scalable/video.svg emblems/scalable/voice.svg \
+-	protocols/16/aim.png protocols/16/bonjour.png \
+-	protocols/16/facebook.png protocols/16/gadu-gadu.png \
+-	protocols/16/google-talk.png protocols/16/novell.png \
+-	protocols/16/icq.png protocols/16/irc.png \
+-	protocols/16/jabber.png protocols/16/meanwhile.png \
+-	protocols/16/msn.png protocols/16/mxit.png \
+-	protocols/16/myspace.png protocols/16/silc.png \
+-	protocols/16/simple.png protocols/16/yahoo.png \
+-	protocols/16/zephyr.png protocols/22/aim.png \
+-	protocols/22/bonjour.png protocols/22/facebook.png \
+-	protocols/22/gadu-gadu.png protocols/22/google-talk.png \
+-	protocols/22/novell.png protocols/22/icq.png \
+-	protocols/22/irc.png protocols/22/jabber.png \
+-	protocols/22/meanwhile.png protocols/22/msn.png \
+-	protocols/22/mxit.png protocols/22/myspace.png \
+-	protocols/22/silc.png protocols/22/simple.png \
+-	protocols/22/yahoo.png protocols/22/zephyr.png \
+-	protocols/48/aim.png protocols/48/bonjour.png \
+-	protocols/48/facebook.png protocols/48/gadu-gadu.png \
+-	protocols/48/novell.png protocols/48/icq.png \
+-	protocols/48/irc.png protocols/48/jabber.png \
+-	protocols/48/meanwhile.png protocols/48/msn.png \
+-	protocols/48/mxit.png protocols/48/myspace.png \
+-	protocols/48/silc.png protocols/48/simple.png \
+-	protocols/48/yahoo.png protocols/48/zephyr.png \
+-	protocols/scalable/aim.svg protocols/scalable/bonjour.svg \
+-	protocols/scalable/gadu-gadu.svg \
+-	protocols/scalable/google-talk.svg \
+-	protocols/scalable/novell.svg protocols/scalable/icq.svg \
+-	protocols/scalable/irc.svg protocols/scalable/jabber.svg \
+-	protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \
+-	protocols/scalable/mxit.svg protocols/scalable/silc.svg \
+-	protocols/scalable/simple.svg protocols/scalable/yahoo.svg \
+-	protocols/scalable/zephyr.svg status/11/available.png \
++	protocols/16/bonjour.png protocols/16/irc.png \
++	protocols/16/jabber.png protocols/16/silc.png \
++	protocols/16/simple.png protocols/16/zephyr.png \
++	protocols/22/bonjour.png protocols/22/irc.png \
++	protocols/22/jabber.png protocols/22/silc.png \
++	protocols/22/simple.png protocols/22/zephyr.png \
++	protocols/48/bonjour.png protocols/48/irc.png \
++	protocols/48/jabber.png protocols/48/silc.png \
++	protocols/48/simple.png protocols/48/zephyr.png \
++	protocols/scalable/bonjour.svg protocols/scalable/irc.svg \
++	protocols/scalable/jabber.svg protocols/scalable/silc.svg \
++	protocols/scalable/simple.svg protocols/scalable/zephyr.svg \
++	status/11/available.png \
+ 	status/11/away.png status/11/busy.png status/11/chat.png \
+ 	status/11/extended-away.png status/11/invisible.png \
+ 	status/11/log-in.png status/11/log-out.png \
+@@ -443,8 +422,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -506,8 +483,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -850,37 +825,19 @@
+ @INSTALL_PIXMAPS_TRUE@		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \
+@@ -899,72 +856,35 @@
+ @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
+ @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/google-talk.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/msn.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/mxit.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c
+--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c	2013-08-16 23:39:46.921427463 -0300
+@@ -250,9 +250,6 @@
+ 	const char *from;
+ 	const char *to;
+ } disco_type_mappings[] = {
+-	{ "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+-	{ "sametime",  "meanwhile" },
+-	{ "myspaceim", "myspace" },
+ 	{ "xmpp",      "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+ 	{ NULL,        NULL }
+ };
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-08-16 21:26:56.293625899 -0300
+@@ -288,21 +288,13 @@
+ 	{
+ 		EContact *contact = E_CONTACT(c->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -315,13 +307,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ 
+@@ -367,7 +353,7 @@
+ 	{
+ 		EContact *contact = E_CONTACT(l->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+@@ -377,17 +363,9 @@
+ 			continue;
+ 		}
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -400,13 +378,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ }
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c	2013-08-16 21:14:05.483056049 -0300
+@@ -119,13 +119,7 @@
+ 
+ 	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-	update_ims_from_contact(contact, name, "prpl-aim",    E_CONTACT_IM_AIM);
+ 	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+-	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
+-	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
+-	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
+-	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+-	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
+ }
+ 
+ static void
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c	2013-08-16 23:20:45.692374640 -0300
+@@ -99,20 +99,8 @@
+ 
+ 	protocol_id = purple_account_get_protocol_id(account);
+ 
+-	if (!strcmp(protocol_id, "prpl-aim"))
+-		protocol_field = E_CONTACT_IM_AIM;
+-	else if (!strcmp(protocol_id, "prpl-icq"))
+-		protocol_field = E_CONTACT_IM_ICQ;
+-	else if (!strcmp(protocol_id, "prpl-msn"))
+-		protocol_field = E_CONTACT_IM_MSN;
+-	else if (!strcmp(protocol_id, "prpl-yahoo"))
+-		protocol_field = E_CONTACT_IM_YAHOO;
+-	else if (!strcmp(protocol_id, "prpl-jabber"))
++	if (!strcmp(protocol_id, "prpl-jabber"))
+ 		protocol_field = E_CONTACT_IM_JABBER;
+-	else if (!strcmp(protocol_id, "prpl-novell"))
+-		protocol_field = E_CONTACT_IM_GROUPWISE;
+-	else if (!strcmp(protocol_id, "prpl-gg"))
+-		protocol_field = E_CONTACT_IM_GADUGADU;
+ 
+ 	return protocol_field;
+ }
+@@ -169,18 +157,6 @@
+ 	{
+ 		PurpleAccount *account = purple_buddy_get_account(buddy);
+ 		const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-		if (!strcmp(prpl_id, "prpl-msn"))
+-		{
+-			mail = g_strdup(purple_normalize(account,
+-										   purple_buddy_get_name(buddy)));
+-		}
+-		else if (!strcmp(prpl_id, "prpl-yahoo"))
+-		{
+-			mail = g_strdup_printf("%s@yahoo.com",
+-								   purple_normalize(account,
+-												  purple_buddy_get_name(buddy)));
+-		}
+ 	}
+ 
+ 	return mail;
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c	2013-08-16 21:23:26.207116339 -0300
+@@ -141,20 +141,8 @@
+ 		if (*email)
+ 			e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
+ 
+-		if (!strcmp(im_service, "prpl-aim"))
+-			field = E_CONTACT_IM_AIM;
+-		else if (!strcmp(im_service, "prpl-icq"))
+-			field = E_CONTACT_IM_ICQ;
+-		else if (!strcmp(im_service, "prpl-yahoo"))
+-			field = E_CONTACT_IM_YAHOO;
+-		else if (!strcmp(im_service, "prpl-jabber"))
++		if (!strcmp(im_service, "prpl-jabber"))
+ 			field = E_CONTACT_IM_JABBER;
+-		else if (!strcmp(im_service, "prpl-msn"))
+-			field = E_CONTACT_IM_MSN;
+-		else if (!strcmp(im_service, "prpl-novell"))
+-			field = E_CONTACT_IM_GROUPWISE;
+-		else if (!strcmp(im_service, "prpl-gg"))
+-			field = E_CONTACT_IM_GADUGADU;
+ 
+ 		if (field > 0)
+ 		{
+diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in
+--- pidgin-2.10.7/pidgin.apspec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.apspec.in	2013-08-16 20:53:14.523862926 -0300
+@@ -14,17 +14,13 @@
+ 
+ [Description]
+ Pidgin allows you to talk to anyone using a variety of messaging protocols,
+-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
+-Gadu-Gadu, and Zephyr. These protocols are implemented using a
++including IRC, XMPP and Zephyr. These protocols are implemented using a
+ modular, easy to use design. To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many unique
+ features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
+-Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ [BuildPrepare]
+ APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv  --disable-fortify
+ #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv
+diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in
+--- pidgin-2.10.7/pidgin.desktop.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.desktop.in	2013-08-16 23:07:34.874212867 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Pidgin Internet Messenger
+ _GenericName=Internet Messenger
+-_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
++_Comment=Chat over IM.  Supports IRC, Jabber/XMPP and more
+ Exec=pidgin
+ Icon=pidgin
+ StartupNotify=true
+diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec
+--- pidgin-2.10.7/pidgin.spec	2013-02-11 07:17:59.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec	2013-08-17 00:03:18.474815955 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
+diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in
+--- pidgin-2.10.7/pidgin.spec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec.in	2013-08-17 00:07:12.251996234 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin-nonprism/nonprism.patch
new file mode 100644
index 000000000..485bef3c8
--- /dev/null
+++ b/nonprism/pidgin-nonprism/nonprism.patch
@@ -0,0 +1,4930 @@
+diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in
+--- pidgin-2.10.7/config.h.in	2013-02-11 07:17:16.000000000 -0200
++++ pidgin-2.10.7-nonprism/config.h.in	2013-08-16 22:16:16.833531712 -0300
+@@ -151,9 +151,6 @@
+ /* Define to 1 if you have the `db' library (-ldb). */
+ #undef HAVE_LIBDB
+ 
+-/* Define to 1 if you have libgadu. */
+-#undef HAVE_LIBGADU
+-
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+ 
+diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure
+--- pidgin-2.10.7/configure	2013-02-11 07:17:26.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure	2013-08-27 16:47:16.890662082 -0300
+@@ -716,45 +716,23 @@
+ STATIC_LINK_LIBS
+ STATIC_ZEPHYR_FALSE
+ STATIC_ZEPHYR_TRUE
+-STATIC_YAHOO_FALSE
+-STATIC_YAHOO_TRUE
+ STATIC_SIMPLE_FALSE
+ STATIC_SIMPLE_TRUE
+ STATIC_SILC_FALSE
+ STATIC_SILC_TRUE
+-STATIC_SAMETIME_FALSE
+-STATIC_SAMETIME_TRUE
+-STATIC_OSCAR_FALSE
+-STATIC_OSCAR_TRUE
+-STATIC_NOVELL_FALSE
+-STATIC_NOVELL_TRUE
+-STATIC_MXIT_FALSE
+-STATIC_MXIT_TRUE
+-STATIC_MYSPACE_FALSE
+-STATIC_MYSPACE_TRUE
+-STATIC_MSN_FALSE
+-STATIC_MSN_TRUE
+ STATIC_JABBER_FALSE
+ STATIC_JABBER_TRUE
+ STATIC_IRC_FALSE
+ STATIC_IRC_TRUE
+-STATIC_GG_FALSE
+-STATIC_GG_TRUE
+ STATIC_BONJOUR_FALSE
+ STATIC_BONJOUR_TRUE
+ STATIC_PRPLS
+ DISTRIB_FALSE
+ DISTRIB_TRUE
+-USE_INTERNAL_LIBGADU_FALSE
+-USE_INTERNAL_LIBGADU_TRUE
+-GADU_LIBS
+-GADU_CFLAGS
+ SILC_LIBS
+ SILC_CFLAGS
+ AVAHI_LIBS
+ AVAHI_CFLAGS
+-MEANWHILE_LIBS
+-MEANWHILE_CFLAGS
+ IDN_LIBS
+ IDN_CFLAGS
+ USE_VV_FALSE
+@@ -1021,14 +999,11 @@
+ enable_farstream
+ enable_vv
+ enable_idn
+-enable_meanwhile
+ enable_avahi
+ with_avahi_client_includes
+ with_avahi_client_libs
+ with_silc_includes
+ with_silc_libs
+-with_gadu_includes
+-with_gadu_libs
+ enable_distrib
+ with_static_prpls
+ with_dynamic_prpls
+@@ -1100,14 +1075,10 @@
+ FARSTREAM_LIBS
+ IDN_CFLAGS
+ IDN_LIBS
+-MEANWHILE_CFLAGS
+-MEANWHILE_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ SILC_CFLAGS
+ SILC_LIBS
+-GADU_CFLAGS
+-GADU_LIBS
+ DBUS_CFLAGS
+ DBUS_LIBS
+ NETWORKMANAGER_CFLAGS
+@@ -1773,8 +1744,6 @@
+   --disable-farstream     compile without farstream support
+   --disable-vv            compile without voice and video support
+   --disable-idn           compile without IDN support
+-  --disable-meanwhile     compile without meanwhile (required for Sametime
+-                          support)
+   --disable-avahi         compile without avahi (required for Bonjour support)
+ 
+   --disable-plugins       compile without plugin support
+@@ -1826,9 +1795,6 @@
+   --with-silc-includes=DIR
+                           compile the SILC plugin against includes in DIR
+   --with-silc-libs=DIR    compile the SILC plugin against the SILC libs in DIR
+-  --with-gadu-includes=DIR
+-                          compile the Gadu-Gadu plugin against includes in DIR
+-  --with-gadu-libs=DIR    compile the Gadu-Gadu plugin against the libs in DIR
+   --with-static-prpls     Link to certain protocols statically
+   --with-dynamic-prpls    specify which protocols to build dynamically
+   --with-krb4=PREFIX      compile Zephyr plugin with Kerberos 4 support
+@@ -1905,17 +1871,11 @@
+               linker flags for FARSTREAM, overriding pkg-config
+   IDN_CFLAGS  C compiler flags for IDN, overriding pkg-config
+   IDN_LIBS    linker flags for IDN, overriding pkg-config
+-  MEANWHILE_CFLAGS
+-              C compiler flags for MEANWHILE, overriding pkg-config
+-  MEANWHILE_LIBS
+-              linker flags for MEANWHILE, overriding pkg-config
+   AVAHI_CFLAGS
+               C compiler flags for AVAHI, overriding pkg-config
+   AVAHI_LIBS  linker flags for AVAHI, overriding pkg-config
+   SILC_CFLAGS C compiler flags for SILC, overriding pkg-config
+   SILC_LIBS   linker flags for SILC, overriding pkg-config
+-  GADU_CFLAGS C compiler flags for GADU, overriding pkg-config
+-  GADU_LIBS   linker flags for GADU, overriding pkg-config
+   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+   NETWORKMANAGER_CFLAGS
+@@ -18487,105 +18447,6 @@
+ fi
+ fi
+ 
+-# Check whether --enable-meanwhile was given.
+-if test "${enable_meanwhile+set}" = set; then :
+-  enableval=$enable_meanwhile; enable_meanwhile="$enableval"
+-else
+-  enable_meanwhile="yes"
+-fi
+-
+-if test "x$enable_meanwhile" = "xyes"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5
+-$as_echo_n "checking for MEANWHILE... " >&6; }
+-
+-if test -n "$MEANWHILE_CFLAGS"; then
+-    pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$MEANWHILE_LIBS"; then
+-    pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        else
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$MEANWHILE_PKG_ERRORS" >&5
+-
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-else
+-	MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS
+-	MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		have_meanwhile="yes"
+-
+-fi
+-fi
+-
+-
+-
+ # Check whether --enable-avahi was given.
+ if test "${enable_avahi+set}" = set; then :
+   enableval=$enable_avahi; enable_avahi="$enableval"
+@@ -19207,267 +19068,6 @@
+ fi
+ 
+ 
+-# Check whether --with-gadu-includes was given.
+-if test "${with_gadu_includes+set}" = set; then :
+-  withval=$with_gadu_includes; ac_gadu_includes="$withval"
+-else
+-  ac_gadu_includes="no"
+-fi
+-
+-
+-# Check whether --with-gadu-libs was given.
+-if test "${with_gadu_libs+set}" = set; then :
+-  withval=$with_gadu_libs; ac_gadu_libs="$withval"
+-else
+-  ac_gadu_libs="no"
+-fi
+-
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5
+-$as_echo_n "checking for GADU... " >&6; }
+-
+-if test -n "$GADU_CFLAGS"; then
+-    pkg_cv_GADU_CFLAGS="$GADU_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GADU_LIBS"; then
+-    pkg_cv_GADU_LIBS="$GADU_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        else
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GADU_PKG_ERRORS" >&5
+-
+-
+-		gadu_includes="no"
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		gadu_includes="no"
+-
+-else
+-	GADU_CFLAGS=$pkg_cv_GADU_CFLAGS
+-	GADU_LIBS=$pkg_cv_GADU_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-
+-fi
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libgadu_h" = xyes; then :
+-  gadu_includes=yes
+-fi
+-
+-
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5
+-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; }
+-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgadu $GADU_LIBS $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gg_libgadu_version ();
+-int
+-main ()
+-{
+-return gg_libgadu_version ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gadu_gg_libgadu_version=yes
+-else
+-  ac_cv_lib_gadu_gg_libgadu_version=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5
+-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; }
+-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then :
+-  gadu_libs=yes
+-fi
+-
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5
+-$as_echo_n "checking for libgadu GPL compatibility... " >&6; }
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h
+-
+-
+-else
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-else
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+- if test "x$gadu_libs" != "xyes"; then
+-  USE_INTERNAL_LIBGADU_TRUE=
+-  USE_INTERNAL_LIBGADU_FALSE='#'
+-else
+-  USE_INTERNAL_LIBGADU_TRUE='#'
+-  USE_INTERNAL_LIBGADU_FALSE=
+-fi
+-
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+ 
+ 
+ 
+@@ -19500,10 +19100,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19519,46 +19116,22 @@
+ extern_init=
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+-			if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -19571,14 +19144,6 @@
+   STATIC_BONJOUR_FALSE=
+ fi
+ 
+- if test "x$static_gg" = "xyes"; then
+-  STATIC_GG_TRUE=
+-  STATIC_GG_FALSE='#'
+-else
+-  STATIC_GG_TRUE='#'
+-  STATIC_GG_FALSE=
+-fi
+-
+  if test "x$static_irc" = "xyes"; then
+   STATIC_IRC_TRUE=
+   STATIC_IRC_FALSE='#'
+@@ -19595,54 +19160,6 @@
+   STATIC_JABBER_FALSE=
+ fi
+ 
+- if test "x$static_msn" = "xyes"; then
+-  STATIC_MSN_TRUE=
+-  STATIC_MSN_FALSE='#'
+-else
+-  STATIC_MSN_TRUE='#'
+-  STATIC_MSN_FALSE=
+-fi
+-
+- if test "x$static_myspace" = "xyes"; then
+-  STATIC_MYSPACE_TRUE=
+-  STATIC_MYSPACE_FALSE='#'
+-else
+-  STATIC_MYSPACE_TRUE='#'
+-  STATIC_MYSPACE_FALSE=
+-fi
+-
+- if test "x$static_mxit" = "xyes"; then
+-  STATIC_MXIT_TRUE=
+-  STATIC_MXIT_FALSE='#'
+-else
+-  STATIC_MXIT_TRUE='#'
+-  STATIC_MXIT_FALSE=
+-fi
+-
+- if test "x$static_novell" = "xyes"; then
+-  STATIC_NOVELL_TRUE=
+-  STATIC_NOVELL_FALSE='#'
+-else
+-  STATIC_NOVELL_TRUE='#'
+-  STATIC_NOVELL_FALSE=
+-fi
+-
+- if test "x$static_oscar" = "xyes"; then
+-  STATIC_OSCAR_TRUE=
+-  STATIC_OSCAR_FALSE='#'
+-else
+-  STATIC_OSCAR_TRUE='#'
+-  STATIC_OSCAR_FALSE=
+-fi
+-
+- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then
+-  STATIC_SAMETIME_TRUE=
+-  STATIC_SAMETIME_FALSE='#'
+-else
+-  STATIC_SAMETIME_TRUE='#'
+-  STATIC_SAMETIME_FALSE=
+-fi
+-
+  if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then
+   STATIC_SILC_TRUE=
+   STATIC_SILC_FALSE='#'
+@@ -19659,14 +19176,6 @@
+   STATIC_SIMPLE_FALSE=
+ fi
+ 
+- if test "x$static_yahoo" = "xyes"; then
+-  STATIC_YAHOO_TRUE=
+-  STATIC_YAHOO_FALSE='#'
+-else
+-  STATIC_YAHOO_TRUE='#'
+-  STATIC_YAHOO_FALSE=
+-fi
+-
+  if test "x$static_zephyr" = "xyes"; then
+   STATIC_ZEPHYR_TRUE=
+   STATIC_ZEPHYR_FALSE='#'
+@@ -19689,10 +19198,7 @@
+ fi
+ 
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19707,22 +19213,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -21001,7 +20497,7 @@
+ fi
+ 
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ if test "x$enable_gnutls" != "xno"; then
+ 	enable_gnutls="no"
+@@ -21871,19 +21367,17 @@
+ 	as_fn_error $? "
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
++
+ " "$LINENO" 5
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ fi
+ 
+@@ -23176,7 +22670,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23344,10 +22838,6 @@
+   as_fn_error $? "conditional \"USE_VV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then
+-  as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then
+   as_fn_error $? "conditional \"DISTRIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23356,10 +22846,6 @@
+   as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_GG\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_IRC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23368,30 +22854,6 @@
+   as_fn_error $? "conditional \"STATIC_JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MSN\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MXIT\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_SILC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23400,10 +22862,6 @@
+   as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24425,20 +23883,12 @@
+     "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;;
+     "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;;
+     "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;;
+-    "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;;
+     "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
+     "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
+-    "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+-    "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
+-    "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;;
+-    "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
+     "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
+-    "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
+-    "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;;
+     "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;;
+     "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;;
+     "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;;
+-    "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;;
+     "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;;
+     "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;;
+     "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;;
+@@ -25863,7 +25313,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac
+--- pidgin-2.10.7/configure.ac	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure.ac	2013-08-16 23:44:41.800496326 -0300
+@@ -854,28 +854,6 @@
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Meanwhile headers (for Sametime)
+-dnl #######################################################################
+-AC_ARG_ENABLE(meanwhile,
+-	[AC_HELP_STRING([--disable-meanwhile],
+-		[compile without meanwhile (required for Sametime support)])],
+-	enable_meanwhile="$enableval", enable_meanwhile="yes")
+-if test "x$enable_meanwhile" = "xyes"; then
+-	PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+-		have_meanwhile="yes"
+-	], [
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			AC_MSG_ERROR([
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-])
+-		fi])
+-fi
+-AC_SUBST(MEANWHILE_CFLAGS)
+-AC_SUBST(MEANWHILE_LIBS)
+-
+-dnl #######################################################################
+ dnl # Check for Native Avahi headers (for Bonjour)
+ dnl #######################################################################
+ AC_ARG_ENABLE(avahi,
+@@ -1020,100 +998,6 @@
+ 	CPPFLAGS="$CPPFLAGS_save"
+ fi
+ 
+-dnl #######################################################################
+-dnl # Check for Gadu-Gadu client includes and libraries
+-dnl #######################################################################
+-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-	PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-	], [
+-		gadu_includes="no"
+-	])
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	AC_MSG_CHECKING(for libgadu GPL compatibility)
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-	]])], [
+-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-		]])], [
+-			AC_MSG_RESULT(yes)
+-			AC_DEFINE([HAVE_LIBGADU], [1],
+-				[Define to 1 if you have libgadu.])
+-		], [
+-			AC_MSG_RESULT(no)
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-		])
+-	], [
+-		AC_MSG_RESULT(no)
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-	])
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+-AC_SUBST(GADU_LIBS)
+-AC_SUBST(GADU_CFLAGS)
+-
+ AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
+ DYNAMIC_PRPLS=all
+@@ -1123,10 +1007,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1143,64 +1024,31 @@
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+ 	dnl Ugly special case for "libsilcpurple.la":
+-	dnl ... and Ugly special case for multi-protocol oscar and yahoo
+-	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+ done
+ AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
+ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
+ AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
+-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
+-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
+-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
+-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
+ AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
+ AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
+-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
+ AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+ AC_SUBST(STATIC_LINK_LIBS)
+ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
+@@ -1208,10 +1056,7 @@
+ 
+ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1226,22 +1071,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -1713,7 +1548,7 @@
+ 	[enable_nss="$enableval"],
+ 	[enable_nss="yes"])
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ dnl #
+ dnl # Check for GnuTLS if it's specified.
+@@ -2124,19 +1959,16 @@
+ 	AC_MSG_ERROR([
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+ ])
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ fi
+ 
+@@ -2577,20 +2409,12 @@
+ 		   libpurple/Makefile
+ 		   libpurple/protocols/Makefile
+ 		   libpurple/protocols/bonjour/Makefile
+-		   libpurple/protocols/gg/Makefile
+ 		   libpurple/protocols/irc/Makefile
+ 		   libpurple/protocols/jabber/Makefile
+-		   libpurple/protocols/msn/Makefile
+-		   libpurple/protocols/myspace/Makefile
+-		   libpurple/protocols/mxit/Makefile
+-		   libpurple/protocols/novell/Makefile
+ 		   libpurple/protocols/null/Makefile
+-		   libpurple/protocols/oscar/Makefile
+-		   libpurple/protocols/sametime/Makefile
+ 		   libpurple/protocols/silc/Makefile
+ 		   libpurple/protocols/silc10/Makefile
+ 		   libpurple/protocols/simple/Makefile
+-		   libpurple/protocols/yahoo/Makefile
+ 		   libpurple/protocols/zephyr/Makefile
+ 		   libpurple/tests/Makefile
+ 		   libpurple/purple.h
+@@ -2635,7 +2459,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in
+--- pidgin-2.10.7/doc/finch.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/finch.1.in	2013-08-16 21:01:16.682280145 -0300
+@@ -30,11 +30,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBfinch\fR is a console-based modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ 
+ .SH OPTIONS
+ The following options are provided by \fBfinch\fR using the standard GNU
+diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt
+--- pidgin-2.10.7/doc/funniest_home_convos.txt	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt	2013-08-16 23:08:16.148841464 -0300
+@@ -301,8 +301,6 @@
+ ---
+ 
+ 18:33:26 <NoName> hello there
+-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of
+-                  unsafe when using GAIM with yahoo messenges accounts
+ 18:34:43 <NoName> Whenever you transfer files between users, no receiving
+                   confirmation is requested, the file gets transfered
+                   automatically
+diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in
+--- pidgin-2.10.7/doc/pidgin.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in	2013-08-16 21:00:30.964181946 -0300
+@@ -29,11 +29,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBpidgin\fR is a graphical modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ .PP
+ Pidgin can be extended by plugins written in multiple programming languages and
+ controlled through DBus or \fBpurple-remote\fR.
+diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c
+--- pidgin-2.10.7/libpurple/account.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/account.c	2013-08-16 23:31:48.026518940 -0300
+@@ -482,55 +482,6 @@
+ /*********************************************************************
+  * Reading from disk                                                 *
+  *********************************************************************/
+-static void
+-migrate_yahoo_japan(PurpleAccount *account)
+-{
+-	/* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+-	 * to use the new prpl-yahoojp.  Also remove the account-specific settings
+-	 * we no longer need */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+-		if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+-			const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+-			const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+-
+-			g_return_if_fail(serverjp != NULL);
+-			g_return_if_fail(xferjp_host != NULL);
+-
+-			purple_account_set_string(account, "server", serverjp);
+-			purple_account_set_string(account, "xfer_host", xferjp_host);
+-
+-			purple_account_set_protocol_id(account, "prpl-yahoojp");
+-		}
+-
+-		/* these should always be nuked */
+-		purple_account_remove_setting(account, "yahoojp");
+-		purple_account_remove_setting(account, "serverjp");
+-		purple_account_remove_setting(account, "xferjp_host");
+-
+-	}
+-}
+-
+-static void
+-migrate_icq_server(PurpleAccount *account)
+-{
+-	/* Migrate the login server setting for ICQ accounts.  See
+-	 * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+-	 * for details on the change. */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+-		const char *tmp = purple_account_get_string(account, "server", NULL);
+-
+-		/* Non-secure server */
+-		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+-				purple_strequal(tmp, "login.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "login.icq.com");
+-
+-		/* Secure server */
+-		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "slogin.icq.com");
+-	}
+-}
+ 
+ static void
+ migrate_xmpp_encryption(PurpleAccount *account)
+@@ -615,12 +566,6 @@
+ 		g_free(data);
+ 	}
+ 
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an old Yahoo! JAPAN account */
+-	migrate_yahoo_japan(account);
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an ICQ account's server setting */
+-	migrate_icq_server(account);
+ 	/* we do this here because we need to do it before the user views the
+ 	 * Edit Account dialog. */
+ 	migrate_xmpp_encryption(account);
+@@ -874,7 +819,6 @@
+ 		return NULL;
+ 	}
+ 
+-	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+ 	g_free(name);
+ 	g_free(protocol_id);
+ 
+diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c
+--- pidgin-2.10.7/libpurple/blist.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/blist.c	2013-08-16 22:53:19.640535242 -0300
+@@ -466,9 +466,7 @@
+ 
+ 	acct_name = xmlnode_get_attrib(bnode, "account");
+ 	protocol = xmlnode_get_attrib(bnode, "protocol");
+-	protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 	proto = xmlnode_get_attrib(bnode, "proto");
+-	proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
+ 
+ 	if (!acct_name || (!proto && !protocol))
+ 		return;
+diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c
+--- pidgin-2.10.7/libpurple/buddyicon.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c	2013-08-16 23:28:49.244233493 -0300
+@@ -1099,18 +1099,6 @@
+ 			{
+ 				PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
+ 				const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-				if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
+-				{
+-					int checksum = purple_blist_node_get_int(node, "icon_checksum");
+-					if (checksum != 0)
+-					{
+-						char *checksum_str = g_strdup_printf("%i", checksum);
+-						purple_blist_node_remove_setting(node, "icon_checksum");
+-						purple_blist_node_set_string(node, "icon_checksum", checksum_str);
+-						g_free(checksum_str);
+-					}
+-				}
+ 			}
+ 		}
+ 	}
+diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h
+--- pidgin-2.10.7/libpurple/ft.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/ft.h	2013-08-16 22:51:20.590085226 -0300
+@@ -470,8 +470,6 @@
+  * can be used to jump backward in the file if the protocol detects
+  * that some bit of data needs to be resent or has been sent twice.
+  *
+- * It's used for pausing and resuming an oscar file transfer.
+- *
+  * @param xfer       The file transfer.
+  * @param bytes_sent The new current position in the file.  If we're
+  *                   sending a file then this is the byte that we will
+diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h
+--- pidgin-2.10.7/libpurple/gaim-compat.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h	2013-08-16 23:33:16.372629159 -0300
+@@ -2302,16 +2302,8 @@
+ #define gaim_init_ssl_plugin			purple_init_ssl_plugin
+ #define gaim_init_ssl_openssl_plugin	purple_init_ssl_openssl_plugin
+ #define gaim_init_ssl_gnutls_plugin		purple_init_ssl_gnutls_plugin
+-#define gaim_init_gg_plugin				purple_init_gg_plugin
+ #define gaim_init_jabber_plugin			purple_init_jabber_plugin
+-#define gaim_init_sametime_plugin		purple_init_sametime_plugin
+-#define gaim_init_msn_plugin			purple_init_msn_plugin
+-#define gaim_init_novell_plugin			purple_init_novell_plugin
+-#define gaim_init_qq_plugin				purple_init_qq_plugin
+ #define gaim_init_simple_plugin			purple_init_simple_plugin
+-#define gaim_init_yahoo_plugin			purple_init_yahoo_plugin
+ #define gaim_init_zephyr_plugin			purple_init_zephyr_plugin
+-#define gaim_init_aim_plugin			purple_init_aim_plugin
+-#define gaim_init_icq_plugin			purple_init_icq_plugin
+ 
+ #endif /* _GAIM_COMPAT_H_ */
+diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h
+--- pidgin-2.10.7/libpurple/internal.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/internal.h	2013-08-17 00:24:37.244172407 -0300
+@@ -43,7 +43,7 @@
+  *
+  * The Singular/Plural/Number ngettext dummy definition below was
+  * taken from an email to the texinfo mailing list by Manuel Guerrero.
+- * Thank you Manuel, and thank you Alex's good friend Google.
++ * Thank you Manuel.
+  */
+ #ifdef ENABLE_NLS
+ #  include <locale.h>
+diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c
+--- pidgin-2.10.7/libpurple/media/backend-fs2.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c	2013-08-17 00:23:19.488440821 -0300
+@@ -1661,18 +1661,6 @@
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+-	/*
+-	 * Hack to make x264 work with Gmail video.
+-	 */
+-	if (is_nice && !strcmp(sess_id, "google-video")) {
+-		FsElementAddedNotifier *notifier =
+-				fs_element_added_notifier_new();
+-		g_signal_connect(G_OBJECT(notifier), "element-added",
+-				G_CALLBACK(gst_element_added_cb), NULL);
+-		fs_element_added_notifier_add(notifier,
+-				GST_BIN(priv->conference));
+-	}
+-
+ 	session->id = g_strdup(sess_id);
+ 	session->backend = self;
+ 	session->type = type;
+diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c
+--- pidgin-2.10.7/libpurple/plugins/psychic.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c	2013-08-27 21:18:22.251908751 -0300
+@@ -20,8 +20,7 @@
+ #define PLUGIN_NAME     N_("Psychic Mode")
+ #define PLUGIN_SUMMARY  N_("Psychic mode for incoming conversation")
+ #define PLUGIN_DESC     N_("Causes conversation windows to appear as other" \
+-			   " users begin to message you.  This works for" \
+-			   " AIM, ICQ, XMPP, Sametime, and Yahoo!")
++			   " users begin to message you.  This works for XMPP")
+ #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
+ 
+ 
+diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c
+--- pidgin-2.10.7/libpurple/pounce.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/pounce.c	2013-08-16 23:02:20.671021669 -0300
+@@ -409,7 +409,6 @@
+ 		g_free(data->account_name);
+ 		data->account_name = g_strdup(buffer);
+ 		tmp = data->protocol_id;
+-		data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp));
+ 		g_free(tmp);
+ 	}
+ 	else if (purple_strequal(element_name, "pouncee")) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/Makefile.am	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am	2013-08-16 22:37:55.011207011 -0300
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+ 
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ 
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/Makefile.in	2013-02-11 07:17:19.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in	2013-08-16 23:50:36.651423353 -0300
+@@ -160,8 +160,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -223,8 +221,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -365,7 +361,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Makefile.mingw
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+ all: all-recursive
+ 
+diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h
+--- pidgin-2.10.7/libpurple/prpl.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/prpl.h	2013-08-16 22:29:46.145754932 -0300
+@@ -161,15 +161,11 @@
+ 
+ 	/**
+ 	 * Notify on new mail.
+-	 *
+-	 * MSN and Yahoo notify you when you have new mail.
+ 	 */
+ 	OPT_PROTO_MAIL_CHECK = 0x00000020,
+ 
+ 	/**
+ 	 * Images in IMs.
+-	 *
+-	 * Oscar lets you send images in direct IMs.
+ 	 */
+ 	OPT_PROTO_IM_IMAGE = 0x00000040,
+ 
+@@ -184,16 +180,13 @@
+ 	/**
+ 	 * Allows font size to be specified in sane point size
+ 	 *
+-	 * Probably just XMPP and Y!M
++	 * Probably just XMPP
+ 	 */
+ 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
+ 
+ 	/**
+ 	 * Set the Register button active even when the username has not
+ 	 * been specified.
+-	 *
+-	 * Gadu-Gadu doesn't need a username to register new account (because
+-	 * usernames are assigned by the server).
+ 	 */
+ 	OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
+ 
+@@ -467,9 +460,7 @@
+ 	void (*convo_closed)(PurpleConnection *, const char *who);
+ 
+ 	/**
+-	 *  Convert the username @a who to its canonical form.  (For example,
+-	 *  AIM treats "fOo BaR" and "foobar" as the same user; this function
+-	 *  should return the same normalized string for both of those.)
++	 *  Convert the username @a who to its canonical form.
+ 	 */
+ 	const char *(*normalize)(const PurpleAccount *, const char *who);
+ 
+@@ -923,7 +914,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  *        of the attention request command to send. 0 if prpl only defines one
+- *        (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ *        , but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler
+--- pidgin-2.10.7/libpurple/purple-url-handler	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler	2013-08-16 21:16:42.951304560 -0300
+@@ -117,70 +117,6 @@
+ def addbuddy(account, screenname, group="", alias=""):
+     cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
+ 
+-
+-def aim(uri):
+-    protocol = "prpl-aim"
+-    match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid aim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+-def gg(uri):
+-    protocol = "prpl-gg"
+-    match = re.match(r"^gg:(.*)", uri)
+-    if not match:
+-        print "Invalid gg URI: %s" % uri
+-        return
+-
+-    screenname = urllib.unquote_plus(match.group(1))
+-    account = findaccount(protocol)
+-    goim(account, screenname)
+-
+-def icq(uri):
+-    protocol = "prpl-icq"
+-    match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid icq URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+ def irc(uri):
+     protocol = "prpl-irc"
+     match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
+@@ -221,34 +157,6 @@
+                 channel = "#" + channel
+             gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
+ 
+-def msnim(uri):
+-    protocol = "prpl-msn"
+-    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid msnim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    screenname = params.get("contact", "")
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "chat":
+-        goim(account, screenname)
+-    elif command.lower() == "add":
+-        addbuddy(account, screenname)
+-
+-def myim(uri):
+-        protocol = "prpl-myspace"
+-        print "TODO: send uri: ", uri
+-        assert False, "Not implemented"
+-
+ def sip(uri):
+     protocol = "prpl-simple"
+     match = re.match(r"^sip:(.*)", uri)
+@@ -300,57 +208,6 @@
+     else:
+         goim(account, screenname)
+ 
+-def gtalk(uri):
+-    protocol = "prpl-jabber"
+-    match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid gtalk URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("from_jid", "")
+-    jid = params.get("jid", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "chat":
+-        goim(account, jid)
+-    elif command.lower() == "call":
+-        # XXX V&V prompt to establish call
+-        goim(account, jid)
+-
+-def ymsgr(uri):
+-    protocol = "prpl-yahoo"
+-    match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+-    if not match:
+-        print "Invalid ymsgr URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    screenname = urllib.unquote_plus(match.group(3))
+-    paramstring = match.group(5)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "sendim":
+-        goim(account, screenname, params.get("m"))
+-    elif command.lower() == "chat":
+-        gochat(account, {"room": screenname})
+-    elif command.lower() == "addfriend":
+-        addbuddy(account, screenname)
+-
+-
+ def main(argv=sys.argv):
+     if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
+         print "Usage: %s URI" % argv[0]
+diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c
+--- pidgin-2.10.7/libpurple/savedstatuses.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c	2013-08-16 22:52:44.582754543 -0300
+@@ -387,7 +387,6 @@
+ 		const char *protocol;
+ 		acct_name = xmlnode_get_data(node);
+ 		protocol = xmlnode_get_attrib(node, "protocol");
+-		protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 		if ((acct_name != NULL) && (protocol != NULL))
+ 			ret->account = purple_accounts_find(acct_name, protocol);
+ 		g_free(acct_name);
+diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h
+--- pidgin-2.10.7/libpurple/server.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/server.h	2013-08-16 23:30:04.149920853 -0300
+@@ -69,7 +69,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  * 	of the attention request command to send. 0 if prpl only defines one
+- * 	(for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * 	, but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h
+--- pidgin-2.10.7/libpurple/status.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/status.h	2013-08-16 22:52:22.542054119 -0300
+@@ -43,8 +43,7 @@
+  * one of your AIM buddies has set himself as "away."  You have a
+  * PurpleBuddy node for this person in your buddy list.  Purple wants
+  * to mark this buddy as "away," so it creates a new PurpleStatus.
+- * The PurpleStatus has its PurpleStatusType set to the "away" state
+- * for the oscar PRPL.  The PurpleStatus also contains the buddy's
++ * The PurpleStatus also contains the buddy's
+  * away message.  PurpleStatuses are sometimes saved, depending on
+  * the context.  The current PurpleStatuses associated with each of
+  * your accounts are saved so that the next time you start Purple,
+diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c
+--- pidgin-2.10.7/libpurple/tests/check_libpurple.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c	2013-08-16 22:55:33.731462302 -0300
+@@ -88,8 +88,6 @@
+ 	srunner_add_suite(sr, jabber_digest_md5_suite());
+ 	srunner_add_suite(sr, jabber_jutil_suite());
+ 	srunner_add_suite(sr, jabber_scram_suite());
+-	srunner_add_suite(sr, oscar_util_suite());
+-	srunner_add_suite(sr, yahoo_util_suite());
+ 	srunner_add_suite(sr, util_suite());
+ 	srunner_add_suite(sr, xmlnode_suite());
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am
+--- pidgin-2.10.7/libpurple/tests/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am	2013-08-16 22:56:03.189064778 -0300
+@@ -14,8 +14,6 @@
+ 		test_jabber_digest_md5.c \
+ 		test_jabber_jutil.c \
+ 		test_jabber_scram.c \
+-		test_oscar_util.c \
+-		test_yahoo_util.c \
+ 		test_util.c \
+ 		test_xmlnode.c \
+ 		$(top_builddir)/libpurple/util.h
+@@ -31,8 +29,6 @@
+ 
+ check_libpurple_LDADD=\
+ 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ 		$(top_builddir)/libpurple/libpurple.la \
+         @CHECK_LIBS@ \
+ 		$(GLIB_LIBS)
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in
+--- pidgin-2.10.7/libpurple/tests/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in	2013-08-16 23:53:20.713146759 -0300
+@@ -65,8 +65,8 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \
+ 	test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \
+-	test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \
+-	test_yahoo_util.c test_util.c test_xmlnode.c \
++	test_jabber_jutil.c test_jabber_scram.c \
++	 test_util.c test_xmlnode.c \
+ 	$(top_builddir)/libpurple/util.h
+ @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS =  \
+ @HAVE_CHECK_TRUE@	check_libpurple-check_libpurple.$(OBJEXT) \
+@@ -75,15 +75,11 @@
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_digest_md5.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_jutil.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_scram.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_oscar_util.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_yahoo_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_xmlnode.$(OBJEXT)
+ check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -177,8 +173,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -240,8 +234,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -389,8 +381,6 @@
+ @HAVE_CHECK_TRUE@		test_jabber_digest_md5.c \
+ @HAVE_CHECK_TRUE@		test_jabber_jutil.c \
+ @HAVE_CHECK_TRUE@		test_jabber_scram.c \
+-@HAVE_CHECK_TRUE@		test_oscar_util.c \
+-@HAVE_CHECK_TRUE@		test_yahoo_util.c \
+ @HAVE_CHECK_TRUE@		test_util.c \
+ @HAVE_CHECK_TRUE@		test_xmlnode.c \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/util.h
+@@ -406,8 +396,6 @@
+ 
+ @HAVE_CHECK_TRUE@check_libpurple_LDADD = \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@        @CHECK_LIBS@ \
+ @HAVE_CHECK_TRUE@		$(GLIB_LIBS)
+@@ -471,10 +459,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -581,34 +567,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi`
+ 
+-check_libpurple-test_oscar_util.o: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-
+-check_libpurple-test_oscar_util.obj: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-
+-check_libpurple-test_yahoo_util.o: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-
+-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-
+ check_libpurple-test_util.o: test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c	2013-08-17 00:25:08.235128437 -0300
+@@ -33,7 +33,7 @@
+ START_TEST(test_calculate_caps)
+ {
+ 	assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+-	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
++	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+ }
+ END_TEST
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c	2013-08-27 22:53:21.524229291 -0300
+@@ -99,19 +99,19 @@
+ 
+ START_TEST(test_jabber_id_new)
+ {
+-	assert_valid_jid("gmail.com");
+-	assert_valid_jid("gmail.com/Test");
+-	assert_valid_jid("gmail.com/Test@");
+-	assert_valid_jid("gmail.com/@");
+-	assert_valid_jid("gmail.com/Test@alkjaweflkj");
+-	assert_valid_jid("mark.doliner@gmail.com");
+-	assert_valid_jid("mark.doliner@gmail.com/Test12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
++	assert_valid_jid("mail.com");
++	assert_valid_jid("mail.com/Test");
++	assert_valid_jid("mail.com/Test@");
++	assert_valid_jid("mail.com/@");
++	assert_valid_jid("mail.com/Test@alkjaweflkj");
++	assert_valid_jid("mark.doliner@mail.com");
++	assert_valid_jid("mark.doliner@mail.com/Test12345");
++	assert_valid_jid("mark.doliner@mail.com/Test@12345");
++	assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345");
+ 	assert_valid_jid("わいど@conference.jabber.org");
+ 	assert_valid_jid("まりるーむ@conference.jabber.org");
+-	assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+-	assert_valid_jid("mark.doliner@gmail/stuff.org");
++	assert_valid_jid("mark.doliner@mail.com/まりるーむ");
++	assert_valid_jid("mark.doliner@mail/stuff.org");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+ 	assert_valid_jid("mark.doliner@わいど.org");
+@@ -123,17 +123,17 @@
+ 	assert_valid_jid("pa=ul@10.0.42.230");
+ 	assert_valid_jid("pa,ul@10.0.42.230");
+ 
+-	assert_invalid_jid("@gmail.com");
+-	assert_invalid_jid("@@gmail.com");
+-	assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+-	assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+-	assert_invalid_jid("@gmail.com/Test@12345");
++	assert_invalid_jid("@mail.com");
++	assert_invalid_jid("@@mail.com");
++	assert_invalid_jid("mark.doliner@@mail.com/Test12345");
++	assert_invalid_jid("mark@doliner@mail.com/Test12345");
++	assert_invalid_jid("@mail.com/Test@12345");
+ 	assert_invalid_jid("/Test@12345");
+ 	assert_invalid_jid("mark.doliner@");
+ 	assert_invalid_jid("mark.doliner/");
+-	assert_invalid_jid("mark.doliner@gmail_stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail[stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail\\stuff.org");
++	assert_invalid_jid("mark.doliner@mail_stuff.org");
++	assert_invalid_jid("mark.doliner@mail[stuff.org");
++	assert_invalid_jid("mark.doliner@mail\\stuff.org");
+ 	assert_invalid_jid("paul@[::1]124");
+ 	assert_invalid_jid("paul@2[::1]124/as");
+ 	assert_invalid_jid("paul@まつ.おおかみ/\x01");
+diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h
+--- pidgin-2.10.7/libpurple/tests/tests.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h	2013-08-16 22:56:18.999567027 -0300
+@@ -13,8 +13,6 @@
+ Suite * jabber_digest_md5_suite(void);
+ Suite * jabber_jutil_suite(void);
+ Suite * jabber_scram_suite(void);
+-Suite * oscar_util_suite(void);
+-Suite * yahoo_util_suite(void);
+ Suite * util_suite(void);
+ Suite * xmlnode_suite(void);
+ 
+diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c
+--- pidgin-2.10.7/libpurple/util.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.c	2013-08-16 23:29:38.062434329 -0300
+@@ -3451,8 +3451,7 @@
+  *       is set to TRUE if this URL is https, otherwise it is set to
+  *       FALSE.  But that change will break the API.
+  *
+- *       This is important for Yahoo! web messenger login.  They now
+- *       force https login, and if you access the web messenger login
++ *       They now force https login, and if you access the web messenger login
+  *       page via http then it redirects you to the https version, but
+  *       purple_util_fetch_url() ignores the "https" and attempts to
+  *       fetch the URL via http again, which gets redirected again.
+@@ -4943,18 +4942,6 @@
+ 	return buf;
+ }
+ 
+-const char *_purple_oscar_convert(const char *act, const char *protocol)
+-{
+-	if (act && purple_strequal(protocol, "prpl-oscar")) {
+-		int i;
+-		for (i = 0; act[i] != '\0'; i++)
+-			if (!isdigit(act[i]))
+-				return "prpl-aim";
+-		return "prpl-icq";
+-	}
+-	return protocol;
+-}
+-
+ void purple_restore_default_signal_handlers(void)
+ {
+ #ifndef _WIN32
+diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h
+--- pidgin-2.10.7/libpurple/util.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.h	2013-08-16 23:31:12.535403448 -0300
+@@ -456,8 +456,7 @@
+ /**
+  * Extracts a field of data from HTML.
+  *
+- * This is a scary function. See protocols/msn/msn.c and
+- * protocols/yahoo/yahoo_profile.c for example usage.
++ * This is a scary function.
+  *
+  * @param str            The string to parse.
+  * @param len            The size of str.
+@@ -1450,16 +1449,6 @@
+ const char *purple_escape_filename(const char *str);
+ 
+ /**
+- * This is added temporarily to assist the split of oscar into aim and icq.
+- * This should not be used by plugins.
+- *
+- * @deprecated This function should not be used in new code and should be
+- *             removed in 3.0.0.  The aim/icq prpl split happened a long
+- *             time ago, and we don't need to keep migrating old data.
+- */
+-const char *_purple_oscar_convert(const char *act, const char *protocol);
+-
+-/**
+  * Restore default signal handlers for signals which might reasonably have
+  * handlers. This should be called by a fork()'d child process, since child processes
+  * inherit the handlers of the parent.
+diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c
+--- pidgin-2.10.7/pidgin/gtkaccount.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c	2013-08-27 22:45:35.495576079 -0300
+@@ -563,16 +563,11 @@
+ 		if (value == NULL)
+ 			value = purple_account_user_split_get_default_value(split);
+ 
+-		/* Google Talk default domain hackery! */
+ 		menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
+ 		item = gtk_menu_get_active(GTK_MENU(menu));
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
++		if (value == NULL && g_object_get_data(G_OBJECT(item), "") &&
+ 			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "gmail.com";
+-
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "chat.facebook.com";
++			value = "";
+ 
+ 		if (value != NULL)
+ 			gtk_entry_set_text(GTK_ENTRY(entry), value);
+@@ -925,10 +920,6 @@
+ 				model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ 				opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+ 
+-				if (g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-					!strcmp(opt_entry->setting, "connection_security"))
+-					str_value = "opportunistic_tls";
+-
+ 				/* Loop through list of PurpleKeyValuePair items */
+ 				for (node = list; node != NULL; node = node->next) {
+ 					if (node->data != NULL) {
+diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c
+--- pidgin-2.10.7/pidgin/gtkblist.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c	2013-08-16 23:10:16.549286879 -0300
+@@ -2126,10 +2126,6 @@
+ 	char *temp_vcard;
+ 	char *s, *c;
+ 	char *alias    = NULL;
+-	GList *aims    = NULL;
+-	GList *icqs    = NULL;
+-	GList *yahoos  = NULL;
+-	GList *msns    = NULL;
+ 	GList *jabbers = NULL;
+ 
+ 	s = temp_vcard = g_strdup(vcard);
+@@ -2168,24 +2164,14 @@
+ 		/* We only want to worry about a few fields here. */
+ 		if (!strcmp(field, "FN"))
+ 			alias = g_strdup(value);
+-		else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
+-				 !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
+-				 !strcmp(field, "X-JABBER"))
++		else if (!strcmp(field, "X-JABBER"))
+ 		{
+ 			char **values = g_strsplit(value, ":", 0);
+ 			char **im;
+ 
+ 			for (im = values; *im != NULL; im++)
+ 			{
+-				if (!strcmp(field, "X-AIM"))
+-					aims = g_list_append(aims, g_strdup(*im));
+-				else if (!strcmp(field, "X-ICQ"))
+-					icqs = g_list_append(icqs, g_strdup(*im));
+-				else if (!strcmp(field, "X-YAHOO"))
+-					yahoos = g_list_append(yahoos, g_strdup(*im));
+-				else if (!strcmp(field, "X-MSN"))
+-					msns = g_list_append(msns, g_strdup(*im));
+-				else if (!strcmp(field, "X-JABBER"))
++				if (!strcmp(field, "X-JABBER"))
+ 					jabbers = g_list_append(jabbers, g_strdup(*im));
+ 			}
+ 
+@@ -2195,18 +2181,13 @@
+ 
+ 	g_free(temp_vcard);
+ 
+-	if (aims == NULL && icqs == NULL && yahoos == NULL &&
+-		msns == NULL && jabbers == NULL)
++	if (jabbers == NULL)
+ 	{
+ 		g_free(alias);
+ 
+ 		return FALSE;
+ 	}
+ 
+-	add_buddies_from_vcard("prpl-aim",    group, aims,    alias);
+-	add_buddies_from_vcard("prpl-icq",    group, icqs,    alias);
+-	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
+-	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
+ 	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+ 
+ 	g_free(alias);
+diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c
+--- pidgin-2.10.7/pidgin/gtkdialogs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c	2013-08-16 21:37:21.863154130 -0300
+@@ -615,16 +615,6 @@
+ #endif
+ #endif
+ 
+-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
+-#else
+-#ifdef HAVE_LIBGADU
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
+-#else
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
+-#endif
+-#endif
+-
+ #ifdef USE_GTKSPELL
+ 	g_string_append(str, "    <b>GtkSpell:</b> Enabled<br/>");
+ #else
+diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c
+--- pidgin-2.10.7/pidgin/gtkimhtml.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c	2013-08-16 22:59:51.862994429 -0300
+@@ -2440,7 +2440,6 @@
+ static gboolean smooth_scroll_cb(gpointer data);
+ 
+ /*
+- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
+ 
+ 
+ [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
+diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c
+--- pidgin-2.10.7/pidgin/gtknotify.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c	2013-08-27 23:37:23.037593200 -0300
+@@ -1263,10 +1263,6 @@
+ 			command = g_strdup_printf("xdg-open %s", escaped);
+ 		g_free(tmp);
+ 	}
+-	else if (purple_running_osx() == TRUE)
+-	{
+-		command = g_strdup_printf("open %s", escaped);
+-	}
+ 	else if (!strcmp(web_browser, "epiphany") ||
+ 		!strcmp(web_browser, "galeon"))
+ 	{
+@@ -1289,30 +1285,31 @@
+ 	{
+ 		command = g_strdup_printf("kfmclient openURL %s", escaped);
+ 		/*
+-		 * Does Konqueror have options to open in new tab
++		 * Does Konqueror-libre have options to open in new tab
+ 		 * and/or current window?
+ 		 */
+ 	}
+-	else if (!strcmp(web_browser, "mozilla") ||
+-			 !strcmp(web_browser, "mozilla-firebird") ||
+-			 !strcmp(web_browser, "firefox") ||
+-			 !strcmp(web_browser, "seamonkey"))
++	else if (!strcmp(web_browser, "iceweasel") ||
++			 !strcmp(web_browser, "icecat") ||
++			 !strcmp(web_browser, "iceape"))
+ 	{
+ 		char *args = "";
+ 
+ 		command = g_strdup_printf("%s %s", web_browser, escaped);
+ 
+ 		/*
+-		 * Firefox 0.9 and higher require a "-a firefox" option when
++		 * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when
+ 		 * using -remote commands.  This breaks older versions of
+ 		 * mozilla.  So we include this other handly little string
+-		 * when calling firefox.  If the API for remote calls changes
+-		 * any more in firefox then firefox should probably be split
++		 * when calling iceweasel.  If the API for remote calls changes
++		 * any more in iceweasel then iceweasel should probably be split
+ 		 * apart from mozilla-firebird and mozilla... but this is good
+ 		 * for now.
+ 		 */
+-		if (!strcmp(web_browser, "firefox"))
+-			args = "-a firefox";
++		if (!strcmp(web_browser, "iceweasel"))
++			args = "-a iceweasel";
++		else if (!strcmp(web_browser, "icecat"))
++			args = "-a icecat";
+ 
+ 		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+ 			remote_command = g_strdup_printf("%s %s -remote "
+@@ -1327,58 +1324,12 @@
+ 											 "openURL(%s)",
+ 											 web_browser, args, escaped);
+ 	}
+-	else if (!strcmp(web_browser, "netscape"))
+-	{
+-		command = g_strdup_printf("netscape %s", escaped);
+-
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s,new-window)",
+-											 escaped);
+-		}
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s)", escaped);
+-		}
+-	}
+-	else if (!strcmp(web_browser, "opera"))
+-	{
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-			command = g_strdup_printf("opera -newwindow %s", escaped);
+-		else if (place == PIDGIN_BROWSER_NEW_TAB)
+-			command = g_strdup_printf("opera -newpage %s", escaped);
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("opera -remote "
+-											 "openURL(%s)", escaped);
+-			command = g_strdup_printf("opera %s", escaped);
+-		}
+-		else
+-			command = g_strdup_printf("opera %s", escaped);
+-
+-	}
+-	else if (!strcmp(web_browser, "google-chrome"))
+-	{
+-		/* Google Chrome doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Google Chrome. */
+-		command = g_strdup_printf("google-chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chrome"))
+-	{
+-		/* Chromium doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chromium-browser"))
++	else if (!strcmp(web_browser, "chromium"))
+ 	{
+-		/* Chromium doesn't have command-line arguments that control the
++		/* Chromium-libre doesn't have command-line arguments that control the
+ 		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chromium-browser %s", escaped);
++		 * a preference within Chromium-libre. */
++		command = g_strdup_printf("chromium %s", escaped);
+ 	}
+ 	else if (!strcmp(web_browser, "custom"))
+ 	{
+diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c
+--- pidgin-2.10.7/pidgin/gtkprefs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c	2013-08-27 22:55:58.523782666 -0300
+@@ -1851,24 +1851,15 @@
+ 
+ 	/* Sorted reverse alphabetically */
+ 	static const struct browser possible_browsers[] = {
+-		{N_("Seamonkey"), "seamonkey"},
+-		{N_("Opera"), "opera"},
+-		{N_("Netscape"), "netscape"},
+-		{N_("Mozilla"), "mozilla"},
+-		{N_("Konqueror"), "kfmclient"},
+-		{N_("Google Chrome"), "google-chrome"},
+-		/* Do not move the line below.  Code below expects gnome-open to be in
+-		 * this list immediately after xdg-open! */
++		{N_("Iceape-libre"), "iceape"},
++		{N_("Konqueror-libre"), "kfmclient"},
+ 		{N_("Desktop Default"), "xdg-open"},
+ 		{N_("GNOME Default"), "gnome-open"},
+-		{N_("Galeon"), "galeon"},
+-		{N_("Firefox"), "firefox"},
+-		{N_("Firebird"), "mozilla-firebird"},
+-		{N_("Epiphany"), "epiphany"},
+-		/* Translators: please do not translate "chromium-browser" here! */
+-		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+-		/* Translators: please do not translate "chrome" here! */
+-		{N_("Chromium (chrome)"), "chrome"}
++		{N_("Iceweasel-libre"), "iceweasel"},
++		{N_("Icecat"), "icecat"},
++		{N_("Epiphany-libre"), "epiphany"},
++		/* Translators: please do not translate "chromium" here! */
++		{N_("Chromium-libre (chromium)"), "chromium"},
+ 	};
+ 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
+ 
+diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
+--- pidgin-2.10.7/pidgin/gtkutils.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkutils.c	2013-08-16 19:59:22.633298587 -0300
+@@ -677,7 +677,6 @@
+ 	GdkPixbuf *pixbuf = NULL;
+ 	GtkSizeGroup *sg;
+ 	GList *p;
+-	const char *gtalk_name = NULL, *facebook_name = NULL;
+ 	int i;
+ 
+ 	aop_menu = g_malloc0(sizeof(AopMenu));
+@@ -686,55 +685,12 @@
+ 	gtk_widget_show(aop_menu->menu);
+ 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-	if (purple_find_prpl("prpl-jabber")) {
+-		gtalk_name = _("Google Talk");
+-		facebook_name = _("Facebook (XMPP)");
+-	}
+-
+ 	for (p = purple_plugins_get_protocols(), i = 0;
+ 		 p != NULL;
+ 		 p = p->next, i++) {
+ 
+ 		plugin = (PurplePlugin *)p->data;
+ 
+-		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
+-			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+-			                                  "16", "google-talk.png", NULL);
+-			GtkWidget *item;
+-
+-			pixbuf = pidgin_pixbuf_new_from_file(filename);
+-			g_free(filename);
+-
+-			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+-				item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));
+-			g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1));
+-
+-			if (pixbuf)
+-				g_object_unref(pixbuf);
+-
+-			gtalk_name = NULL;
+-			i++;
+-		}
+-
+-		if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
+-			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+-			                                  "16", "facebook.png", NULL);
+-			GtkWidget *item;
+-
+-			pixbuf = pidgin_pixbuf_new_from_file(filename);
+-			g_free(filename);
+-
+-			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+-				item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol"));
+-			g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1));
+-
+-			if (pixbuf)
+-				g_object_unref(pixbuf);
+-
+-			facebook_name = NULL;
+-			i++;
+-		}
+-
+ 		pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
+ 
+ 		gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c	2013-08-16 23:25:21.614375960 -0300
+@@ -339,13 +339,10 @@
+ 	 */
+ 	/* XXXX because otherwise gettext will see this string, even though it's
+ 	 * in an #if 0 block. Remove the XXXX if you want to use this code.
+-	 * But, it really shouldn't be a Yahoo-specific string. ;) */
++	 */
+ 	purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."),
+ 					   PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL));
+ 
+-	yahoo_doodle_command_send_request(gc, to);
+-	yahoo_doodle_command_send_ready(gc, to);
+-
+ 	/* Insert this 'session' in the list.  At this point, it's only a requested
+ 	 * session.
+ 	 */
+@@ -554,15 +551,13 @@
+ 	if(event->button == 1 && pixmap != NULL)
+ 	{
+ 		/* If the brush was never moved, express two sets of two deltas That's a
+-		 * 'point,' but not for Yahoo!
++		 * 'point,'
+ 		 */
+ 		/* if((event->x == LastX) && (event->y == LastY)) */
+ 		if(MotionCount == 0)
+ 		{
+ 			int index;
+ 
+-			/* For Yahoo!, a (0 0) indicates the end of drawing */
+-			/* FIXME: Yahoo Doodle specific! */
+ 			for(index = 0; index < 2; index++)
+ 			{
+ 				draw_list = g_list_append(draw_list, 0);
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h	2013-08-27 23:28:41.018759351 -0300
+@@ -37,8 +37,7 @@
+ #define BRUSH_STATE_DOWN    1
+ #define BRUSH_STATE_MOTION  2
+ 
+-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code.
+- * XXX: How should they work together? */
++/* XXX: How should they work together? */
+ #define PALETTE_NUM_COLORS  7
+ 
+ /**
+diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am
+--- pidgin-2.10.7/pidgin/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am	2013-08-16 21:03:34.936610745 -0300
+@@ -160,10 +160,6 @@
+ 	$(GTK_LIBS) \
+ 	$(top_builddir)/libpurple/libpurple.la
+ 
+-if USE_INTERNAL_LIBGADU
+-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+-endif
+-
+ AM_CPPFLAGS = \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLIBDIR=\"$(libdir)/pidgin/\" \
+@@ -179,6 +175,5 @@
+ 	$(GTK_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GTKSPELL_CFLAGS) \
+-	$(LIBXML_CFLAGS) \
+-	$(INTGG_CFLAGS)
++	$(LIBXML_CFLAGS)
+ endif  # ENABLE_GTK
+diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in
+--- pidgin-2.10.7/pidgin/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in	2013-08-16 23:56:44.729405978 -0300
+@@ -286,8 +286,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -349,8 +347,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -645,7 +641,6 @@
+ @ENABLE_GTK_TRUE@	$(GTK_LIBS) \
+ @ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la
+ 
+-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
+ @ENABLE_GTK_TRUE@	-DDATADIR=\"$(datadir)\" \
+ @ENABLE_GTK_TRUE@	-DLIBDIR=\"$(libdir)/pidgin/\" \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-08-16 23:13:41.759061988 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.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
+-sleeping.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
+-excited.png         /:D      /cy       /toothy_smile
+-happy.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
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.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
+-afraid.png          /shake   /fad      /shake
+-amorous.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
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_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              /<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
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme	2013-08-16 23:15:55.929941297 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.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
+-sleeping.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
+-excited.png         /:D      /cy       /toothy_smile
+-happy.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
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.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
+-afraid.png          /shake   /fad      /shake
+-amorous.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
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_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              /<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
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-08-16 23:19:01.815778718 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme	2013-08-16 23:17:03.828740061 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am	2013-08-17 00:00:17.335924146 -0300
+@@ -204,37 +204,19 @@
+ 		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ PROTOCOLS_16_SCALABLE = \
+-		protocols/16/scalable/aim.svg \
+ 		protocols/16/scalable/bonjour.svg \
+-		protocols/16/scalable/gadu-gadu.svg \
+-		protocols/16/scalable/novell.svg \
+-		protocols/16/scalable/icq.svg \
+ 		protocols/16/scalable/irc.svg \
+ 		protocols/16/scalable/jabber.svg \
+-		protocols/16/scalable/meanwhile.svg \
+-		protocols/16/scalable/msn.svg \
+ 		protocols/16/scalable/silc.svg \
+ 		protocols/16/scalable/simple.svg \
+-		protocols/16/scalable/yahoo.svg \
+ 		protocols/16/scalable/zephyr.svg
+ 
+ PROTOCOLS_16 = \
+-		protocols/16/aim.png \
+ 		protocols/16/bonjour.png \
+-		protocols/16/facebook.png \
+-		protocols/16/gadu-gadu.png \
+-		protocols/16/google-talk.png \
+-		protocols/16/novell.png \
+-		protocols/16/icq.png \
+ 		protocols/16/irc.png \
+ 		protocols/16/jabber.png \
+-		protocols/16/meanwhile.png \
+-		protocols/16/msn.png \
+-		protocols/16/mxit.png \
+-		protocols/16/myspace.png \
+ 		protocols/16/silc.png \
+ 		protocols/16/simple.png \
+-		protocols/16/yahoo.png \
+ 		protocols/16/zephyr.png
+ 
+ ICONS_16_SCALABLE = \
+@@ -259,72 +241,35 @@
+ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ 
+ PROTOCOLS_22_SCALABLE = \
+-		protocols/22/scalable/aim.svg \
+ 		protocols/22/scalable/bonjour.svg \
+-		protocols/22/scalable/gadu-gadu.svg \
+-		protocols/22/scalable/novell.svg \
+-		protocols/22/scalable/icq.svg \
+ 		protocols/22/scalable/irc.svg \
+ 		protocols/22/scalable/jabber.svg \
+-		protocols/22/scalable/meanwhile.svg \
+-		protocols/22/scalable/msn.svg \
+ 		protocols/22/scalable/silc.svg \
+ 		protocols/22/scalable/simple.svg \
+-		protocols/22/scalable/yahoo.svg \
+ 		protocols/22/scalable/zephyr.svg
+ 
+ PROTOCOLS_22 = \
+-		protocols/22/aim.png \
+ 		protocols/22/bonjour.png \
+-		protocols/22/facebook.png \
+-		protocols/22/gadu-gadu.png \
+-		protocols/22/google-talk.png \
+-		protocols/22/novell.png \
+-		protocols/22/icq.png \
+ 		protocols/22/irc.png \
+ 		protocols/22/jabber.png \
+-		protocols/22/meanwhile.png \
+-		protocols/22/msn.png \
+-		protocols/22/mxit.png \
+-		protocols/22/myspace.png \
+ 		protocols/22/silc.png \
+ 		protocols/22/simple.png \
+-		protocols/22/yahoo.png \
+ 		protocols/22/zephyr.png
+ 
+ PROTOCOLS_48 = \
+-		protocols/48/aim.png \
+ 		protocols/48/bonjour.png \
+-		protocols/48/facebook.png \
+-		protocols/48/gadu-gadu.png \
+-		protocols/48/novell.png \
+-		protocols/48/icq.png \
+ 		protocols/48/irc.png \
+ 		protocols/48/jabber.png \
+-		protocols/48/meanwhile.png \
+-		protocols/48/msn.png \
+-		protocols/48/mxit.png \
+-		protocols/48/myspace.png \
+ 		protocols/48/silc.png \
+ 		protocols/48/simple.png \
+-		protocols/48/yahoo.png \
+ 		protocols/48/zephyr.png
+ 
+ PROTOCOLS_SCALABLE = \
+-		protocols/scalable/aim.svg \
+ 		protocols/scalable/bonjour.svg \
+-		protocols/scalable/gadu-gadu.svg \
+-		protocols/scalable/google-talk.svg \
+-		protocols/scalable/novell.svg \
+-		protocols/scalable/icq.svg \
+ 		protocols/scalable/irc.svg \
+ 		protocols/scalable/jabber.svg \
+-		protocols/scalable/meanwhile.svg \
+-		protocols/scalable/msn.svg \
+-		protocols/scalable/mxit.svg \
+ 		protocols/scalable/silc.svg \
+ 		protocols/scalable/simple.svg \
+-		protocols/scalable/yahoo.svg \
+ 		protocols/scalable/zephyr.svg
+ 
+ STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in	2013-08-16 23:59:52.918508551 -0300
+@@ -240,40 +240,19 @@
+ 	emblems/scalable/male.svg emblems/scalable/not-authorized.svg \
+ 	emblems/scalable/secure.svg emblems/scalable/unavailable.svg \
+ 	emblems/scalable/video.svg emblems/scalable/voice.svg \
+-	protocols/16/aim.png protocols/16/bonjour.png \
+-	protocols/16/facebook.png protocols/16/gadu-gadu.png \
+-	protocols/16/google-talk.png protocols/16/novell.png \
+-	protocols/16/icq.png protocols/16/irc.png \
+-	protocols/16/jabber.png protocols/16/meanwhile.png \
+-	protocols/16/msn.png protocols/16/mxit.png \
+-	protocols/16/myspace.png protocols/16/silc.png \
+-	protocols/16/simple.png protocols/16/yahoo.png \
+-	protocols/16/zephyr.png protocols/22/aim.png \
+-	protocols/22/bonjour.png protocols/22/facebook.png \
+-	protocols/22/gadu-gadu.png protocols/22/google-talk.png \
+-	protocols/22/novell.png protocols/22/icq.png \
+-	protocols/22/irc.png protocols/22/jabber.png \
+-	protocols/22/meanwhile.png protocols/22/msn.png \
+-	protocols/22/mxit.png protocols/22/myspace.png \
+-	protocols/22/silc.png protocols/22/simple.png \
+-	protocols/22/yahoo.png protocols/22/zephyr.png \
+-	protocols/48/aim.png protocols/48/bonjour.png \
+-	protocols/48/facebook.png protocols/48/gadu-gadu.png \
+-	protocols/48/novell.png protocols/48/icq.png \
+-	protocols/48/irc.png protocols/48/jabber.png \
+-	protocols/48/meanwhile.png protocols/48/msn.png \
+-	protocols/48/mxit.png protocols/48/myspace.png \
+-	protocols/48/silc.png protocols/48/simple.png \
+-	protocols/48/yahoo.png protocols/48/zephyr.png \
+-	protocols/scalable/aim.svg protocols/scalable/bonjour.svg \
+-	protocols/scalable/gadu-gadu.svg \
+-	protocols/scalable/google-talk.svg \
+-	protocols/scalable/novell.svg protocols/scalable/icq.svg \
+-	protocols/scalable/irc.svg protocols/scalable/jabber.svg \
+-	protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \
+-	protocols/scalable/mxit.svg protocols/scalable/silc.svg \
+-	protocols/scalable/simple.svg protocols/scalable/yahoo.svg \
+-	protocols/scalable/zephyr.svg status/11/available.png \
++	protocols/16/bonjour.png protocols/16/irc.png \
++	protocols/16/jabber.png protocols/16/silc.png \
++	protocols/16/simple.png protocols/16/zephyr.png \
++	protocols/22/bonjour.png protocols/22/irc.png \
++	protocols/22/jabber.png protocols/22/silc.png \
++	protocols/22/simple.png protocols/22/zephyr.png \
++	protocols/48/bonjour.png protocols/48/irc.png \
++	protocols/48/jabber.png protocols/48/silc.png \
++	protocols/48/simple.png protocols/48/zephyr.png \
++	protocols/scalable/bonjour.svg protocols/scalable/irc.svg \
++	protocols/scalable/jabber.svg protocols/scalable/silc.svg \
++	protocols/scalable/simple.svg protocols/scalable/zephyr.svg \
++	status/11/available.png \
+ 	status/11/away.png status/11/busy.png status/11/chat.png \
+ 	status/11/extended-away.png status/11/invisible.png \
+ 	status/11/log-in.png status/11/log-out.png \
+@@ -443,8 +422,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -506,8 +483,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -850,37 +825,19 @@
+ @INSTALL_PIXMAPS_TRUE@		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \
+@@ -899,72 +856,35 @@
+ @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
+ @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/google-talk.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/msn.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/mxit.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c
+--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c	2013-08-16 23:39:46.921427463 -0300
+@@ -250,9 +250,6 @@
+ 	const char *from;
+ 	const char *to;
+ } disco_type_mappings[] = {
+-	{ "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+-	{ "sametime",  "meanwhile" },
+-	{ "myspaceim", "myspace" },
+ 	{ "xmpp",      "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+ 	{ NULL,        NULL }
+ };
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-08-16 21:26:56.293625899 -0300
+@@ -288,21 +288,13 @@
+ 	{
+ 		EContact *contact = E_CONTACT(c->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -315,13 +307,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ 
+@@ -367,7 +353,7 @@
+ 	{
+ 		EContact *contact = E_CONTACT(l->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+@@ -377,17 +363,9 @@
+ 			continue;
+ 		}
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -400,13 +378,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ }
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c	2013-08-16 21:14:05.483056049 -0300
+@@ -119,13 +119,7 @@
+ 
+ 	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-	update_ims_from_contact(contact, name, "prpl-aim",    E_CONTACT_IM_AIM);
+ 	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+-	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
+-	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
+-	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
+-	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+-	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
+ }
+ 
+ static void
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c	2013-08-16 23:20:45.692374640 -0300
+@@ -99,20 +99,8 @@
+ 
+ 	protocol_id = purple_account_get_protocol_id(account);
+ 
+-	if (!strcmp(protocol_id, "prpl-aim"))
+-		protocol_field = E_CONTACT_IM_AIM;
+-	else if (!strcmp(protocol_id, "prpl-icq"))
+-		protocol_field = E_CONTACT_IM_ICQ;
+-	else if (!strcmp(protocol_id, "prpl-msn"))
+-		protocol_field = E_CONTACT_IM_MSN;
+-	else if (!strcmp(protocol_id, "prpl-yahoo"))
+-		protocol_field = E_CONTACT_IM_YAHOO;
+-	else if (!strcmp(protocol_id, "prpl-jabber"))
++	if (!strcmp(protocol_id, "prpl-jabber"))
+ 		protocol_field = E_CONTACT_IM_JABBER;
+-	else if (!strcmp(protocol_id, "prpl-novell"))
+-		protocol_field = E_CONTACT_IM_GROUPWISE;
+-	else if (!strcmp(protocol_id, "prpl-gg"))
+-		protocol_field = E_CONTACT_IM_GADUGADU;
+ 
+ 	return protocol_field;
+ }
+@@ -169,18 +157,6 @@
+ 	{
+ 		PurpleAccount *account = purple_buddy_get_account(buddy);
+ 		const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-		if (!strcmp(prpl_id, "prpl-msn"))
+-		{
+-			mail = g_strdup(purple_normalize(account,
+-										   purple_buddy_get_name(buddy)));
+-		}
+-		else if (!strcmp(prpl_id, "prpl-yahoo"))
+-		{
+-			mail = g_strdup_printf("%s@yahoo.com",
+-								   purple_normalize(account,
+-												  purple_buddy_get_name(buddy)));
+-		}
+ 	}
+ 
+ 	return mail;
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c	2013-08-16 21:23:26.207116339 -0300
+@@ -141,20 +141,8 @@
+ 		if (*email)
+ 			e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
+ 
+-		if (!strcmp(im_service, "prpl-aim"))
+-			field = E_CONTACT_IM_AIM;
+-		else if (!strcmp(im_service, "prpl-icq"))
+-			field = E_CONTACT_IM_ICQ;
+-		else if (!strcmp(im_service, "prpl-yahoo"))
+-			field = E_CONTACT_IM_YAHOO;
+-		else if (!strcmp(im_service, "prpl-jabber"))
++		if (!strcmp(im_service, "prpl-jabber"))
+ 			field = E_CONTACT_IM_JABBER;
+-		else if (!strcmp(im_service, "prpl-msn"))
+-			field = E_CONTACT_IM_MSN;
+-		else if (!strcmp(im_service, "prpl-novell"))
+-			field = E_CONTACT_IM_GROUPWISE;
+-		else if (!strcmp(im_service, "prpl-gg"))
+-			field = E_CONTACT_IM_GADUGADU;
+ 
+ 		if (field > 0)
+ 		{
+diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in
+--- pidgin-2.10.7/pidgin.apspec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.apspec.in	2013-08-16 20:53:14.523862926 -0300
+@@ -14,17 +14,13 @@
+ 
+ [Description]
+ Pidgin allows you to talk to anyone using a variety of messaging protocols,
+-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
+-Gadu-Gadu, and Zephyr. These protocols are implemented using a
++including IRC, XMPP and Zephyr. These protocols are implemented using a
+ modular, easy to use design. To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many unique
+ features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
+-Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ [BuildPrepare]
+ APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv  --disable-fortify
+ #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv
+diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in
+--- pidgin-2.10.7/pidgin.desktop.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.desktop.in	2013-08-16 23:07:34.874212867 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Pidgin Internet Messenger
+ _GenericName=Internet Messenger
+-_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
++_Comment=Chat over IM.  Supports IRC, Jabber/XMPP and more
+ Exec=pidgin
+ Icon=pidgin
+ StartupNotify=true
+diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec
+--- pidgin-2.10.7/pidgin.spec	2013-02-11 07:17:59.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec	2013-08-17 00:03:18.474815955 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
+diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in
+--- pidgin-2.10.7/pidgin.spec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec.in	2013-08-17 00:07:12.251996234 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
new file mode 100644
index 000000000..abffa20b8
--- /dev/null
+++ b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
@@ -0,0 +1,12 @@
+diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
+--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
+@@ -27,7 +27,7 @@ else
+ st =
+ pkg_LTLIBRARIES   = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD  = $(GLIB_LIBS)
++libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
+ 
+ endif
+ 
diff --git a/nonprism/pidgin-nonprism/pidgin.install b/nonprism/pidgin-nonprism/pidgin.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/nonprism/pidgin-nonprism/pidgin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
new file mode 100644
index 000000000..3dbc1c733
--- /dev/null
+++ b/nonprism/your-privacy/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
+pkgname=your-privacy
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgrel=1
+pkgdesc="This package will remove support for unsafe/dangerous for privacy protocols/services."
+arch=('any')
+url="https://parabolagnulinux.org"
+license=('GPL3')
+install=${pkgname}.install
+replaces=your-coherence
+source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt)
+
+package() {
+    conflicts=($(cut -d: -f1,2 ${pkgname}-blacklist-${pkgver}.txt | \
+      sed "s/:$//" | \
+      grep -v ":" | \
+      grep -v '^#' | \
+      sort -u
+    ))
+    cd ${srcdir}
+    install -d ${pkgdir}/usr/share/doc/${pkgname}
+    install -m644 ${pkgname}-blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/
+}
+
+md5sums=('5fd14982619414fea1882b351607291e')
diff --git a/nonprism/your-privacy/your-privacy.install b/nonprism/your-privacy/your-privacy.install
new file mode 100644
index 000000000..965fdbf43
--- /dev/null
+++ b/nonprism/your-privacy/your-privacy.install
@@ -0,0 +1,30 @@
+
+pre_install() {
+  cat <<EOM
+  == IMPORTANT NOTICE ==
+
+  This package will help you identify if packages that support 
+  unsafe/dangerous for privacy protocols/services are installed on your
+  system at the time of its installation, as well as protecting you from 
+  (accidentally) installing them.
+
+  Also, if any other package that support unsafe/dangerous for privacy
+  protocols/services is identified, later updates will ask you for its 
+  removal.
+
+  Have in mind that, if you want to retain certain packages that support
+  unsafe/dangerous for privacy protocols/services installed on your system,
+  you'll have to remove your-privacy :)
+
+  Please report any issue to the Nonprism Team on the usual channels:
+  * https://labs.parabola.nu
+  * irc://freenode.net/#nonprism
+  * mailto:dev@lists.parabolagnulinux.org
+EOM
+}
+
+pre_upgrade() {
+  pre_install
+}
+
+# vim:set ts=2 sw=2 et: