/pidgin/main: 188b3b588b6d: Manual merge. Only 1 conflict, in Ch...
Mark Doliner
mark at kingant.net
Tue Jan 28 10:38:10 EST 2014
Changeset: 188b3b588b6d05d18174a3268617eaf5707cb0aa
Author: Mark Doliner <mark at kingant.net>
Date: 2014-01-09 20:17 -0800
Branch: release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/188b3b588b6d
Description:
Manual merge. Only 1 conflict, in ChangeLog.
diffstat:
.hgignore | 1 +
COPYRIGHT | 1 +
ChangeLog | 9 +-
configure.ac | 10 +-
libpurple/Makefile.mingw | 1 +
libpurple/dbus-analyze-functions.py | 83 ++--
libpurple/dbus-analyze-signals.py | 14 +-
libpurple/dbus-analyze-types.py | 28 +-
libpurple/dnssrv.c | 53 +--
libpurple/plugins/dbus-buddyicons-example.py | 3 +-
libpurple/plugins/perl/common/Network.xs | 5 +
libpurple/plugins/ssl/ssl-nss.c | 50 ++-
libpurple/plugins/startup.py | 13 +-
libpurple/protocols/gg/gg.c | 116 +-----
libpurple/protocols/gg/lib/handlers.c | 2 +-
libpurple/protocols/gg/lib/http.c | 7 +
libpurple/protocols/msn/msg.c | 5 +-
libpurple/protocols/mxit/formcmds.c | 4 +-
libpurple/protocols/mxit/markup.c | 82 ++--
libpurple/protocols/mxit/protocol.c | 28 +-
libpurple/protocols/yahoo/libymsg.c | 5 +
libpurple/prpl.h | 5 +-
libpurple/util.c | 38 +-
libpurple/win32/global.mak | 2 +-
pidgin/gtkdialogs.c | 4 +-
pidgin/gtknotify.c | 409 +++++++++++++---------
pidgin/gtkthemes.c | 17 +-
pidgin/pixmaps/protocols/16/mxit.png | Bin
pidgin/pixmaps/protocols/22/mxit.png | Bin
pidgin/pixmaps/protocols/48/mxit.png | Bin
pidgin/pixmaps/protocols/scalable/mxit.svg | 41 +-
pidgin/win32/nsis/pidgin-installer.nsi | 1 +
po/de.po | 9 +-
share/ca-certs/DigiCertHighAssuranceEVRootCA.pem | 23 +
share/ca-certs/Makefile.am | 1 +
35 files changed, 584 insertions(+), 486 deletions(-)
diffs (truncated from 2045 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,6 +7,7 @@ syntax: regexp
.*/perl/common/[^/]+\.c$
.*/perl/common/blib.*
.*/perl/common/pm_to_blib$
+.*/perl/common/MYMETA\.(json|yml)
.*~$
.*\.a$
.*\.asc$
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -214,6 +214,7 @@ Christian Grothoff
Vladislav Guberinić
Gideon N. Guillen
Aman Gupta
+Ashish Gupta
Christian Hammond
Erick Hamness
Fred Hampton
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,13 +4,20 @@ version 2.10.8:
libpurple:
* Impose maximum download size for all HTTP fetches.
+ General:
+ * Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
+
AIM and ICQ:
* Fix a possible crash when receiving a malformed message in a Direct IM
session.
+ Gadu-Gadu:
+ * Disabled buddy list import/export from/to server (it didn't worked
+ anymore). Buddy list synchronization will be implemented in 3.0.0.
+
Windows-Specific Changes:
* Updates to dependencies:
- * NSS 3.14.3 and NSPR 4.9.5
+ * NSS 3.15.2 and NSPR 4.10.1
version 2.10.7 (02/13/2013):
Alien hatchery:
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1493,13 +1493,13 @@ 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 ; print sys.prefix'`
- PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
+ 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 ; print sys.version[0:3]'`
- PY_MAJOR=`$PYTHON -c 'import sys ; print sys.version[0:2]'`
+ 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 -a "$PY_MAJOR" = "2."; then
+ 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, )
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -117,6 +117,7 @@ OBJECTS = $(C_SRC:%.c=%.o) $(RC_SRC:%.rc
## LIBRARIES
##
LIBS = \
+ -ldnsapi \
-lglib-2.0 \
-lgthread-2.0 \
-lgobject-2.0 \
diff --git a/libpurple/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py
--- a/libpurple/dbus-analyze-functions.py
+++ b/libpurple/dbus-analyze-functions.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import re
import string
import sys
@@ -236,38 +237,38 @@ class ClientBinding (Binding):
paramslist = ", ".join(self.paramshdr)
if (paramslist == "") :
paramslist = "void"
- print "%s %s(%s)" % (self.functiontype, self.function.name,
- paramslist),
+ print("%s %s(%s)" % (self.functiontype, self.function.name,
+ paramslist), end=' ')
if self.headersonly:
- print ";"
+ print(";")
return
- print "{"
+ print("{")
for decl in self.decls:
- print decl
+ print(decl)
- print 'dbus_g_proxy_call(purple_proxy, "%s", NULL,' % ctopascal(self.function.name)
+ print('dbus_g_proxy_call(purple_proxy, "%s", NULL,' % ctopascal(self.function.name))
for type_name in self.inputparams:
- print "\t%s, %s, " % type_name,
- print "G_TYPE_INVALID,"
+ print("\t%s, %s, " % type_name, end=' ')
+ print("G_TYPE_INVALID,")
for type_name in self.outputparams:
- print "\t%s, &%s, " % type_name,
- print "G_TYPE_INVALID);"
+ print("\t%s, &%s, " % type_name, end=' ')
+ print("G_TYPE_INVALID);")
for code in self.returncode:
- print code
+ print(code)
- print "}\n"
+ print("}\n")
def definepurplestructure(self, type):
if (self.headersonly) and (type[0] not in self.knowntypes):
- print "struct _%s;" % type[0]
- print "typedef struct _%s %s;" % (type[0], type[0])
+ print("struct _%s;" % type[0])
+ print("typedef struct _%s %s;" % (type[0], type[0]))
self.knowntypes.append(type[0])
def inputsimple(self, type, name, us):
@@ -353,39 +354,39 @@ class ServerBinding (Binding):
self.argfunc = "dbus_message_get_args"
def flush(self):
- print "static DBusMessage*"
- print "%s_DBUS(DBusMessage *message_DBUS, DBusError *error_DBUS) {" % \
- self.function.name
+ print("static DBusMessage*")
+ print("%s_DBUS(DBusMessage *message_DBUS, DBusError *error_DBUS) {" % \
+ self.function.name)
- print "\tDBusMessage *reply_DBUS;"
+ print("\tDBusMessage *reply_DBUS;")
for decl in self.cdecls:
- print decl
+ print(decl)
- print "\t%s(message_DBUS, error_DBUS," % self.argfunc,
+ print("\t%s(message_DBUS, error_DBUS," % self.argfunc,end=' ')
for param in self.cparams:
- print "DBUS_TYPE_%s, &%s," % param,
- print "DBUS_TYPE_INVALID);"
+ print("DBUS_TYPE_%s, &%s," % param, end=' ')
+ print("DBUS_TYPE_INVALID);")
- print "\tCHECK_ERROR(error_DBUS);"
+ print("\tCHECK_ERROR(error_DBUS);")
for code in self.ccode:
- print code
+ print(code)
- print "\treply_DBUS = dbus_message_new_method_return (message_DBUS);"
+ print("\treply_DBUS = dbus_message_new_method_return (message_DBUS);")
- print "\tdbus_message_append_args(reply_DBUS,",
+ print("\tdbus_message_append_args(reply_DBUS,", end=' ')
for param in self.cparamsout:
if type(param) is str:
- print "%s," % param,
+ print("%s," % param, end=' ')
else:
- print "DBUS_TYPE_%s, &%s," % param,
- print "DBUS_TYPE_INVALID);"
+ print("DBUS_TYPE_%s, &%s," % param, end=' ')
+ print("DBUS_TYPE_INVALID);")
for code in self.ccodeout:
- print code
+ print(code)
- print "\treturn reply_DBUS;\n}\n"
+ print("\treturn reply_DBUS;\n}\n")
def addstring(self, *items):
@@ -436,7 +437,7 @@ class ServerBinding (Binding):
self.cdecls.append("\t%s *%s;" % (type[0], name))
self.cparams.append(("INT32", name + "_ID"))
self.ccode.append("\tPURPLE_DBUS_ID_TO_POINTER(%s, %s_ID, %s, error_DBUS);" % \
- (name, name, type[0]))
+ (name, name, type[0]))
self.addintype("i", name)
def inputpointer(self, type, name):
@@ -539,7 +540,7 @@ class BindingSet:
def process(self):
- print "/* Generated by %s. Do not edit! */" % sys.argv[0]
+ print("/* Generated by %s. Do not edit! */" % sys.argv[0])
for line in self.inputiter:
words = line.split()
@@ -554,7 +555,7 @@ class BindingSet:
# empty line has been encountered
myline = line.strip()
while (myline.count("(") > myline.count(")")) or self.typeregexp.match(myline):
- newline = self.inputiter.next().strip()
+ newline = next(self.inputiter).strip()
if len(newline) == 0:
break
myline += " " + newline
@@ -597,15 +598,15 @@ class ServerBindingSet (BindingSet):
self.functions.append((binding.function.name, binding.dparams))
def flush(self):
- print "static PurpleDBusBinding bindings_DBUS[] = { "
+ print("static PurpleDBusBinding bindings_DBUS[] = { ")
for function, params in self.functions:
- print '{"%s", "%s", %s_DBUS},' % \
- (ctopascal(function), params, function)
+ print('{"%s", "%s", %s_DBUS},' % \
+ (ctopascal(function), params, function))
- print "{NULL, NULL, NULL}"
- print "};"
+ print("{NULL, NULL, NULL}")
+ print("};")
- print "#define PURPLE_DBUS_REGISTER_BINDINGS(handle) purple_dbus_register_bindings(handle, bindings_DBUS)"
+ print("#define PURPLE_DBUS_REGISTER_BINDINGS(handle) purple_dbus_register_bindings(handle, bindings_DBUS)")
class ClientBindingSet (BindingSet):
def __init__(self, inputfile, fprefix, headersonly):
@@ -643,7 +644,7 @@ else:
if "client" in options:
bindings = ClientBindingSet(sys.stdin, fprefix,
- options.has_key("headers"))
+ "headers" in options)
else:
bindings = ServerBindingSet(sys.stdin, fprefix)
bindings.process()
diff --git a/libpurple/dbus-analyze-signals.py b/libpurple/dbus-analyze-signals.py
--- a/libpurple/dbus-analyze-signals.py
+++ b/libpurple/dbus-analyze-signals.py
@@ -5,7 +5,7 @@
# <signal name="Changed">
# <arg name="new_value" type="b"/>
# </signal>
-
+from __future__ import print_function
import re
import sys
@@ -23,8 +23,8 @@ excluded = [\
registerregex = re.compile("purple_signal_register[^;]+\"([\w\-]+)\"[^;]+(purple_marshal_\w+)[^;]+;")
nameregex = re.compile('[-_][a-z]')
-print "/* Generated by %s. Do not edit! */" % sys.argv[0]
-print "const char *dbus_signals = "
+print("/* Generated by %s. Do not edit! */" % sys.argv[0])
+print("const char *dbus_signals = ")
for match in registerregex.finditer(sys.stdin.read()):
signal = match.group(1)
marshal = match.group(2)
@@ -32,7 +32,7 @@ for match in registerregex.finditer(sys.
continue
signal = nameregex.sub(lambda x:x.group()[1].upper(), '-'+signal)
- print "\" <signal name='%s'>\\n\""%signal
+ print("\" <signal name='%s'>\\n\"" % signal)
args = marshal.split('_')
# ['purple', 'marshal', <return type>, '', args...]
@@ -52,9 +52,9 @@ for match in registerregex.finditer(sys.
type = 't'
elif arg == "BOOLEAN":
type = 'b'
- print "\" <arg type='%s'/>\\n\""%type
+ print("\" <arg type='%s'/>\\n\"" % type)
- print "\" </signal>\\n\""
+ print("\" </signal>\\n\"")
-print ";"
+print(";")
More information about the Commits
mailing list