/soc/2013/ankitkv/gobjectification: 8300c06145d8: Merged default...
Ankit Vani <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 8300c06145d8febe1d3ae2454da699baf7984403 Author: Ankit Vani <[email protected]> Date: 2015-01-05 01:48 +0530 Branch: soc.2013.gobjectification.plugins URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/8300c06145d8 Description: Merged default branch diffstat: COPYRIGHT | 1 + ChangeLog | 10 ++ Makefile.mingw | 9 +- libpurple/Makefile.mingw | 12 +- libpurple/media/backend-fs2.c | 7 +- libpurple/media/candidate.c | 5 + libpurple/media/codec.c | 5 + libpurple/mediamanager.c | 6 + libpurple/plugins/Makefile.mingw | 4 - libpurple/plugins/perl/Makefile.mingw | 2 +- libpurple/plugins/perl/common/Makefile.mingw | 2 +- libpurple/plugins/perl/common/module.h | 1 - libpurple/plugins/perl/perl-common.h | 1 - libpurple/protocols/bonjour/Makefile.mingw | 7 - libpurple/protocols/bonjour/dns_sd_proxy.c | 9 - libpurple/protocols/bonjour/dns_sd_proxy.h | 17 +--- libpurple/protocols/gg/lib/events.c | 2 +- libpurple/protocols/gg/libgaduw.c | 14 +- libpurple/protocols/irc/Makefile.mingw | 4 +- libpurple/protocols/jabber/Makefile.mingw | 4 +- libpurple/protocols/jabber/auth_scram.c | 3 + libpurple/protocols/mxit/voicevideo.h | 2 +- libpurple/util.c | 4 - libpurple/win32/global.mak | 4 +- pidgin/gtkdocklet.c | 6 - pidgin/gtkutils.c | 27 ++-- pidgin/plugins/perl/common/Makefile.mingw | 2 +- pidgin/win32/nsis/generate_gtk_zip.sh | 128 ++++++++++++++++++++------ pidgin/win32/nsis/pidgin-installer.nsi | 39 +++---- pidgin/win32/winpidgin.c | 76 ---------------- 30 files changed, 188 insertions(+), 225 deletions(-) diffs (truncated from 908 to 300 lines): diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -510,6 +510,7 @@ Michael Shkutkov Shreevatsa R Dylan Simon <[email protected]> Ettore Simone +Renato Silva John Silvestri Mukund Sivaraman Craig Slusher diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,16 @@ version 3.0.0 (??/??/????): * A single jabber plugin provides XMPP, GTalk and Facebook protocols. * A single yahoo plugin provides both Yahoo and Yahoo JAPAN protocols. +version 2.10.12 (MM/DD/YY): + Windows-Specific Changes: + * Updates to dependencies: + * Cyrus SASL 2.1.26 + * libxml2 2.9.2 + * NSS 3.17.3 and NSPR 4.10.7 + * Perl 5.20.1 + * SILC 1.1.12 + * Remove support for Tcl plugins + version 2.10.11 (11/23/14): General: * Fix handling of Self-Signed SSL/TLS Certificates when using the NSS diff --git a/Makefile.mingw b/Makefile.mingw --- a/Makefile.mingw +++ b/Makefile.mingw @@ -59,14 +59,7 @@ PIDGIN_INST_DEP_DIR="$(WIN32_DEV_TOP)/pi # Any *.dll or *.exe files included in win32-install-dir that we don't compile # should be included in this list so they don't get stripped EXTERNAL_DLLS = \ - exchndl.dll \ - libsasl.dll \ - saslANONYMOUS.dll \ - saslCRAMMD5.dll \ - saslDIGESTMD5.dll \ - saslGSSAPI.dll \ - saslLOGIN.dll \ - saslPLAIN.dll + exchndl.dll #build an expression for `find` to use to ignore the above files EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS)) diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw --- a/libpurple/Makefile.mingw +++ b/libpurple/Makefile.mingw @@ -10,15 +10,13 @@ include $(PIDGIN_TREE_TOP)/libpurple/win TARGET = libpurple ifeq ($(CYRUS_SASL), 1) -NEEDED_DLLS = $(CYRUS_SASL_TOP)/bin/libsasl.dll +NEEDED_DLLS = $(CYRUS_SASL_TOP)/bin/libsasl2-3.dll CYRUS_SASL_PLUGINS = \ - $(CYRUS_SASL_TOP)/bin/sasl2/saslANONYMOUS.dll \ - $(CYRUS_SASL_TOP)/bin/sasl2/saslCRAMMD5.dll \ - $(CYRUS_SASL_TOP)/bin/sasl2/saslDIGESTMD5.dll \ - $(CYRUS_SASL_TOP)/bin/sasl2/saslGSSAPI.dll \ - $(CYRUS_SASL_TOP)/bin/sasl2/saslLOGIN.dll \ - $(CYRUS_SASL_TOP)/bin/sasl2/saslPLAIN.dll + $(CYRUS_SASL_TOP)/lib/sasl2/libanonymous-3.dll \ + $(CYRUS_SASL_TOP)/lib/sasl2/libcrammd5-3.dll \ + $(CYRUS_SASL_TOP)/lib/sasl2/libdigestmd5-3.dll \ + $(CYRUS_SASL_TOP)/lib/sasl2/libplain-3.dll endif diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -174,7 +174,12 @@ enum { static void purple_media_backend_fs2_init(PurpleMediaBackendFs2 *self) -{} +{ +#if GLIB_CHECK_VERSION(2, 37, 3) + /* silence a warning */ + (void)purple_media_backend_fs2_get_instance_private; +#endif +} static FsCandidateType purple_media_candidate_type_to_fs(PurpleMediaCandidateType type) diff --git a/libpurple/media/candidate.c b/libpurple/media/candidate.c --- a/libpurple/media/candidate.c +++ b/libpurple/media/candidate.c @@ -92,6 +92,11 @@ purple_media_candidate_init(PurpleMediaC priv->username = NULL; priv->password = NULL; priv->ttl = 0; + +#if GLIB_CHECK_VERSION(2, 37, 3) + /* silence a warning */ + (void)purple_media_candidate_get_instance_private; +#endif } static void diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c --- a/libpurple/media/codec.c +++ b/libpurple/media/codec.c @@ -74,6 +74,11 @@ purple_media_codec_init(PurpleMediaCodec PURPLE_MEDIA_CODEC_GET_PRIVATE(info); priv->encoding_name = NULL; priv->optional_params = NULL; + +#if GLIB_CHECK_VERSION(2, 37, 3) + /* silence a warning */ + (void)purple_media_codec_get_instance_private; +#endif } static void diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c --- a/libpurple/mediamanager.c +++ b/libpurple/mediamanager.c @@ -1257,6 +1257,12 @@ purple_media_element_info_get_id(PurpleM { #ifdef USE_VV gchar *id; + +#if GLIB_CHECK_VERSION(2, 37, 3) + /* Silence a warning. This could be anywhere below G_DEFINE_TYPE */ + (void)purple_media_element_info_get_instance_private; +#endif + g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info), NULL); g_object_get(info, "id", &id, NULL); return id; diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw --- a/libpurple/plugins/Makefile.mingw +++ b/libpurple/plugins/Makefile.mingw @@ -8,7 +8,6 @@ PIDGIN_TREE_TOP := ../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak PERL_PLUGIN := ./perl -TCL_PLUGIN := ./tcl SSL_PLUGIN := ./ssl KEYRING_PLUGIN := ./keyrings @@ -47,13 +46,11 @@ LIBS = \ all: $(PURPLE_DLL).a plugins $(MAKE_at) $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) - $(MAKE_at) $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) $(MAKE_at) $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) $(MAKE_at) $(MAKE) -C $(KEYRING_PLUGIN) -f $(MINGW_MAKEFILE) install: all $(PURPLE_INSTALL_PLUGINS_DIR) $(MAKE_at) $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) install - $(MAKE_at) $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) install $(MAKE_at) $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install $(MAKE_at) $(MAKE) -C $(KEYRING_PLUGIN) -f $(MINGW_MAKEFILE) install cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR) @@ -78,7 +75,6 @@ plugins: \ clean: rm -f *.o *.dll $(MAKE_at) $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) clean - $(MAKE_at) $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) clean $(MAKE_at) $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) clean $(MAKE_at) $(MAKE) -C $(KEYRING_PLUGIN) -f $(MINGW_MAKEFILE) clean diff --git a/libpurple/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw --- a/libpurple/plugins/perl/Makefile.mingw +++ b/libpurple/plugins/perl/Makefile.mingw @@ -52,7 +52,7 @@ LIBS = \ -lws2_32 \ -lintl \ -lpurple \ - -lperl510 + -lperl520 include $(PIDGIN_COMMON_RULES) diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw --- a/libpurple/plugins/perl/common/Makefile.mingw +++ b/libpurple/plugins/perl/common/Makefile.mingw @@ -83,7 +83,7 @@ OBJECTS = $(C_FILES:%.c=%.o) ## ## LIBRARIES ## -LIBS = -lperl510 \ +LIBS = -lperl520 \ -lperl \ -lpurple \ -lglib-2.0 \ diff --git a/libpurple/plugins/perl/common/module.h b/libpurple/plugins/perl/common/module.h --- a/libpurple/plugins/perl/common/module.h +++ b/libpurple/plugins/perl/common/module.h @@ -11,7 +11,6 @@ typedef struct group *Purple__Group; #include <glib.h> #ifdef _WIN32 #undef pipe -#undef STRINGIFY #endif #define SILENT_NO_TAINT_SUPPORT 0 diff --git a/libpurple/plugins/perl/perl-common.h b/libpurple/plugins/perl/perl-common.h --- a/libpurple/plugins/perl/perl-common.h +++ b/libpurple/plugins/perl/perl-common.h @@ -3,7 +3,6 @@ #include <glib.h> #ifdef _WIN32 -#undef STRINGIFY #undef pipe #endif diff --git a/libpurple/protocols/bonjour/Makefile.mingw b/libpurple/protocols/bonjour/Makefile.mingw --- a/libpurple/protocols/bonjour/Makefile.mingw +++ b/libpurple/protocols/bonjour/Makefile.mingw @@ -29,7 +29,6 @@ INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ - -I$(BONJOUR_TOP)/Include \ -I$(LIBXML2_TOP)/include/libxml2 \ -I$(PURPLE_TOP) \ -I$(PURPLE_TOP)/win32 \ @@ -65,12 +64,6 @@ LIBS = \ -lxml2 \ -lpurple -ifeq ($(LINK_DNS_SD_DIRECTLY), 1) - CFLAGS += -DLINK_DNS_SD_DIRECTLY - LIB_PATHS += -L$(BONJOUR_TOP)/lib/win32 -L$(BONJOUR_TOP)/lib - LIBS += -ldnssd -endif - include $(PIDGIN_COMMON_RULES) ## diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.c b/libpurple/protocols/bonjour/dns_sd_proxy.c --- a/libpurple/protocols/bonjour/dns_sd_proxy.c +++ b/libpurple/protocols/bonjour/dns_sd_proxy.c @@ -22,7 +22,6 @@ #include "internal.h" #include "dns_sd_proxy.h" -#ifndef LINK_DNS_SD_DIRECTLY static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags, uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl); static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -50,10 +49,8 @@ static int16_t (DNSSD_API* _TXTRecordGet static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen); static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value); -#endif gboolean dns_sd_available(void) { -#ifndef LINK_DNS_SD_DIRECTLY static gboolean initialized = FALSE; static gboolean loaded = FALSE; @@ -81,12 +78,8 @@ gboolean dns_sd_available(void) { } } return loaded; -#else - return TRUE; -#endif } -#ifndef LINK_DNS_SD_DIRECTLY DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags, uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) { @@ -187,5 +180,3 @@ DNSServiceErrorType _wpurple_TXTRecordSe return (_TXTRecordSetValue)(txtRecord, key, valueSize, value); } -#endif /*LINK_DNS_SD_DIRECTLY*/ - diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.h b/libpurple/protocols/bonjour/dns_sd_proxy.h --- a/libpurple/protocols/bonjour/dns_sd_proxy.h +++ b/libpurple/protocols/bonjour/dns_sd_proxy.h @@ -27,10 +27,8 @@ #include <stdint.h> #endif -#ifdef IS_WIN32_CROSS_COMPILED - -/* I'm not sure, if we really need to include this for the following definitions - * modeled after Apple's dns_sd.h file. +/* The following is a subset of Apple's dns_sd.h file + * http://www.opensource.apple.com/source/mDNSResponder/mDNSResponder-333.10/mDNSShared/dns_sd.h * * Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved. * @@ -115,18 +113,9 @@ enum { kDNSServiceProtocol_IPv4 = 0x01, };