/soc/2013/bhaskar/plugins-window: c601c4eea876: Merged changes f...
Bhaskar Kandiyal
bkandiyal at gmail.com
Thu Aug 22 15:40:46 EDT 2013
Changeset: c601c4eea876f2139ee24343bf37499ced22b6e9
Author: Bhaskar Kandiyal <bkandiyal at gmail.com>
Date: 2013-08-20 22:52 +0530
Branch: default
URL: https://hg.pidgin.im/soc/2013/bhaskar/plugins-window/rev/c601c4eea876
Description:
Merged changes from main
diffstat:
configure.ac | 88 +-
finch/libgnt/Makefile.am | 8 +-
finch/plugins/gnttinyurl.c | 4 +-
libpurple/ciphers/Makefile.am | 3 +-
libpurple/ciphers/aes.c | 2 +-
libpurple/core.c | 25 +
libpurple/dbus-server.c | 5 +-
libpurple/debug.c | 32 +-
libpurple/debug.h | 7 +
libpurple/ft.c | 156 +-
libpurple/ft.h | 25 +
libpurple/http.c | 735 +++++++++--
libpurple/http.h | 61 +-
libpurple/keyring.c | 5 +-
libpurple/plugins/Makefile.am | 6 +-
libpurple/plugins/ciphertest.c | 2 +-
libpurple/plugins/keyrings/gnomekeyring.c | 15 +-
libpurple/plugins/keyrings/internalkeyring.c | 2 +-
libpurple/plugins/keyrings/kwallet.cpp | 2 +-
libpurple/plugins/keyrings/secretservice.c | 2 +-
libpurple/plugins/keyrings/wincred.c | 2 +-
libpurple/plugins/perl/Makefile.am | 7 +-
libpurple/plugins/ssl/ssl-gnutls.c | 10 +-
libpurple/prefs.c | 5 +-
libpurple/protocols/gg/avatar.c | 4 +-
libpurple/protocols/gg/oauth/oauth-purple.c | 2 +-
libpurple/protocols/gg/pubdir-prpl.c | 2 +-
libpurple/protocols/jabber/bosh.c | 1322 ++++++---------------
libpurple/protocols/jabber/bosh.h | 35 +-
libpurple/protocols/jabber/data.c | 6 +-
libpurple/protocols/jabber/google/relay.c | 2 +-
libpurple/protocols/jabber/jabber.c | 34 +-
libpurple/protocols/jabber/jabber.h | 10 +-
libpurple/protocols/jabber/oob.c | 216 +--
libpurple/protocols/jabber/useravatar.c | 8 +-
libpurple/protocols/msn/contact.c | 38 +-
libpurple/protocols/msn/httpconn.c | 8 +-
libpurple/protocols/msn/msn.c | 24 +-
libpurple/protocols/msn/nexus.c | 22 +-
libpurple/protocols/msn/oim.c | 17 +-
libpurple/protocols/msn/session.c | 15 +-
libpurple/protocols/msn/session.h | 8 +-
libpurple/protocols/msn/slp.c | 10 +-
libpurple/protocols/msn/soap.c | 822 +++----------
libpurple/protocols/msn/soap.h | 37 +-
libpurple/protocols/mxit/Makefile.mingw | 1 -
libpurple/protocols/mxit/formcmds.c | 2 +-
libpurple/protocols/mxit/login.c | 26 +-
libpurple/protocols/mxit/markup.c | 14 +-
libpurple/protocols/mxit/mxit.c | 4 -
libpurple/protocols/mxit/mxit.h | 3 +-
libpurple/protocols/mxit/protocol.c | 25 +-
libpurple/protocols/myspace/myspace.c | 2 -
libpurple/protocols/myspace/user.c | 2 +-
libpurple/protocols/oscar/clientlogin.c | 4 +-
libpurple/protocols/oscar/oscar.c | 2 +-
libpurple/protocols/sametime/sametime.c | 17 +-
libpurple/protocols/yahoo/libyahoo.c | 3 -
libpurple/protocols/yahoo/libyahoojp.c | 3 -
libpurple/protocols/yahoo/libymsg.c | 341 ++---
libpurple/protocols/yahoo/libymsg.h | 14 +-
libpurple/protocols/yahoo/yahoo_aliases.c | 29 +-
libpurple/protocols/yahoo/yahoo_filexfer.c | 1449 ++++-------------------
libpurple/protocols/yahoo/yahoo_filexfer.h | 5 -
libpurple/protocols/yahoo/yahoo_picture.c | 209 +--
libpurple/protocols/yahoo/yahoo_profile.c | 21 +-
libpurple/protocols/yahoo/yahoochat.c | 198 +--
libpurple/tag.sh | 29 +-
libpurple/upnp.c | 6 +-
libpurple/util.c | 4 +-
libpurple/xmlnode.c | 2 +-
pidgin/gtkblist.c | 7 +-
pidgin/gtkconv.c | 42 +-
pidgin/gtkconv.h | 2 -
pidgin/gtkdebug.c | 2 +-
pidgin/gtkdialogs.c | 4 +-
pidgin/gtklog.c | 2 +-
pidgin/gtkmain.c | 22 +-
pidgin/gtknotify.c | 2 +-
pidgin/gtkpluginpref.c | 8 +-
pidgin/gtkpounce.c | 2 +-
pidgin/gtkprefs.c | 36 +-
pidgin/gtkrequest.c | 3 +-
pidgin/gtksavedstatuses.c | 11 +-
pidgin/gtksession.c | 24 +-
pidgin/gtksmiley.c | 2 +-
pidgin/gtksound.c | 1 +
pidgin/gtkstatusbox.c | 4 +-
pidgin/gtkutils.c | 9 +-
pidgin/gtkutils.h | 5 +-
pidgin/gtkwebview.c | 172 ++-
pidgin/gtkwebview.h | 68 +-
pidgin/gtkwebviewtoolbar.c | 71 +-
pidgin/gtkwebviewtoolbar.h | 25 +-
pidgin/plugins/musicmessaging/Makefile.am | 6 +-
pidgin/plugins/musicmessaging/musicmessaging.c | 4 +
pidgin/plugins/perl/Makefile.am | 7 +-
pidgin/plugins/relnot.c | 2 +-
pidgin/plugins/webkit.c | 126 +-
pidgin/plugins/xmppconsole.c | 6 +-
pidgin/themes/Contents/Resources/main.css | 6 +
pidgin/win32/nsis/generate_gtk_zip.sh | 2 +
pidgin/win32/nsis/pidgin-installer.nsi | 7 +
pidgin/win32/prepare-workspace.sh | 4 +
104 files changed, 2724 insertions(+), 4236 deletions(-)
diffs (truncated from 10913 to 300 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1565,7 +1565,7 @@ dnl ####################################
dnl # Check for GNOME Keyring headers
dnl #######################################################################
-AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--disable-gnome-keyring], [enable GNOME Keyring support])], enable_gnome_keyring="$enableval", enable_gnome_keyring=yes)
+AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--disable-gnome-keyring], [disable GNOME Keyring support])], enable_gnome_keyring="$enableval", enable_gnome_keyring=yes)
if test "x$enable_gnome_keyring" = "xyes" ; then
PKG_CHECK_MODULES(GNOMEKEYRING, [gnome-keyring-1], [
@@ -1590,54 +1590,20 @@ dnl ####################################
dnl # Check for KWallet headers
dnl #######################################################################
-AC_ARG_ENABLE(kwallet, [AC_HELP_STRING([--disable-kwallet], [enable KWallet support])], enable_kwallet="$enableval", enable_kwallet=yes)
+AC_ARG_ENABLE(kwallet, [AC_HELP_STRING([--disable-kwallet], [disable KWallet support])], enable_kwallet="$enableval", enable_kwallet=yes)
AC_ARG_WITH(kwallet-includes, [AC_HELP_STRING([--with-kwallet-includes=DIR], [compile the KWallet plugin against includes in DIR])], [ac_kwallet_includes="$withval"], [ac_kwallet_includes="no"])
AC_ARG_WITH(kwallet-libs, [AC_HELP_STRING([--with-kwallet-libs=DIR], [compile the KWallet plugin against the KWallet libs in DIR])], [ac_kwallet_libs="$withval"], [ac_kwallet_libs="no"])
if test "x$enable_kwallet" = "xyes"; then
- KWALLET_CXXFLAGS=""
- KWALLET_LIBS=""
- if test -z "$with_kwallet_includes" || test -z "$with_kwallet_libs"; then
- AC_CHECK_PROG(KDE4_CONFIG, kde4-config, kde4-config, no)
- if test "x$KDE4_CONFIG" = "xno"; then
- if test "x$force_deps" = "xyes"; then
- AC_MSG_ERROR([
-kde4-config not found. $KDE4_CONFIG
-Use --disable-kwallet if you do not need KWallet support.
-Use --with-kwallet-includes and --with-kwallet-libs to set up includes manually.
-])
- enable_kwallet=no
- fi
- fi
- fi
-fi
-
-if test "x$enable_kwallet" = "xyes"; then
- AC_LANG_PUSH([C++])
- CPPFLAGS_save="$CPPFLAGS"
-
- if test "$ac_kwallet_includes" != "no"; then
- KWALLET_CXXFLAGS="-I$ac_kwallet_includes"
- elif test "x$KDE4_CONFIG" != "xno"; then
- KWALLET_CXXFLAGS="-I`$KDE4_CONFIG --path include`"
- fi
- CPPFLAGS="$CPPFLAGS $KWALLET_CXXFLAGS"
- AC_CHECK_HEADER([kwallet.h], , [enable_kwallet=no])
-
- CPPFLAGS="$CPPFLAGS_save"
- AC_LANG_POP
-fi
-
-if test "x$enable_kwallet" = "xyes"; then
dnl Ensure C++ compiler works
AC_CHECK_PROG(CXXTEST, [$CXX], [$CXX])
if test "x$CXXTEST" = "x"; then
+ enable_kwallet=no
if test "x$force_deps" = "xyes"; then
AC_MSG_ERROR([
A C++ compiler was not found.
Use --disable-kwallet if you do not need KWallet support.
])
- enable_kwallet=no
fi
fi
fi
@@ -1645,6 +1611,7 @@ fi
AC_LANG_PUSH([C++])
CPPFLAGS_save="$CPPFLAGS"
LDFLAGS_save="$LDFLAGS"
+
if test "x$enable_kwallet" = "xyes"; then
PKG_CHECK_MODULES(QT4, [QtCore], [
AC_SUBST(QT4_CFLAGS)
@@ -1667,7 +1634,42 @@ if test "x$enable_kwallet" = "xyes"; the
AC_SUBST(MOC)
AC_MSG_RESULT([$MOC])
+ KWALLET_CXXFLAGS=""
+ KWALLET_LIBS=""
+ if test -z "$with_kwallet_includes" || test -z "$with_kwallet_libs"; then
+ AC_CHECK_PROG(KDE4_CONFIG, kde4-config, kde4-config, no)
+ if test "x$KDE4_CONFIG" = "xno"; then
+ enable_kwallet=no
+ if test "x$force_deps" = "xyes"; then
+ AC_MSG_ERROR([
+kde4-config not found. $KDE4_CONFIG
+Use --disable-kwallet if you do not need KWallet support.
+Use --with-kwallet-includes and --with-kwallet-libs to set up includes manually.
+])
+ fi
+ fi
+ fi
+fi
+if test "x$enable_kwallet" = "xyes"; then
+ if test "$ac_kwallet_includes" != "no"; then
+ KWALLET_CXXFLAGS="-I$ac_kwallet_includes"
+ elif test "x$KDE4_CONFIG" != "xno"; then
+ KWALLET_CXXFLAGS="-I`$KDE4_CONFIG --path include`"
+ fi
+ CPPFLAGS="$CPPFLAGS $KWALLET_CXXFLAGS"
+ AC_CHECK_HEADER([kwallet.h], , [
+ enable_kwallet=no
+ if test "x$force_deps" = "xyes"; then
+ AC_MSG_ERROR([
+KWallet development headers not found.
+Use --disable-kwallet if you do not need KWallet support.
+])
+ fi
+])
+fi
+
+if test "x$enable_kwallet" = "xyes"; then
AC_MSG_CHECKING([for KWallet libraries])
if test "$ac_kwallet_libs" != "no"; then
KWALLET_LIBS="-L$ac_kwallet_libs -lkdeui"
@@ -1677,19 +1679,21 @@ if test "x$enable_kwallet" = "xyes"; the
KWALLET_LIBS="-lkdeui"
fi
KWALLET_LIBS="$KWALLET_LIBS"
- CPPFLAGS="$CPPFLAGS $KWALLET_CXXFLAGS"
LDFLAGS="$LDFLAGS $KWALLET_LIBS $QT4_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <kwallet.h>],
[KWallet::Wallet::LocalWallet();])], [AC_MSG_RESULT([yes])],
- [if test "x$force_deps" = "xyes"; then
-AC_MSG_ERROR([
+ [
+ AC_MSG_RESULT(no)
+ enable_kwallet=no
+ if test "x$force_deps" = "xyes"; then
+ AC_MSG_ERROR([
KWallet development libraries not found.
Use --disable-kwallet if you do not need KWallet support.
])
+ fi
+ ])
fi
-])
-fi
CPPFLAGS="$CPPFLAGS_save"
LDFLAGS="$LDFLAGS_save"
AC_LANG_POP
diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -73,11 +73,13 @@ CLEANFILES = \
gntmarshal.c
gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
- echo "#include \"gntmarshal.h\"" > $@
- glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
+ @echo -e " GEN\t$@"
+ @echo "#include \"gntmarshal.h\"" > $@
+ @glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
gntmarshal.h: $(srcdir)/genmarshal
- glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
+ @echo -e " GEN\t$@"
+ @glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
libgnt_laincludedir=$(includedir)/gnt
libgnt_lainclude_HEADERS = \
diff --git a/finch/plugins/gnttinyurl.c b/finch/plugins/gnttinyurl.c
--- a/finch/plugins/gnttinyurl.c
+++ b/finch/plugins/gnttinyurl.c
@@ -213,7 +213,7 @@ static void url_fetched(PurpleHttpConnec
GList *convs = purple_get_conversations();
const gchar *url;
- if (purple_http_response_is_successfull(response))
+ if (purple_http_response_is_successful(response))
url = purple_http_response_get_data(response, NULL);
else
url = _("Error while querying TinyURL");
@@ -360,7 +360,7 @@ tinyurl_notify_fetch_cb(PurpleHttpConnec
char *message;
const gchar *url;
- if (!purple_http_response_is_successfull(response))
+ if (!purple_http_response_is_successful(response))
return;
url = purple_http_response_get_data(response, NULL);
diff --git a/libpurple/ciphers/Makefile.am b/libpurple/ciphers/Makefile.am
--- a/libpurple/ciphers/Makefile.am
+++ b/libpurple/ciphers/Makefile.am
@@ -20,9 +20,8 @@ libpurple_ciphers_la_SOURCES=\
noinst_HEADERS =\
ciphers.h
-INCLUDES = -I$(top_srcdir)/libpurple
-
AM_CPPFLAGS = \
+ -I$(top_srcdir)/libpurple \
$(INTGG_CFLAGS) \
$(AM_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/libpurple/ciphers/aes.c b/libpurple/ciphers/aes.c
--- a/libpurple/ciphers/aes.c
+++ b/libpurple/ciphers/aes.c
@@ -172,7 +172,7 @@ purple_aes_unpad_pkcs7(guchar input[], s
if (padding_len <= 0 || padding_len > PURPLE_AES_BLOCK_SIZE ||
padding_len > in_len) {
purple_debug_warning("cipher-aes",
- "Invalid padding length: %d (total %d) - "
+ "Invalid padding length: %d (total %" G_GSIZE_FORMAT ") - "
"most probably, the key was invalid\n",
padding_len, in_len);
return -1;
diff --git a/libpurple/core.c b/libpurple/core.c
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -78,6 +78,29 @@ static PurpleCore *_core = NULL;
STATIC_PROTO_INIT
+static void
+purple_core_print_version(void)
+{
+ GHashTable *ui_info = purple_core_get_ui_info();
+ const gchar *ui_name;
+ const gchar *ui_version;
+ gchar *ui_full_name = NULL;
+
+ ui_name = ui_info ? g_hash_table_lookup(ui_info, "name") : NULL;
+ ui_version = ui_info ? g_hash_table_lookup(ui_info, "version") : NULL;
+
+ if (ui_name) {
+ ui_full_name = g_strdup_printf("%s%s%s", ui_name,
+ ui_version ? " " : "", ui_version);
+ }
+
+ purple_debug_info("main", "Launching %s%slibpurple %s",
+ ui_full_name ? ui_full_name : "",
+ ui_full_name ? " with " : "",
+ purple_core_get_version());
+
+}
+
gboolean
purple_core_init(const char *ui)
{
@@ -120,6 +143,8 @@ purple_core_init(const char *ui)
purple_signal_register(core, "quitting", purple_marshal_VOID, NULL, 0);
purple_signal_register(core, "core-initialized", purple_marshal_VOID, NULL, 0);
+ purple_core_print_version();
+
/* The prefs subsystem needs to be initialized before static protocols
* for protocol prefs to work. */
purple_prefs_init();
diff --git a/libpurple/dbus-server.c b/libpurple/dbus-server.c
--- a/libpurple/dbus-server.c
+++ b/libpurple/dbus-server.c
@@ -626,8 +626,6 @@ purple_dbus_dispatch_init(void)
dbus_connection_setup_with_g_main(purple_dbus_connection, NULL);
- purple_debug_misc("dbus", "okkk\n");
-
purple_signal_register(purple_dbus_get_handle(), "dbus-method-called",
purple_marshal_BOOLEAN__POINTER_POINTER,
purple_value_new(PURPLE_TYPE_BOOLEAN), 2,
@@ -639,6 +637,9 @@ purple_dbus_dispatch_init(void)
purple_value_new_outgoing(PURPLE_TYPE_POINTER));
PURPLE_DBUS_REGISTER_BINDINGS(purple_dbus_get_handle());
+
+ if (purple_debug_is_verbose())
+ purple_debug_misc("dbus", "initialized");
}
diff --git a/libpurple/debug.c b/libpurple/debug.c
--- a/libpurple/debug.c
+++ b/libpurple/debug.c
@@ -50,6 +50,8 @@ static gboolean debug_enabled = FALSE;
static gboolean debug_verbose = FALSE;
static gboolean debug_unsafe = FALSE;
+static gboolean debug_colored = FALSE;
+
static void
purple_debug_vargs(PurpleDebugLevel level, const char *category,
const char *format, va_list args)
@@ -67,20 +69,40 @@ purple_debug_vargs(PurpleDebugLevel leve
return;
arg_s = g_strdup_vprintf(format, args);
+ g_strchomp(arg_s); /* strip trailing linefeeds */
if (debug_enabled) {
gchar *ts_s;
const char *mdate;
time_t mtime = time(NULL);
More information about the Commits
mailing list