/cpw/tomkiewicz/masterpassword: 62a874e41930: Merge with default
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Fri Apr 26 06:27:42 EDT 2013
Changeset: 62a874e419307f1edd78e0d3cdca25fd2319cfa7
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-04-26 12:27 +0200
Branch: soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/62a874e41930
Description:
Merge with default
diffstat:
.hgignore | 1 +
ChangeLog | 4 +
ChangeLog.API | 1 +
Makefile.mingw | 49 +-
configure.ac | 7 +-
finch/finch.c | 6 +
finch/gntnotify.c | 6 +-
finch/libgnt/gntmain.c | 3 +
finch/libgnt/gntwm.c | 16 +-
libpurple/Makefile.mingw | 13 +-
libpurple/blist.h | 5 +-
libpurple/cipher.c | 15 +-
libpurple/ciphers/Makefile.am | 3 +
libpurple/ciphers/ciphers.h | 38 ++
libpurple/ciphers/des.c | 1 +
libpurple/ciphers/gchecksum.c | 1 +
libpurple/ciphers/hmac.c | 1 +
libpurple/ciphers/md4.c | 1 +
libpurple/ciphers/rc4.c | 1 +
libpurple/core.c | 4 +
libpurple/dnsquery.c | 6 +-
libpurple/dnssrv.c | 57 +--
libpurple/glibcompat.h | 15 +-
libpurple/http.c | 5 +-
libpurple/media.c | 2 +-
libpurple/media/backend-fs2.c | 89 +++-
libpurple/network.c | 98 +++-
libpurple/network.h | 14 -
libpurple/ntlm.c | 5 +-
libpurple/plugins/perl/Makefile.am | 4 +-
libpurple/plugins/perl/Makefile.mingw | 4 +-
libpurple/plugins/perl/common/BuddyList.xs | 3 +-
libpurple/plugins/perl/common/Certificate.xs | 1 -
libpurple/plugins/perl/common/Makefile.mingw | 5 +-
libpurple/plugins/perl/common/Network.xs | 4 -
libpurple/plugins/perl/common/Request.xs | 2 +-
libpurple/plugins/perl/common/Util.xs | 3 +-
libpurple/plugins/perl/perl-common.c | 3 +-
libpurple/plugins/ssl/Makefile.mingw | 16 +-
libpurple/plugins/ssl/ssl-gnutls.c | 42 +-
libpurple/plugins/ssl/ssl-nss.c | 4 +-
libpurple/plugins/tcl/Makefile.mingw | 6 +-
libpurple/plugins/tcl/tcl.c | 60 +--
libpurple/plugins/tcl/tcl_cmds.c | 6 +-
libpurple/protocols/bonjour/bonjour.c | 8 +-
libpurple/protocols/bonjour/jabber.c | 3 +-
libpurple/protocols/gg/Makefile.mingw | 29 +-
libpurple/protocols/gg/account.c | 2 +-
libpurple/protocols/gg/avatar.c | 2 +-
libpurple/protocols/gg/image.c | 2 +-
libpurple/protocols/gg/lib/config.h | 2 +
libpurple/protocols/gg/libgadu-events.c | 4 +-
libpurple/protocols/gg/oauth/oauth-purple.c | 2 +-
libpurple/protocols/gg/pubdir-prpl.c | 2 +-
libpurple/protocols/gg/status.c | 2 +-
libpurple/protocols/irc/Makefile.am | 2 +-
libpurple/protocols/irc/msgs.c | 10 +-
libpurple/protocols/jabber/jingle/jingle.c | 3 +-
libpurple/protocols/jabber/si.c | 4 +-
libpurple/protocols/msn/msnutils.c | 5 +-
libpurple/protocols/msn/slplink.c | 4 +-
libpurple/protocols/mxit/actions.c | 7 +-
libpurple/protocols/mxit/chunk.c | 5 +-
libpurple/protocols/mxit/cipher.c | 36 +-
libpurple/protocols/mxit/filexfer.c | 44 +-
libpurple/protocols/mxit/formcmds.c | 8 +-
libpurple/protocols/mxit/formcmds.h | 4 +-
libpurple/protocols/mxit/http.c | 9 +-
libpurple/protocols/mxit/login.c | 8 +-
libpurple/protocols/mxit/markup.c | 41 +-
libpurple/protocols/mxit/multimx.c | 3 +-
libpurple/protocols/mxit/mxit.c | 63 +++-
libpurple/protocols/mxit/profile.c | 3 +-
libpurple/protocols/mxit/profile.h | 4 +-
libpurple/protocols/mxit/protocol.c | 126 +++---
libpurple/protocols/mxit/roster.c | 10 +-
libpurple/protocols/mxit/roster.h | 2 +-
libpurple/protocols/mxit/splashscreen.c | 6 +-
libpurple/protocols/mxit/voicevideo.c | 5 +-
libpurple/protocols/mxit/voicevideo.h | 5 -
libpurple/protocols/myspace/myspace.c | 4 +-
libpurple/protocols/myspace/user.c | 6 +-
libpurple/protocols/oscar/family_auth.c | 3 +-
libpurple/protocols/oscar/family_bart.c | 12 +-
libpurple/protocols/oscar/family_chatnav.c | 7 +-
libpurple/protocols/oscar/family_icbm.c | 3 +-
libpurple/protocols/oscar/family_locate.c | 3 +-
libpurple/protocols/oscar/family_oservice.c | 3 +
libpurple/protocols/oscar/oscar.c | 41 +-
libpurple/protocols/oscar/peer.c | 38 +-
libpurple/protocols/sametime/Makefile.mingw | 2 -
libpurple/protocols/sametime/sametime.c | 49 +--
libpurple/protocols/silc/ops.c | 5 +-
libpurple/protocols/silc/silc.c | 4 +
libpurple/protocols/yahoo/libymsg.c | 12 +-
libpurple/protocols/yahoo/yahoo_filexfer.c | 26 +-
libpurple/protocols/yahoo/yahoo_picture.c | 5 +-
libpurple/protocols/yahoo/yahoochat.c | 13 +-
libpurple/protocols/zephyr/ZParseNot.c | 3 +
libpurple/protocols/zephyr/zephyr.c | 17 +-
libpurple/proxy.c | 9 +-
libpurple/prpl.h | 5 +-
libpurple/purple-client.c | 5 +-
libpurple/tag.sh | 58 +++
libpurple/tests/check_libpurple.c | 3 +
libpurple/util.c | 20 +-
libpurple/win32/global.mak | 37 +-
libpurple/win32/libc_interface.c | 4 +-
libpurple/win32/rules.mak | 2 +-
libpurple/win32/win32dep.c | 16 +-
libpurple/win32/wpurpleerror.h | 25 +-
libpurple/xmlnode.h | 24 +-
pidgin/Makefile.mingw | 11 +-
pidgin/gtk3compat.h | 7 +-
pidgin/gtkconv-theme.c | 5 +-
pidgin/gtkconv.c | 27 +-
pidgin/gtkdialogs.c | 14 +-
pidgin/gtkimhtml.c | 2 +-
pidgin/gtkmain.c | 7 +-
pidgin/gtkmedia.c | 3 +
pidgin/gtkprefs.c | 7 +-
pidgin/gtkrequest.c | 18 +-
pidgin/gtkstatusbox.c | 8 +-
pidgin/gtkwebview.c | 22 +-
pidgin/pidgin-3.pc.in | 2 +-
pidgin/plugins/Makefile.mingw | 7 +-
pidgin/plugins/disco/Makefile.mingw | 1 +
pidgin/plugins/perl/Makefile.am | 4 +-
pidgin/plugins/perl/common/Makefile.mingw | 8 +-
pidgin/plugins/ticker/Makefile.mingw | 1 +
pidgin/plugins/win32/transparency/Makefile.mingw | 1 +
pidgin/plugins/win32/winprefs/Makefile.mingw | 1 +
pidgin/plugins/win32/winprefs/winprefs.c | 3 -
pidgin/win32/gtkwin32dep.c | 6 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 188 +++++++--
pidgin/win32/nsis/pidgin-installer.nsi | 1 +
pidgin/win32/nsis/rpm2zip.sh | 65 ---
pidgin/win32/prepare-workspace.sh | 423 +++++++++++++++++++++++
pidgin/win32/wspell.c | 15 +-
share/ca-certs/DigiCertHighAssuranceEVRootCA.pem | 23 +
share/ca-certs/Makefile.am | 1 +
141 files changed, 1643 insertions(+), 807 deletions(-)
diffs (truncated from 5934 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -98,6 +98,7 @@ pidgin/plugins/perl/common/Makefile.PL$
pidgin/plugins/perl/common/Makefile.old
pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip
pidgin/win32/nsis/gtk_runtime_stage$
+pidgin/win32/nsis/cacert.pem
pidgin/win32/nsis/langmacros.nsh
pidgin/win32/nsis/nsis_translations.desktop
pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,10 @@ version 3.0.0 (??/??/????):
* The Offline Message Emulation plugin now adds a note that the message
was an offline message. (Flavius Anton) (#2497)
+ Windows-Specific Changes:
+ * Updates to dependencies:
+ * NSS 3.14.3 and NSPR 4.9.5
+
version 2.10.7 (02/13/2013):
Alien hatchery:
* No changes
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -196,6 +196,7 @@ version 3.0.0 (??/??/????):
* purple_network_listen_map_external
* purple_network_listen_range_family. Use purple_network_listen,
instead.
+ * purple_network_ip_atoi
* purple_notify_searchresults_column_get_title
* purple_notify_searchresults_get_columns_count
* purple_notify_searchresults_get_rows_count
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,7 +31,7 @@ awk 'BEGIN {FS="."} { \
exit; \
}' VERSION)
-GTK_INSTALL_VERSION = 2.16.6.1
+GTK_INSTALL_VERSION = 2.24.14.0
authenticode_sign = $(MONO_SIGNCODE) \
-spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
@@ -50,25 +50,8 @@ 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 = \
- comerr32.dll \
exchndl.dll \
- freebl3.dll \
- gssapi32.dll \
- k5sprt32.dll \
- krb5_32.dll \
- libenchant.dll \
- libenchant_ispell.dll \
- libenchant_myspell.dll \
- libgtkspell-0.dll \
- libmeanwhile-1.dll \
- libnspr4.dll \
- libplc4.dll \
- libplds4.dll \
libsasl.dll \
- libssp-0.dll \
- libxml2-2.dll \
- nss3.dll \
- nssutil3.dll \
saslANONYMOUS.dll \
saslCRAMMD5.dll \
saslDIGESTMD5.dll \
@@ -76,11 +59,7 @@ EXTERNAL_DLLS = \
saslLOGIN.dll \
saslPLAIN.dll \
libsilc-1-1-2.dll \
- libsilcclient-1-1-3.dll \
- smime3.dll \
- softokn3.dll \
- sqlite3.dll \
- ssl3.dll
+ libsilcclient-1-1-3.dll
#build an expression for `find` to use to ignore the above files
EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
@@ -104,15 +83,11 @@ ifndef DISABLE_NLS
endif
$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
$(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
- mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
- cp $(GTKSPELL_TOP)/bin/libgtkspell-0.dll $(PIDGIN_INSTALL_DIR)/spellcheck
- cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
- cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
cp $(PIDGIN_INST_DEP_DIR)/exchndl.dll $(PIDGIN_INSTALL_DIR)
- cp $(GCC_SSP_TOP)/libssp-0.dll $(PIDGIN_INSTALL_DIR)
+ chmod -R 777 $(PIDGIN_INSTALL_DIR)
gtk_runtime_zip:
- pidgin/win32/nsis/generate_gtk_zip.sh "`pwd`" "$(GPG_SIGN)"
+ cd pidgin/win32/nsis/ ; ./generate_gtk_zip.sh "$(GPG_SIGN)"
generate_installer_includes: create_release_install_dir gtk_runtime_zip debug_symbols_zip $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/nsis_translations.desktop
rm -f pidgin/win32/nsis/pidgin-translations.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
@@ -148,7 +123,9 @@ create_release_install_dir: install
find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \
-exec $(STRIP) --strip-unneeded {} ';'
+ifdef SIGN_EXECUTABLES
$(call authenticode_sign, $(STRIPPED_RELEASE_DIR)/pidgin.exe, "Pidgin $(PIDGIN_VERSION)")
+endif
installer: generate_installer_includes
$(eval $@_DEBUG_SYMBOLS_SHA1SUM := $(shell sha1sum $(DEBUG_SYMBOLS_DIR).zip | sed -e "s/\ .*$$//"))
@@ -157,23 +134,33 @@ installer: generate_installer_includes
-DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
-DDEBUG_SYMBOLS_SHA1SUM="$($@_DEBUG_SYMBOLS_SHA1SUM)" -DGTK_SHA1SUM="$($@_GTK_SHA1SUM)"\
pidgin/win32/nsis/pidgin-installer.nsi
+ifdef SIGN_EXECUTABLES
$(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe, "Pidgin Installer")
+endif
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, pidgin-$(PIDGIN_VERSION).exe)
+endif
installer_offline: generate_installer_includes
$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" \
-DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
-DOFFLINE_INSTALLER \
pidgin/win32/nsis/pidgin-installer.nsi
+ifdef SIGN_EXECUTABLES
$(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe, "Pidgin Installer")
+endif
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, pidgin-$(PIDGIN_VERSION)-offline.exe)
+endif
installer_zip: create_release_install_dir
rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR)
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, pidgin-$(PIDGIN_VERSION)-win32-bin.zip)
+endif
debug_symbols_zip: install
rm -rf $(DEBUG_SYMBOLS_DIR) $(DEBUG_SYMBOLS_DIR).zip
@@ -181,9 +168,11 @@ debug_symbols_zip: install
tar -cf - `find $(PIDGIN_INSTALL_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -print` \
| tar --strip 2 --xform s/$$/.dbgsym/ -xC $(DEBUG_SYMBOLS_DIR) -f -
- cp $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll.unstripped $(DEBUG_SYMBOLS_DIR)/libmeanwhile-1.dll.dbgsym
+ cp $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll.debug $(DEBUG_SYMBOLS_DIR)/libmeanwhile-1.dll.dbgsym
zip -9 -r $(DEBUG_SYMBOLS_DIR).zip $(DEBUG_SYMBOLS_DIR)
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, $(DEBUG_SYMBOLS_DIR).zip)
+endif
installers: installer installer_offline debug_symbols_zip installer_zip
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -472,7 +472,8 @@ running configure.
WEBKIT_VERSION=1.1.1
if test "x$with_gtk" = "x3"; then
- PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_VERSION], , [
+ WEBKIT_PC_MODULE="webkitgtk-3.0"
+ PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
You must have WebKit for GTK+3 $WEBKIT_VERSION or newer development headers
@@ -480,7 +481,8 @@ installed to compile Pidgin. If you wan
--disable-gtkui when running configure.
])])
else
- PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_VERSION], , [
+ WEBKIT_PC_MODULE="webkit-1.0"
+ PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
You must have WebKit for GTK+2 $WEBKIT_VERSION or newer development headers
@@ -490,6 +492,7 @@ installed to compile Pidgin. If you wan
fi
AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS)
+ AC_SUBST(WEBKIT_PC_MODULE)
dnl #######################################################################
dnl # Check if we should compile with X support
diff --git a/finch/finch.c b/finch/finch.c
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -424,7 +424,13 @@ int main(int argc, char *argv[])
{
signal(SIGPIPE, SIG_IGN);
+#if !GLIB_CHECK_VERSION(2, 32, 0)
+ /* GLib threading system is automaticaly initialized since 2.32.
+ * For earlier versions, it have to be initialized before calling any
+ * Glib or GTK+ functions.
+ */
g_thread_init(NULL);
+#endif
g_set_prgname("Finch");
g_set_application_name(_("Finch"));
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -88,13 +88,13 @@ finch_notify_message(PurpleNotifyMsgType
* PurpleNotifyType. Also, the if() followed by the
* inner switch doesn't make much sense.
*/
- if (type == PURPLE_NOTIFY_FORMATTED) {
+ if ((int)type == (int)PURPLE_NOTIFY_FORMATTED) {
int width = -1, height = -1;
char *plain = (char*)secondary;
msg = gnt_text_view_new();
gnt_text_view_set_flag(GNT_TEXT_VIEW(msg), GNT_TEXT_VIEW_TOP_ALIGN | GNT_TEXT_VIEW_NO_SCROLL);
- switch (type) {
- case PURPLE_NOTIFY_FORMATTED:
+ switch ((int)type) {
+ case (int)PURPLE_NOTIFY_FORMATTED:
plain = purple_markup_strip_html(secondary);
if (gnt_util_parse_xhtml_to_textview(secondary, GNT_TEXT_VIEW(msg)))
break;
diff --git a/finch/libgnt/gntmain.c b/finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c
+++ b/finch/libgnt/gntmain.c
@@ -508,7 +508,10 @@ void gnt_init()
signal(SIGINT, sighandler);
signal(SIGPIPE, SIG_IGN);
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+ /* GLib type system is automaticaly initialized since 2.36. */
g_type_init();
+#endif
init_wm();
diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -767,14 +767,16 @@ dump_file_save(GntFileSel *fs, const cha
if ((now & A_COLOR) != (old & A_COLOR) ||
(now & A_REVERSE) != (old & A_REVERSE))
{
- int ret;
short fgp, bgp, r, g, b;
struct
{
int r, g, b;
} fg, bg;
- ret = pair_content(PAIR_NUMBER(now & A_COLOR), &fgp, &bgp);
+ if (pair_content(PAIR_NUMBER(now & A_COLOR), &fgp, &bgp) != OK) {
+ fgp = -1;
+ bgp = -1;
+ }
if (fgp == -1)
fgp = COLOR_BLACK;
if (bgp == -1)
@@ -785,9 +787,13 @@ dump_file_save(GntFileSel *fs, const cha
fgp = bgp;
bgp = tmp;
}
- ret = color_content(fgp, &r, &g, &b);
+ if (color_content(fgp, &r, &g, &b) != OK) {
+ r = g = b = 0;
+ }
fg.r = r; fg.b = b; fg.g = g;
- ret = color_content(bgp, &r, &g, &b);
+ if (color_content(bgp, &r, &g, &b) != OK) {
+ r = g = b = 255;
+ }
bg.r = r; bg.b = b; bg.g = g;
#define ADJUST(x) (x = x * 255 / 1000)
ADJUST(fg.r);
@@ -1135,13 +1141,11 @@ toggle_clipboard(GntBindable *bindable,
{
static GntWidget *clip;
gchar *text;
- int maxx, maxy;
if (clip) {
gnt_widget_destroy(clip);
clip = NULL;
return TRUE;
}
- getmaxyx(stdscr, maxy, maxx);
text = gnt_get_clipboard_string();
clip = gnt_hwindow_new(FALSE);
GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -8,10 +8,9 @@ PIDGIN_TREE_TOP := ..
More information about the Commits
mailing list