/soc/2013/ashmew2/filetransferY: f1425fb67659: Pull changes from...
Ashish Gupta
ashmew2 at gmail.com
Wed Feb 26 12:55:34 EST 2014
Changeset: f1425fb67659008744a4d6481b819951216f2b6c
Author: Ashish Gupta <ashmew2 at gmail.com>
Date: 2014-02-26 22:49 +0530
Branch: default
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferY/rev/f1425fb67659
Description:
Pull changes from default
diffstat:
.hgignore | 1 +
COPYRIGHT | 3 +-
ChangeLog | 7 +
ChangeLog.API | 1 +
Makefile.am | 52 +-
README.hg | 12 +-
configure.ac | 45 +-
doc/reference/finch/Makefile.am | 14 +-
doc/reference/libpurple/Makefile.am | 25 +-
doc/reference/libpurple/signals_blist.xml | 2 +-
doc/reference/pidgin/Makefile.am | 25 +-
finch/gntblist.c | 37 +
finch/gntblist.h | 12 +-
finch/gntxfer.c | 10 +-
finch/libgnt/gntfilesel.c | 33 +
finch/libgnt/gntfilesel.h | 9 +
finch/libgnt/gnttree.c | 38 +
finch/libgnt/gnttree.h | 9 +
finch/libgnt/gntwm.c | 17 +-
libpurple/accounts.c | 10 +-
libpurple/blistnode.h | 7 +-
libpurple/buddylist.c | 12 +-
libpurple/connection.c | 10 +-
libpurple/conversation.c | 30 +-
libpurple/core.c | 10 +-
libpurple/debug.c | 10 +-
libpurple/dnsquery.c | 10 +-
libpurple/dnssrv.c | 10 +-
libpurple/eventloop.c | 10 +-
libpurple/idle.c | 10 +-
libpurple/notify.c | 10 +-
libpurple/plugin.h | 8 +-
libpurple/plugins/keyrings/Makefile.am | 2 +-
libpurple/plugins/perl/Makefile.am | 1 +
libpurple/plugins/perl/Makefile.mingw | 3 +
libpurple/plugins/perl/common/Makefile.PL.in | 2 +-
libpurple/plugins/perl/common/Makefile.mingw | 3 +
libpurple/protocols/Makefile.am | 2 +-
libpurple/protocols/Makefile.mingw | 2 +-
libpurple/protocols/gg/Makefile.am | 5 +-
libpurple/protocols/gg/keymapper.c | 10 +-
libpurple/protocols/gg/keymapper.h | 4 +-
libpurple/protocols/gg/lib/common.c | 2 +-
libpurple/protocols/gg/lib/config.h | 2 +-
libpurple/protocols/gg/lib/libgadu.c | 5 +-
libpurple/protocols/gg/lib/message.h | 10 +-
libpurple/protocols/gg/lib/protocol.h | 10 +-
libpurple/protocols/mxit/markup.c | 2 +-
libpurple/protocols/myspace/Makefile.am | 44 -
libpurple/protocols/myspace/Makefile.mingw | 82 -
libpurple/protocols/myspace/README | 27 -
libpurple/protocols/myspace/markup.c | 763 --
libpurple/protocols/myspace/markup.h | 27 -
libpurple/protocols/myspace/message.c | 1413 ---
libpurple/protocols/myspace/message.h | 109 -
libpurple/protocols/myspace/myspace.c | 3574 ----------
libpurple/protocols/myspace/myspace.h | 202 -
libpurple/protocols/myspace/persist.h | 92 -
libpurple/protocols/myspace/session.c | 98 -
libpurple/protocols/myspace/session.h | 61 -
libpurple/protocols/myspace/user.c | 896 --
libpurple/protocols/myspace/user.h | 62 -
libpurple/protocols/myspace/zap.c | 246 -
libpurple/protocols/myspace/zap.h | 28 -
libpurple/protocols/zephyr/zephyr.c | 1 -
libpurple/prpl.h | 2 +-
libpurple/purple-url-handler | 7 -
libpurple/request.c | 10 +-
libpurple/roomlist.c | 10 +-
libpurple/sound.c | 10 +-
libpurple/status.c | 33 +-
libpurple/whiteboard.c | 10 +-
libpurple/win32/global.mak | 2 +-
libpurple/xfer.c | 10 +-
libpurple/xfer.h | 4 +-
pidgin/Makefile.am | 4 +
pidgin/gtkblist-theme.c | 50 +-
pidgin/gtkblist-theme.h | 27 +-
pidgin/gtkblist.c | 48 +
pidgin/gtkblist.h | 9 +
pidgin/gtkconv.c | 279 +-
pidgin/gtkconv.h | 6 +-
pidgin/gtkconvwin.h | 194 +-
pidgin/libpidgin.c | 2 +-
pidgin/pidgin.c | 10 +-
pidgin/pixmaps/Makefile.am | 3 -
pidgin/pixmaps/emotes/default/24/Makefile.am | 7 -
pidgin/pixmaps/emotes/default/24/bulgy-eyes.png | Bin
pidgin/pixmaps/emotes/default/24/default.theme.in | 32 -
pidgin/pixmaps/emotes/default/24/freaked-out.png | Bin
pidgin/pixmaps/emotes/default/24/messed.png | Bin
pidgin/pixmaps/emotes/default/24/mohawk.png | Bin
pidgin/pixmaps/emotes/default/24/sidefrown.png | Bin
pidgin/pixmaps/emotes/default/24/sinister.png | Bin
pidgin/pixmaps/emotes/default/24/smirk.png | Bin
pidgin/pixmaps/emotes/small/16/small.theme.in | 16 -
pidgin/pixmaps/protocols/16/myspace.png | Bin
pidgin/pixmaps/protocols/22/myspace.png | Bin
pidgin/pixmaps/protocols/22/scalable/myspace.svg | 93 -
pidgin/pixmaps/protocols/48/myspace.png | Bin
pidgin/plugins/Makefile.mingw | 2 +-
pidgin/plugins/disco/xmppdisco.c | 1 -
pidgin/plugins/extplacement.c | 2 +-
pidgin/plugins/gestures/gestures.c | 8 +-
pidgin/plugins/gtk-signals-test.c | 2 +-
pidgin/plugins/iconaway.c | 4 +-
pidgin/plugins/markerline.c | 10 +-
pidgin/plugins/notify.c | 38 +-
pidgin/plugins/perl/Makefile.am | 1 +
pidgin/plugins/perl/Makefile.mingw | 3 +
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/perl/common/Makefile.mingw | 3 +
pidgin/plugins/perl/common/gtkmodule.h | 2 +-
pidgin/plugins/unity.c | 4 +-
pidgin/plugins/win32/transparency/win2ktrans.c | 18 +-
pidgin/win32/gtkwin32dep.c | 11 +-
pidgin/win32/gtkwin32dep.h | 3 +-
pidgin/win32/nsis/pidgin-installer.nsi | 12 +-
po/POTFILES.in | 3 -
po/POTFILES.skip | 2 +
share/ca-certs/Makefile.am | 6 +-
share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem | 0
share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem | 0
share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem | 0
124 files changed, 911 insertions(+), 8393 deletions(-)
diffs (truncated from 11946 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -107,6 +107,7 @@ pidgin-*.*.*-win32-bin.zip$
pidgin-*.*.*-win32bin$
pidgin-.*.tar.bz2
pidgin-.*.tar.gz
+pidgin-[0-9a-z.-]+/
pidgin.apspec$
pidgin.desktop$
pidgin.desktop.in$
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyrig
piece of code, then that code should be traced through our version
control system to see from where it came and who has modified it.
-Copyright (C) 1998-2013 by the following:
+Copyright (C) 1998-2014 by the following:
Mark
Saleem Abdulrasool
@@ -572,6 +572,7 @@ Martijn van Beers
Gideon van Melle
Arjan van de Ven
Philip Van Hoof
+Ankit Vani
Kristof Vansant
James Vega
David Vermeille
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,10 @@ version 3.0.0 (??/??/????):
* The buddy's name was not centered vertically in the buddy-list if they
did not have a status-message or mood set.
+ MySpace:
+ * Remove this protocol because the servers have been taken offline.
+ (Robbie Vehse) (#15356)
+
XMPP:
* Strip element prefixes from XHTML-IM messages as they're presented
to the core (and UIs) as incoming messages (Thijs Alkemade).
@@ -64,6 +68,9 @@ version 3.0.0 (??/??/????):
* Ciphers are now built from the libpurple directory.
* Doxygen has been replaced by gtk-doc for generating documentation.
+ Finch:
+ * Fix build against Python 3. (Ed Catmur) (#15969)
+
version 2.10.9 (2/2/2014):
XMPP:
* Fix problems logging into some servers including jabber.org and
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -457,6 +457,7 @@ version 3.0.0 (??/??/????):
* smiley_list renamed to PidginSmileyList
* smiley_parse_markup renamed to pidgin_smiley_parse_markup
* smiley_theme renamed to PidginSmileyTheme
+ * PidginWindow renamed to PidginConvWindow
Removed:
* GtkIMHtml.clipboard_html_string
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,31 @@ EXTRA_DIST = \
noinst_HEADERS = config.h package_revision.h
+dist-pre-hook: package_revision.h
+if !ENABLE_GTK_DOC
+ $(AM_V_at)echo "error: gtk-doc must be installed and enabled in order to make dist"
+ $(AM_V_at)echo "re-run ./configure with --enable-gtk-doc switch and try again"
+ $(AM_V_at)false
+endif
+ $(AM_V_at)if [ ! -f "$(top_builddir)libpurple/libpurple.la" ]; then \
+ $(MAKE) -C libpurple libpurple.la; \
+ fi
+if ENABLE_GNT
+ $(AM_V_at)if [ ! -f "$(top_builddir)finch/libgnt/libgnt.la" ]; then \
+ $(MAKE) -C finch/libgnt libgnt.la; \
+ fi
+ $(AM_V_at)if [ ! -f "$(top_builddir)finch/libfinch.la" ]; then \
+ $(MAKE) -C finch libfinch.la; \
+ fi
+endif
+if ENABLE_GTK
+ $(AM_V_at)if [ ! -f "$(top_builddir)pidgin/libpidgin.la" ]; then \
+ $(MAKE) -C pidgin libpidgin.la; \
+ fi
+endif
+
+dist: dist-pre-hook
+
dist-hook:
rm $(distdir)/config.h
@@ -82,17 +107,23 @@ if ENABLE_GNT
GNT_DIR=finch
endif
-# This is phony, so that we always try to rebuild it. If it succeeds
-# in calculating changes, it produces its target; otherwise, its
-# target does not exist.
-.PHONY: package_revision_raw.txt
+# We always try to rebuild all objects that depends on this dummy target.
+.FORCE:
+
# if both attempts fail, then we need to remove the empty file that >
# creates, and also make sure that the shell command exits
# successfully; the rm -f ensures both
-package_revision_raw.txt:
+package_revision_raw.txt: .FORCE
$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
- (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@ \
- || rm -f $@
+ (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@.new \
+ || rm -f $@.new
+ $(AM_V_at)if test -f $@.new; then \
+ if ! diff $@ $@.new > /dev/null; then \
+ mv $@.new $@; \
+ else \
+ rm $@.new; \
+ fi \
+ fi
package_revision.h: package_revision_raw.txt
$(AM_V_GEN)if test -f $<; then \
echo "#define REVISION \"`cat $<`\"" > $@; \
@@ -116,15 +147,16 @@ package_revision.h: package_revision_raw
# line does is tell 'distcheck' to shut up and ignore those two files.
distcleancheck_listfiles = find . -type f -a ! -name package_revision.h
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
SUBDIRS = . m4macros libpurple $(GNT_DIR) $(GTK_DIR) $(PO_DIR) share/ca-certs share/sounds doc
# perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which
# breaks "make distcheck" unless we ignore perl things
+# TODO drop it when we drop perl wrapper
distuninstallcheck_listfiles = \
- find . -type f -print | grep -v perl | grep -v Purple.3pm
+ find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm
DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \
- intltool-merge intltool-update
+ intltool-merge intltool-update package_revision_raw.txt
diff --git a/README.hg b/README.hg
--- a/README.hg
+++ b/README.hg
@@ -19,12 +19,12 @@ If you are interested in hacking on Pidg
check out the information available at: https://developer.pidgin.im
By far the best documentation, however, is the documented code. You can pass
-"--enable-gtk-doc" to ./configure before running "make" in the source tree to
-generate pretty documentation using gtk-doc. Otherwise (or even if you do!),
-the header files for each subsystem contain documentation for the functions they
-contain. For instance, conversation.h contains documentation for the entire
-purple_conversation_* API, and account.h contains documentation for the
-purple_account_* API.
+"--enable-gtk-doc" to ./configure then run "make" in the source tree to
+generate pretty documentation in the doc/reference/*/html directories.
+Otherwise (or even if you do!), the header files for each subsystem contain
+documentation for the functions they contain. For instance, conversation.h
+contains documentation for the entire purple_conversation_* API, and account.h
+contains documentation for the purple_account_* API.
If you have questions, please feel free to contact the Pidgin, Finch, and
libpurple developers by email at devel at pidgin.im or on IRC at irc.freenode.net
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -645,7 +645,7 @@ Use --disable-gtkspell if you do not nee
else
if test "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([
-Evolution development headers not found.
+Evolution development headers not found (libebook, libedata-book, evolution-data-server >= 3.6).
Use --disable-gevolution if you do not need it.
])
fi
@@ -1337,7 +1337,7 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DY
fi
if test "x$STATIC_PRPLS" = "xall" ; then
- STATIC_PRPLS="bonjour gg irc jabber msn mxit myspace novell oscar sametime silc simple yahoo zephyr"
+ STATIC_PRPLS="bonjour gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
fi
if test "x$have_meanwhile" != "xyes" ; then
STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
@@ -1383,7 +1383,6 @@ for i in $STATIC_PRPLS ; do
jabber) static_jabber=yes ;;
msn) static_msn=yes ;;
mxit) static_mxit=yes ;;
- myspace) static_myspace=yes ;;
novell) static_novell=yes ;;
oscar) static_oscar=yes ;;
aim) static_oscar=yes ;;
@@ -1402,7 +1401,6 @@ AM_CONDITIONAL(STATIC_IRC, test "x$stati
AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "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")
@@ -1416,7 +1414,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $e
AC_ARG_WITH(dynamic_prpls, [AS_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 mxit myspace novell oscar sametime silc simple yahoo zephyr"
+ DYNAMIC_PRPLS="bonjour gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
fi
if test "x$have_meanwhile" != "xyes"; then
DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
@@ -1436,7 +1434,6 @@ for i in $DYNAMIC_PRPLS ; do
jabber) dynamic_jabber=yes ;;
msn) dynamic_msn=yes ;;
mxit) dynamic_mxit=yes ;;
- myspace) dynamic_myspace=yes ;;
novell) dynamic_novell=yes ;;
null) dynamic_null=yes ;;
oscar) dynamic_oscar=yes ;;
@@ -1897,27 +1894,15 @@ dnl Check for Python headers (currently
dnl (Thanks to XChat)
if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then
AC_MSG_CHECKING(for Python compile flags)
- PY_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.prefix)'`
- PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.exec_prefix)'`
- changequote(<<, >>)dnl
- PY_VERSION=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:3])'`
- PY_MAJOR=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:2])'`
- changequote([, ])dnl
- if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
- AC_MSG_RESULT()
- AC_CHECK_LIB(pthread, pthread_create, )
- AC_CHECK_LIB(util, openpty, )
- AC_CHECK_LIB(db, dbopen, )
- PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
- PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+ if test -f ${PYTHON}-config; then
+ PY_CFLAGS=`${PYTHON}-config --includes`
+ PY_LIBS=`${PYTHON}-config --libs`
AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
- dnl Because the above AC_CHECK_LIB get in the way...
- AC_MSG_CHECKING(for Python compile flags)
AC_MSG_RESULT(ok)
else
- AC_MSG_RESULT([Can't find Python.h])
+ AC_MSG_RESULT([Cannot find ${PYTHON}-config])
+ PY_CFLAGS=""
PY_LIBS=""
- PY_CFLAGS=""
fi
fi
AC_SUBST(PY_CFLAGS)
@@ -2901,13 +2886,16 @@ AM_CONDITIONAL(ENABLE_TRAYCOMPAT, test "
m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.16],[--flavour no-tmpl])
],[
-AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+ if test "x$force_deps" = "xyes" -a "x$enable_gtk_doc" = "xyes"; then
+ AC_MSG_ERROR([
+You have requested to generate documentation, but gtk-doc was not found.
+ ])
+ fi
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+ enable_gtk_doc=no
])
-if test "x$enable_gtk_doc" = "x" ; then
- enable_gtk_doc=no
-fi
-
AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],
[compile with debugging support])], , enable_debug=no)
@@ -2967,7 +2955,6 @@ AC_CONFIG_FILES([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
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -94,14 +94,19 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/finch/libgnt \
$(DEBUG_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GPLUGIN_CFLAGS) \
$(DBUS_CFLAGS) \
More information about the Commits
mailing list