/soc/2013/ankitkv/gobjectification: fe12e34b0c1f: Merged default...

[Ankit Vani]

Changeset: fe12e34b0c1f28dc808fdd4e284d88612286aace
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-05 21:39 +0530
Branch:	 gtkdoc-conversion
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/fe12e34b0c1f

Description:

Merged default branch

diffstat:

 libpurple/gconf/Makefile.am         |  4 ++--
 libpurple/protocols/gg/lib/events.c |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff --git a/libpurple/gconf/Makefile.am b/libpurple/gconf/Makefile.am
--- a/libpurple/gconf/Makefile.am
+++ b/libpurple/gconf/Makefile.am
@@ -12,8 +12,8 @@ schema_DATA = $(schema_in_files:.schemas
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
-		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
+	LANG=en GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
+		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 || true
 else
 install-data-local:
 endif #GCONF_SCHEMAS_INSTALL
diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c
--- a/libpurple/protocols/gg/lib/events.c
+++ b/libpurple/protocols/gg/lib/events.c
@@ -735,7 +735,7 @@ struct gg_event *gg_watch_fd(struct gg_s
 #if defined(GG_CONFIG_HAVE_GNUTLS) || defined(GG_CONFIG_HAVE_OPENSSL)
 			if (sess->ssl != NULL) {
 #ifdef GG_CONFIG_HAVE_GNUTLS
-				gnutls_transport_set_ptr(GG_SESSION_GNUTLS(sess), (gnutls_transport_ptr_t) sess->fd);
+				gnutls_transport_set_ptr(GG_SESSION_GNUTLS(sess), (gnutls_transport_ptr_t)(long)sess->fd);
 #endif
 #ifdef GG_CONFIG_HAVE_OPENSSL
 				SSL_set_fd(sess->ssl, sess->fd);