HGKeeper

pidgin/pidgin

Clean merge.

2014-01-28, Mark Doliner

6f2f61656a95

Parents 2d76d38118a8 6f9d71f2ee07
Children dc0a29ff7087 48f85579cc4c

Clean merge.

25 files changed, 73 insertions(+), 32 deletions(-)

+15 -14

AUTHORS

+1 -1

configure.ac

+2 -1

finch/finch.c

+1 -1

finch/libgnt/gntfilesel.c

+2 -1

libpurple/ciphers/aescipher.c

+29 -1

libpurple/glibcompat.h

+1 -1

libpurple/log.c

+1 -0

libpurple/plugins/keyrings/gnomekeyring.c

+1 -0

libpurple/plugins/log_reader.c

+1 -0

libpurple/protocols/gg/edisc.c

+1 -0

libpurple/protocols/gg/message-prpl.c

+1 -7

libpurple/protocols/jabber/caps.c

+2 -2

libpurple/protocols/jabber/jabber.c

+1 -1

libpurple/protocols/jabber/jutil.c

+1 -0

libpurple/protocols/msn/httpconn.c

+1 -0

libpurple/protocols/silc/buddy.c

+1 -0

libpurple/protocols/silc/pk.c

+1 -0

libpurple/protocols/silc/util.c

+1 -0

libpurple/request-datasheet.c

+1 -0

+1 -0

+1 -0

+2 -1

+1 -0

+3 -1

~~--- a/AUTHORS Thu Jan 23 23:38:47 2014 -0800~~

+++ b/AUTHORS Tue Jan 28 07:37:19 2014 -0800

@@ -7,15 +7,11 @@

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 @@

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 @@

Rob Flynn <gaim@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 @@

Peter 'Bleeter' Lawler

Robert 'Robot101' McQueen

Benjamin Miller

+Peter 'Fmoo' Ruibal

+Gabriel 'Nix' Schulhof

Artists:

-------

@@ -74,8 +75,8 @@

Other Contributions:

-------------------

~~-Much thanks to Evan Martin <martine@cs.washington.edu> for writing~~

~~-GtkSpell <http://gtkspell.sourceforge.net> responsible for the~~

+Much thanks to Evan Martin <martine@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 @@

** ORIGINAL LOGO DESIGNED BY: Naru Sundar **

Peter Teichiman <peter@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 @@

Arkadiusz Miskiewicz

Wrote the Gadu-Gadu plugin

~~-David Prater <IM: dRaven43> draven@tcsx.net~~

+David Prater <IM: dRaven43> draven@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

~~--- a/configure.ac Thu Jan 23 23:38:47 2014 -0800~~

+++ b/configure.ac Tue Jan 28 07:37:19 2014 -0800

@@ -474,7 +474,7 @@

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], , [

~~--- a/finch/finch.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/finch/finch.c Tue Jan 28 07:37:19 2014 -0800

@@ -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"

~~--- a/finch/libgnt/gntfilesel.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/finch/libgnt/gntfilesel.c Tue Jan 28 07:37:19 2014 -0800

@@ -161,7 +161,7 @@

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);

~~--- a/libpurple/ciphers/aescipher.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/ciphers/aescipher.c Tue Jan 28 07:37:19 2014 -0800

@@ -362,7 +362,8 @@

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());

~~--- a/libpurple/glibcompat.h Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/glibcompat.h Tue Jan 28 07:37:19 2014 -0800

@@ -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 @@

#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_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 @@

#endif /* < 2.28.0 */

+#endif /* < 2.30.0 */

#endif /* < 2.32.0 */

#endif /* _PIDGINGLIBCOMPAT_H_ */

~~--- a/libpurple/log.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/log.c Tue Jan 28 07:37:19 2014 -0800

@@ -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"

~~--- a/libpurple/plugins/keyrings/gnomekeyring.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/plugins/keyrings/gnomekeyring.c Tue Jan 28 07:37:19 2014 -0800

@@ -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"

~~--- a/libpurple/plugins/log_reader.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/plugins/log_reader.c Tue Jan 28 07:37:19 2014 -0800

@@ -3,6 +3,7 @@

#include <stdio.h>

#include "debug.h"

+#include "glibcompat.h"

#include "log.h"

#include "plugin.h"

#include "pluginpref.h"

~~--- a/libpurple/protocols/gg/edisc.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/gg/edisc.c Tue Jan 28 07:37:19 2014 -0800

@@ -1,6 +1,7 @@

#include "edisc.h"

#include <debug.h>

+#include <glibcompat.h>

#include "gg.h"

#include "libgaduw.h"

~~--- a/libpurple/protocols/gg/message-prpl.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/gg/message-prpl.c Tue Jan 28 07:37:19 2014 -0800

@@ -1,6 +1,7 @@

#include "message-prpl.h"

#include <debug.h>

+#include <glibcompat.h>

#include "gg.h"

#include "chat.h"

~~--- a/libpurple/protocols/jabber/caps.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/jabber/caps.c Tue Jan 28 07:37:19 2014 -0800

@@ -469,6 +469,7 @@

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 @@

}

g_free(hash);

~~- g_object_unref(hasher);~~

}

if (!userdata->hash && userdata->node_exts) {

@@ -814,7 +814,6 @@

append_escaped_string(PurpleHash *hash, const gchar *str)

{

g_return_if_fail(hash != NULL);

~~- g_object_ref(hash);~~

if (str && *str) {

char *tmp = g_markup_escape_text(str, -1);

@@ -823,7 +822,6 @@

}

purple_hash_append(hash, (const guchar *)"<", 1);

~~- g_object_unref(hash);~~

}

gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, PurpleHash *hash)

@@ -836,8 +834,6 @@

if (!info || !hash)

return NULL;

~~- g_object_ref(hash);~~

/* sort identities, features and x-data forms */

info->identities = g_list_sort(info->identities, jabber_identity_compare);

info->features = g_list_sort(info->features, (GCompareFunc)strcmp);

@@ -913,8 +909,6 @@

success = purple_hash_digest(hash, checksum, checksum_size);

checksum_size = purple_hash_get_digest_size(hash);

~~- g_object_unref(hash);~~

return (success ? purple_base64_encode(checksum, checksum_size) : NULL);

}

~~--- a/libpurple/protocols/jabber/jabber.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/jabber/jabber.c Tue Jan 28 07:37:19 2014 -0800

@@ -4001,12 +4001,12 @@

purple_signal_register(plugin, "jabber-receiving-xmlnode",

purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,

PURPLE_TYPE_CONNECTION,

~~- G_TYPE_POINTER); /* modifiable PurpleXmlNode */~~

+ G_TYPE_POINTER); /* pointer to a PurpleXmlNode* */

purple_signal_register(plugin, "jabber-sending-xmlnode",

purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,

PURPLE_TYPE_CONNECTION,

~~- G_TYPE_POINTER); /* modifiable PurpleXmlNode */~~

+ G_TYPE_POINTER); /* pointer to a PurpleXmlNode* */

* Do not remove this or the plugin will fail. Completely. You have been

~~--- a/libpurple/protocols/jabber/jutil.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/jabber/jutil.c Tue Jan 28 07:37:19 2014 -0800

@@ -803,7 +803,7 @@

if (hash == NULL)

{

~~- purple_debug_error("jabber", "Could not find %s cipher\n", hash_algo);~~

+ purple_debug_error("jabber", "Unexpected hashing algorithm %s requested\n", hash_algo);

g_return_val_if_reached(NULL);

}

~~--- a/libpurple/protocols/msn/httpconn.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/msn/httpconn.c Tue Jan 28 07:37:19 2014 -0800

@@ -25,6 +25,7 @@

#include "httpconn.h"

#include "debug.h"

+#include "glibcompat.h"

#include "http.h"

#include "msn.h"

~~--- a/libpurple/protocols/silc/buddy.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/silc/buddy.c Tue Jan 28 07:37:19 2014 -0800

@@ -18,6 +18,7 @@

#include "internal.h"

+#include "glibcompat.h"

#include "silc.h"

#include "silcclient.h"

#include "silcpurple.h"

~~--- a/libpurple/protocols/silc/pk.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/silc/pk.c Tue Jan 28 07:37:19 2014 -0800

@@ -18,6 +18,7 @@

#include "internal.h"

+#include "glibcompat.h"

#include "silc.h"

#include "silcclient.h"

#include "silcpurple.h"

~~--- a/libpurple/protocols/silc/util.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/protocols/silc/util.c Tue Jan 28 07:37:19 2014 -0800

@@ -18,6 +18,7 @@

#include "internal.h"

+#include "glibcompat.h"

#include "silc.h"

#include "silcclient.h"

#include "silcpurple.h"

~~--- a/libpurple/request-datasheet.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/request-datasheet.c Tue Jan 28 07:37:19 2014 -0800

@@ -27,6 +27,7 @@

#include "request-datasheet.h"

#include "debug.h"

+#include "glibcompat.h"

#include "signals.h"

struct _PurpleRequestDatasheet

~~--- a/libpurple/request.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/request.c Tue Jan 28 07:37:19 2014 -0800

@@ -27,6 +27,7 @@

#include "internal.h"

+#include "glibcompat.h"

#include "notify.h"

#include "request.h"

#include "debug.h"

~~--- a/libpurple/util.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/libpurple/util.c Tue Jan 28 07:37:19 2014 -0800

@@ -27,6 +27,7 @@

#include "conversation.h"

#include "core.h"

#include "debug.h"

+#include "glibcompat.h"

#include "notify.h"

#include "prpl.h"

#include "prefs.h"

~~--- a/pidgin/gtkconv.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/pidgin/gtkconv.c Tue Jan 28 07:37:19 2014 -0800

@@ -39,6 +39,7 @@

#include "cmds.h"

#include "core.h"

#include "debug.h"

+#include "glibcompat.h"

#include "idle.h"

#include "imgstore.h"

#include "log.h"

~~--- a/pidgin/gtkmain.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/pidgin/gtkmain.c Tue Jan 28 07:37:19 2014 -0800

@@ -30,7 +30,7 @@

#include "dbus-maybe.h"

#include "debug.h"

#include "eventloop.h"

~~-#include "xfer.h"~~

+#include "glibcompat.h"

#include "log.h"

#include "network.h"

#include "notify.h"

@@ -41,6 +41,7 @@

#include "status.h"

#include "util.h"

#include "whiteboard.h"

+#include "xfer.h"

#include "gtkaccount.h"

#include "gtkblist.h"

~~--- a/pidgin/gtkutils.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/pidgin/gtkutils.c Tue Jan 28 07:37:19 2014 -0800

@@ -26,6 +26,7 @@

#define _PIDGIN_GTKUTILS_C_

#include "internal.h"

+#include "glibcompat.h"

#include "pidgin.h"

#ifdef _WIN32

~~--- a/pidgin/gtkwebview.c Thu Jan 23 23:38:47 2014 -0800~~

+++ b/pidgin/gtkwebview.c Tue Jan 28 07:37:19 2014 -0800

@@ -27,9 +27,11 @@

#include "internal.h"

#include "debug.h"

+#include "glibcompat.h"

#include "pidgin.h"

#include <gdk/gdkkeysyms.h>

#include "gtkutils.h"

#include "gtkwebview.h"

#include "gtkwebviewtoolbar.h"

@@ -1342,7 +1344,7 @@

}

priv->edit.block_changed = TRUE;

~~- webkit_dom_document_exec_command(dom, name, FALSE, value);~~

+ webkit_dom_document_exec_command(dom, (gchar *)name, FALSE, (gchar *)value);

priv->edit.block_changed = FALSE;

if (priv->edit.wbfo) {