/pidgin/main: 6f2f61656a95: Clean merge.
Mark Doliner
mark at kingant.net
Tue Jan 28 10:38:21 EST 2014
Changeset: 6f2f61656a95d119d8144f9159daf2320ea43a6e
Author: Mark Doliner <mark at kingant.net>
Date: 2014-01-28 07:37 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/6f2f61656a95
Description:
Clean merge.
diffstat:
AUTHORS | 29 +++++++++++++++--------------
configure.ac | 2 +-
finch/finch.c | 3 ++-
finch/libgnt/gntfilesel.c | 2 +-
libpurple/ciphers/aescipher.c | 3 ++-
libpurple/glibcompat.h | 30 +++++++++++++++++++++++++++++-
libpurple/log.c | 2 +-
libpurple/plugins/keyrings/gnomekeyring.c | 1 +
libpurple/plugins/log_reader.c | 1 +
libpurple/protocols/gg/edisc.c | 1 +
libpurple/protocols/gg/message-prpl.c | 1 +
libpurple/protocols/jabber/caps.c | 8 +-------
libpurple/protocols/jabber/jabber.c | 4 ++--
libpurple/protocols/jabber/jutil.c | 2 +-
libpurple/protocols/msn/httpconn.c | 1 +
libpurple/protocols/silc/buddy.c | 1 +
libpurple/protocols/silc/pk.c | 1 +
libpurple/protocols/silc/util.c | 1 +
libpurple/request-datasheet.c | 1 +
libpurple/request.c | 1 +
libpurple/util.c | 1 +
pidgin/gtkconv.c | 1 +
pidgin/gtkmain.c | 3 ++-
pidgin/gtkutils.c | 1 +
pidgin/gtkwebview.c | 4 +++-
25 files changed, 73 insertions(+), 32 deletions(-)
diffs (truncated from 512 to 300 lines):
diff --git a/AUTHORS b/AUTHORS
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,15 +7,11 @@ We've got an IRC room now too, #pidgin o
Current Developers:
------------------
-
Daniel 'datallah' Atallah - Developer
Paul 'darkrain42' Aurich - Developer
-John 'rekkanoryo' Bailey - Developer
Ethan 'Paco-Paco' Blanton - Developer
Sadrul Habib Chowdhury - Developer
Mark 'KingAnt' Doliner - Developer
-Casey Harkins - Developer
-Ivan Komarov - Developer
Gary 'grim' Kramlich - Developer
Richard 'rlaager' Laager - Developer
Marcus 'malu' Lundblad - Developer
@@ -30,17 +26,18 @@ Kevin 'SimGuy' Stange - Developer & Webm
Will 'resiak' Thompson - Developer
Stu 'nosnilmot' Tomlinson - Developer
Jorge 'Masca' Villaseñor - Developer
+Tomasz Wasilczyk - Developer
Crazy Patch Writers:
-------------------
Jakub 'haakon' Adam
Krzysztof Klinikowski
-Peter 'Fmoo' Ruibal
-Gabriel 'Nix' Schulhof
-Tomasz Wasilczyk
+Eion Robb
+Ankit Vani
Retired Developers:
------------------
+John 'rekkanoryo' Bailey - Developer
Herman Bloggs - Win32 Port
Thomas Butter - Developer
Ka-Hing Cheung - Developer
@@ -49,6 +46,8 @@ Sean Egan - Developer
Rob Flynn <gaim at robflynn.com> - maintainer
Adam Fritzler - libfaim maintainer
Christian 'ChipX86' Hammond - Developer & Webmaster
+Casey Harkins - Developer
+Ivan Komarov - Developer
Syd Logan - hacker and designated driver [lazy bum]
Christopher 'siege' O'Brien - Developer
Bartosz Oler - Developer
@@ -67,6 +66,8 @@ Dennis 'EvilDennisR' Ristuccia - Senior
Peter 'Bleeter' Lawler
Robert 'Robot101' McQueen
Benjamin Miller
+Peter 'Fmoo' Ruibal
+Gabriel 'Nix' Schulhof
Artists:
-------
@@ -74,8 +75,8 @@ Hylke Bons - Icons
Other Contributions:
-------------------
-Much thanks to Evan Martin <martine at cs.washington.edu> for writing
-GtkSpell <http://gtkspell.sourceforge.net> responsible for the
+Much thanks to Evan Martin <martine at cs.washington.edu> for writing
+GtkSpell <http://gtkspell.sourceforge.net> responsible for the
"Highlight misspelled words" feature and for gtk-nativewin
<http://bunny.darktech.org/cvs/gtk-nativewin/> the default GTK+-2.0
engine originally used in our win32 port.
@@ -83,11 +84,11 @@ engine originally used in our win32 port
** ORIGINAL LOGO DESIGNED BY: Naru Sundar **
Peter Teichiman <peter at helixcode.com>
-Larry Ewing
+Larry Ewing
Jeramey A. Crawford
Thanks to these boys. Peter and Larry managed to stomp
out a large list of Mem Leaks. Jeramey found the remaining
- onees and pointed me to those. Props to the boys at
+ onees and pointed me to those. Props to the boys at
Helix Code. Thanks guys.
Nathan Walp
@@ -98,15 +99,15 @@ Neil Sanchala
Arkadiusz Miskiewicz
Wrote the Gadu-Gadu plugin
-
-David Prater <IM: dRaven43> draven at tcsx.net
+
+David Prater <IM: dRaven43> draven at tcsx.net
Log and Colour Button Images
Sébastien Carpe <IM: Seb Carpe>
Base HTTP Proxy Support
Ari Pollak <IM: Ari Pollak> compwiz.dhs.org
- Resize conversation window patch
+ Resize conversation window patch
Decklin Foster
Many GUI improvements, other nifty additions and fixes
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -474,7 +474,7 @@ running configure.
PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0],
AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:)
- WEBKIT_VERSION=1.3.1
+ WEBKIT_VERSION=1.3.7
if test "x$with_gtk" = "x3"; then
WEBKIT_PC_MODULE="webkitgtk-3.0"
PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
diff --git a/finch/finch.c b/finch/finch.c
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -27,7 +27,7 @@
#include "core.h"
#include "debug.h"
#include "eventloop.h"
-#include "xfer.h"
+#include "glibcompat.h"
#include "log.h"
#include "notify.h"
#include "prefs.h"
@@ -38,6 +38,7 @@
#include "status.h"
#include "util.h"
#include "whiteboard.h"
+#include "xfer.h"
#include "gntdebug.h"
#include "gntprefs.h"
diff --git a/finch/libgnt/gntfilesel.c b/finch/libgnt/gntfilesel.c
--- a/finch/libgnt/gntfilesel.c
+++ b/finch/libgnt/gntfilesel.c
@@ -161,7 +161,7 @@ local_read_fn(const char *path, GList **
while ((str = g_dir_read_name(dir)) != NULL) {
char *fp = g_build_filename(path, str, NULL);
- GStatBuf st;
+ struct stat st;
if (g_stat(fp, &st)) {
gnt_warning("Error stating location %s", fp);
diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -362,7 +362,8 @@ purple_aes_cipher_nss_crypt(const guchar
return FALSE;
}
- ret = PK11_CipherOp(context.enc_context, output, &outlen, len, input, len);
+ ret = PK11_CipherOp(context.enc_context, output, &outlen, len,
+ (guchar *)input, len);
if (ret != SECSuccess) {
purple_debug_error("cipher-aes",
"PK11_CipherOp failed: %d\n", PR_GetError());
diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -41,15 +41,39 @@
#if !GLIB_CHECK_VERSION(2, 32, 0)
+#include <glib.h>
+#include <glib-object.h>
+
+#include <string.h>
+
#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
#define G_GNUC_END_IGNORE_DEPRECATIONS
+#define g_signal_handlers_disconnect_by_data(instance, data) \
+ g_signal_handlers_disconnect_matched((instance), G_SIGNAL_MATCH_DATA, \
+ 0, 0, NULL, NULL, (data))
+
static inline GThread * g_thread_try_new(const gchar *name, GThreadFunc func,
gpointer data, GError **error)
{
return g_thread_create(func, data, TRUE, error);
}
+#if !GLIB_CHECK_VERSION(2, 30, 0)
+
+static inline gchar *g_utf8_substring(const gchar *str, glong start_pos,
+ glong end_pos)
+{
+ gchar *start = g_utf8_offset_to_pointer(str, start_pos);
+ gchar *end = g_utf8_offset_to_pointer(start, end_pos - start_pos);
+ gchar *out = g_malloc(end - start + 1);
+
+ memcpy(out, start, end - start);
+ out[end - start] = 0;
+
+ return out;
+}
+
#if !GLIB_CHECK_VERSION(2, 28, 0)
static inline gint64 g_get_monotonic_time(void)
@@ -75,6 +99,8 @@ static inline void g_slist_free_full(GSL
#if !GLIB_CHECK_VERSION(2, 26, 0)
+typedef struct stat GStatBuf;
+
static inline void g_object_notify_by_pspec(GObject *object, GParamSpec *pspec)
{
g_object_notify(object, g_param_spec_get_name(pspec));
@@ -83,7 +109,7 @@ static inline void g_object_notify_by_ps
static inline void g_object_class_install_properties(GObjectClass *oclass,
guint n_pspecs, GParamSpec **pspecs)
{
- gint i;
+ guint i;
for (i = 1; i < n_pspecs; ++i)
g_object_class_install_property(oclass, i, pspecs[i]);
}
@@ -92,6 +118,8 @@ static inline void g_object_class_instal
#endif /* < 2.28.0 */
+#endif /* < 2.30.0 */
+
#endif /* < 2.32.0 */
#endif /* _PIDGINGLIBCOMPAT_H_ */
diff --git a/libpurple/log.c b/libpurple/log.c
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -28,7 +28,7 @@
#include "account.h"
#include "dbus-maybe.h"
#include "debug.h"
-#include "internal.h"
+#include "glibcompat.h"
#include "log.h"
#include "prefs.h"
#include "util.h"
diff --git a/libpurple/plugins/keyrings/gnomekeyring.c b/libpurple/plugins/keyrings/gnomekeyring.c
--- a/libpurple/plugins/keyrings/gnomekeyring.c
+++ b/libpurple/plugins/keyrings/gnomekeyring.c
@@ -27,6 +27,7 @@
#include "internal.h"
#include "account.h"
#include "debug.h"
+#include "glibcompat.h"
#include "keyring.h"
#include "plugin.h"
#include "version.h"
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -3,6 +3,7 @@
#include <stdio.h>
#include "debug.h"
+#include "glibcompat.h"
#include "log.h"
#include "plugin.h"
#include "pluginpref.h"
diff --git a/libpurple/protocols/gg/edisc.c b/libpurple/protocols/gg/edisc.c
--- a/libpurple/protocols/gg/edisc.c
+++ b/libpurple/protocols/gg/edisc.c
@@ -1,6 +1,7 @@
#include "edisc.h"
#include <debug.h>
+#include <glibcompat.h>
#include "gg.h"
#include "libgaduw.h"
diff --git a/libpurple/protocols/gg/message-prpl.c b/libpurple/protocols/gg/message-prpl.c
--- a/libpurple/protocols/gg/message-prpl.c
+++ b/libpurple/protocols/gg/message-prpl.c
@@ -1,6 +1,7 @@
#include "message-prpl.h"
#include <debug.h>
+#include <glibcompat.h>
#include "gg.h"
#include "chat.h"
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -469,6 +469,7 @@ jabber_caps_client_iqcb(JabberStream *js
hasher = purple_md5_hash_new();
}
hash = jabber_caps_calculate_hash(info, hasher);
+ g_object_unref(hasher);
if (!hash || !g_str_equal(hash, userdata->ver)) {
purple_debug_warning("jabber", "Could not validate caps info from "
@@ -484,7 +485,6 @@ jabber_caps_client_iqcb(JabberStream *js
}
More information about the Commits
mailing list