/soc/2013/bhaskar/plugins-window: d450c097ed97: Merged with default
Bhaskar Kandiyal
bkandiyal at gmail.com
Tue Sep 17 17:09:16 EDT 2013
Changeset: d450c097ed976e28c5aaace77c600a3d62c6b78f
Author: Bhaskar Kandiyal <bkandiyal at gmail.com>
Date: 2013-09-18 02:37 +0530
Branch: soc.2013.plugins_window
URL: https://hg.pidgin.im/soc/2013/bhaskar/plugins-window/rev/d450c097ed97
Description:
Merged with default
diffstat:
.hgignore | 4 +
ChangeLog.API | 4 +
Makefile.am | 6 +-
autogen.sh | 4 +-
configure.ac | 135 +-
finch/gntaccount.c | 25 +-
finch/gntblist.c | 36 +-
finch/gntcertmgr.c | 10 +-
finch/gntconn.c | 3 +-
finch/gntdebug.c | 1 +
finch/gntplugin.c | 5 +-
finch/gntpounce.c | 3 +-
finch/gntprefs.c | 5 +-
finch/gntrequest.c | 60 +-
finch/gntstatus.c | 3 +-
finch/libgnt/Makefile.am | 6 +-
finch/libgnt/gntcolors.c | 2 +-
finch/libgnt/gntentry.c | 11 +-
finch/libgnt/gntentry.h | 2 +-
finch/libgnt/gntmenu.c | 9 +-
finch/libgnt/gntmenu.h | 2 +-
finch/libgnt/gntstyle.c | 2 +-
finch/libgnt/gnttextview.c | 2 +-
finch/libgnt/gntwm.c | 3 +-
finch/plugins/gnthistory.c | 2 +-
finch/plugins/gnttinyurl.c | 51 +-
libpurple/Makefile.am | 4 +-
libpurple/Makefile.mingw | 3 +-
libpurple/account.c | 35 +-
libpurple/account.h | 2 +-
libpurple/certificate.c | 53 +-
libpurple/certificate.h | 4 +-
libpurple/cipher.c | 7 +-
libpurple/ciphers/Makefile.am | 3 +-
libpurple/ciphers/aes.c | 12 +-
libpurple/ciphers/des.c | 70 +-
libpurple/ciphers/gchecksum.c | 5 +-
libpurple/ciphers/hmac.c | 2 +-
libpurple/ciphers/pbkdf2.c | 2 +-
libpurple/circbuffer.c | 10 +-
libpurple/conversation.c | 31 +-
libpurple/conversation.h | 12 +
libpurple/core.c | 25 +
libpurple/dbus-server.c | 5 +-
libpurple/debug.c | 32 +-
libpurple/debug.h | 7 +
libpurple/dnsquery.c | 6 +-
libpurple/dnssrv.c | 2 +-
libpurple/ft.c | 199 ++-
libpurple/ft.h | 25 +
libpurple/gconf/Makefile.am | 5 +-
libpurple/http.c | 1285 +++++++++++++++++---
libpurple/http.h | 287 ++++-
libpurple/keyring.c | 5 +-
libpurple/media/backend-fs2.c | 3 +-
libpurple/obsolete.c | 776 -------------
libpurple/obsolete.h | 110 -
libpurple/plugins/Makefile.am | 4 +-
libpurple/plugins/autoaccept.c | 12 +-
libpurple/plugins/buddynote.c | 3 +-
libpurple/plugins/ciphertest.c | 2 +-
libpurple/plugins/idle.c | 9 +-
libpurple/plugins/joinpart.c | 2 +-
libpurple/plugins/keyrings/gnomekeyring.c | 15 +-
libpurple/plugins/keyrings/internalkeyring.c | 11 +-
libpurple/plugins/keyrings/kwallet.cpp | 2 +-
libpurple/plugins/keyrings/secretservice.c | 2 +-
libpurple/plugins/keyrings/wincred.c | 2 +-
libpurple/plugins/offlinemsg.c | 3 +-
libpurple/plugins/perl/Makefile.am | 11 +-
libpurple/plugins/perl/common/Certificate.xs | 2 +-
libpurple/plugins/perl/common/Makefile.PL.in | 2 +-
libpurple/plugins/perl/common/Request.xs | 45 +-
libpurple/plugins/perl/common/Util.xs | 31 -
libpurple/plugins/perl/common/typemap | 1 +
libpurple/plugins/perl/perl-handlers.h | 4 +-
libpurple/plugins/signals-test.c | 2 +-
libpurple/plugins/ssl/ssl-gnutls.c | 32 +-
libpurple/plugins/ssl/ssl-nss.c | 32 +-
libpurple/plugins/tcl/tcl_purple.h | 2 +-
libpurple/plugins/tcl/tcl_ref.c | 4 +-
libpurple/prefs.c | 5 +-
libpurple/protocols/bonjour/bonjour.c | 9 +-
libpurple/protocols/gg/Makefile.am | 77 +-
libpurple/protocols/gg/Makefile.mingw | 12 +-
libpurple/protocols/gg/account.c | 4 +-
libpurple/protocols/gg/account.h | 2 +-
libpurple/protocols/gg/avatar.c | 144 +-
libpurple/protocols/gg/chat.c | 619 ++++++++++
libpurple/protocols/gg/chat.h | 34 +
libpurple/protocols/gg/confer.c | 170 --
libpurple/protocols/gg/confer.h | 93 -
libpurple/protocols/gg/edisc.c | 1180 +++++++++++++++++++
libpurple/protocols/gg/edisc.h | 22 +
libpurple/protocols/gg/gg.c | 809 +++----------
libpurple/protocols/gg/gg.h | 38 +-
libpurple/protocols/gg/html.c | 158 ++
libpurple/protocols/gg/html.h | 32 +
libpurple/protocols/gg/image.c | 327 +++--
libpurple/protocols/gg/image.h | 21 +-
libpurple/protocols/gg/libgadu-events.c | 49 +-
libpurple/protocols/gg/libgadu-events.h | 6 +
libpurple/protocols/gg/libgaduw.c | 69 +
libpurple/protocols/gg/libgaduw.h | 6 +-
libpurple/protocols/gg/message-prpl.c | 806 +++++++++++++
libpurple/protocols/gg/message-prpl.h | 22 +
libpurple/protocols/gg/multilogon.c | 12 +-
libpurple/protocols/gg/multilogon.h | 1 -
libpurple/protocols/gg/oauth/oauth-parameter.c | 4 +-
libpurple/protocols/gg/oauth/oauth-purple.c | 129 +-
libpurple/protocols/gg/pubdir-prpl.c | 207 +-
libpurple/protocols/gg/purplew.c | 18 +-
libpurple/protocols/gg/roster.c | 2 +-
libpurple/protocols/gg/servconn.c | 6 +-
libpurple/protocols/gg/status.c | 24 +-
libpurple/protocols/gg/tcpsocket.c | 115 +
libpurple/protocols/gg/tcpsocket.h | 13 +
libpurple/protocols/gg/utils.c | 68 +-
libpurple/protocols/gg/utils.h | 21 +-
libpurple/protocols/irc/irc.c | 11 +-
libpurple/protocols/irc/parse.c | 2 +-
libpurple/protocols/jabber/Makefile.am | 4 +-
libpurple/protocols/jabber/auth.c | 2 +-
libpurple/protocols/jabber/auth_cyrus.c | 2 +-
libpurple/protocols/jabber/auth_plain.c | 2 +-
libpurple/protocols/jabber/auth_scram.c | 2 +-
libpurple/protocols/jabber/bosh.c | 1323 ++++++----------------
libpurple/protocols/jabber/bosh.h | 35 +-
libpurple/protocols/jabber/buddy.c | 9 +-
libpurple/protocols/jabber/chat.c | 2 +-
libpurple/protocols/jabber/data.c | 6 +-
libpurple/protocols/jabber/google/relay.c | 73 +-
libpurple/protocols/jabber/jabber.c | 93 +-
libpurple/protocols/jabber/jabber.h | 12 +-
libpurple/protocols/jabber/jingle/jingle.c | 1 +
libpurple/protocols/jabber/jutil.c | 10 +-
libpurple/protocols/jabber/libfacebook.c | 3 +-
libpurple/protocols/jabber/libgtalk.c | 3 +-
libpurple/protocols/jabber/libxmpp.c | 3 +-
libpurple/protocols/jabber/oob.c | 211 +--
libpurple/protocols/jabber/presence.c | 4 +-
libpurple/protocols/jabber/si.c | 19 +-
libpurple/protocols/jabber/useravatar.c | 43 +-
libpurple/protocols/jabber/usernick.c | 2 +-
libpurple/protocols/jabber/xdata.c | 13 +-
libpurple/protocols/msn/command.c | 2 +-
libpurple/protocols/msn/command.h | 2 +-
libpurple/protocols/msn/contact.c | 38 +-
libpurple/protocols/msn/directconn.c | 6 +-
libpurple/protocols/msn/error.c | 2 +-
libpurple/protocols/msn/history.c | 2 +-
libpurple/protocols/msn/httpconn.c | 945 +++++----------
libpurple/protocols/msn/httpconn.h | 87 +-
libpurple/protocols/msn/msn.c | 142 +-
libpurple/protocols/msn/nexus.c | 30 +-
libpurple/protocols/msn/nexus.h | 2 +-
libpurple/protocols/msn/notification.c | 4 +-
libpurple/protocols/msn/oim.c | 17 +-
libpurple/protocols/msn/p2p.c | 4 +-
libpurple/protocols/msn/servconn.c | 12 +-
libpurple/protocols/msn/servconn.h | 2 +
libpurple/protocols/msn/session.c | 17 +-
libpurple/protocols/msn/session.h | 8 +-
libpurple/protocols/msn/slp.c | 34 +-
libpurple/protocols/msn/slplink.c | 4 +-
libpurple/protocols/msn/slpmsg.h | 2 +-
libpurple/protocols/msn/slpmsg_part.c | 2 +-
libpurple/protocols/msn/soap.c | 822 +++----------
libpurple/protocols/msn/soap.h | 37 +-
libpurple/protocols/msn/tlv.c | 2 +-
libpurple/protocols/msn/transaction.c | 2 +-
libpurple/protocols/msn/transaction.h | 2 +-
libpurple/protocols/msn/userlist.c | 3 +-
libpurple/protocols/mxit/Makefile.am | 2 -
libpurple/protocols/mxit/Makefile.mingw | 1 -
libpurple/protocols/mxit/actions.c | 12 +-
libpurple/protocols/mxit/formcmds.c | 24 +-
libpurple/protocols/mxit/http.c | 340 -----
libpurple/protocols/mxit/http.h | 47 -
libpurple/protocols/mxit/login.c | 177 +-
libpurple/protocols/mxit/markup.c | 79 +-
libpurple/protocols/mxit/mxit.c | 7 +-
libpurple/protocols/mxit/mxit.h | 3 +-
libpurple/protocols/mxit/protocol.c | 160 +-
libpurple/protocols/mxit/splashscreen.c | 4 +-
libpurple/protocols/myspace/myspace.c | 115 +-
libpurple/protocols/myspace/myspace.h | 4 -
libpurple/protocols/myspace/persist.h | 4 +-
libpurple/protocols/myspace/user.c | 53 +-
libpurple/protocols/myspace/user.h | 4 +-
libpurple/protocols/novell/nmrtf.c | 2 +-
libpurple/protocols/novell/novell.c | 12 +-
libpurple/protocols/null/nullprpl.c | 3 +-
libpurple/protocols/oscar/bstream.c | 7 +-
libpurple/protocols/oscar/clientlogin.c | 83 +-
libpurple/protocols/oscar/family_feedbag.c | 2 +-
libpurple/protocols/oscar/family_oservice.c | 147 --
libpurple/protocols/oscar/libaim.c | 3 +-
libpurple/protocols/oscar/libicq.c | 10 +-
libpurple/protocols/oscar/oscar.c | 187 +--
libpurple/protocols/oscar/oscar.h | 17 +-
libpurple/protocols/oscar/oscar_data.c | 3 +-
libpurple/protocols/oscar/oscarcommon.h | 1 +
libpurple/protocols/oscar/peer.c | 2 +-
libpurple/protocols/oscar/tlv.c | 6 +-
libpurple/protocols/oscar/util.c | 2 +-
libpurple/protocols/sametime/sametime.c | 32 +-
libpurple/protocols/silc/buddy.c | 14 +-
libpurple/protocols/silc/chat.c | 32 +-
libpurple/protocols/silc/ops.c | 4 +-
libpurple/protocols/silc/pk.c | 4 +-
libpurple/protocols/silc/silc.c | 7 +-
libpurple/protocols/silc/util.c | 4 +-
libpurple/protocols/silc/wb.c | 2 +-
libpurple/protocols/simple/simple.c | 3 +-
libpurple/protocols/yahoo/libyahoo.c | 8 +-
libpurple/protocols/yahoo/libyahoojp.c | 8 +-
libpurple/protocols/yahoo/libymsg.c | 803 +++++-------
libpurple/protocols/yahoo/libymsg.h | 18 +-
libpurple/protocols/yahoo/util.c | 6 +-
libpurple/protocols/yahoo/yahoo_aliases.c | 194 +-
libpurple/protocols/yahoo/yahoo_filexfer.c | 1422 ++++-------------------
libpurple/protocols/yahoo/yahoo_filexfer.h | 5 -
libpurple/protocols/yahoo/yahoo_packet.c | 4 +-
libpurple/protocols/yahoo/yahoo_packet.h | 2 +-
libpurple/protocols/yahoo/yahoo_picture.c | 241 +--
libpurple/protocols/yahoo/yahoo_profile.c | 84 +-
libpurple/protocols/yahoo/yahoochat.c | 183 +--
libpurple/protocols/yahoo/ycht.c | 2 +-
libpurple/protocols/zephyr/ZReadAscii.c | 2 +-
libpurple/protocols/zephyr/ZVariables.c | 2 +-
libpurple/protocols/zephyr/Zinternal.c | 4 +-
libpurple/protocols/zephyr/internal.h | 2 +-
libpurple/protocols/zephyr/zephyr.c | 9 +-
libpurple/proxy.c | 71 +-
libpurple/prpl.c | 17 +
libpurple/prpl.h | 31 +
libpurple/purple-client.c | 4 +-
libpurple/purple-socket.c | 354 +++++
libpurple/purple-socket.h | 200 +++
libpurple/request.c | 671 ++++++++--
libpurple/request.h | 544 ++++++--
libpurple/server.c | 10 +-
libpurple/sslconn.c | 11 +
libpurple/sslconn.h | 10 +
libpurple/stun.c | 10 +-
libpurple/tag.sh | 35 +-
libpurple/tests/test_cipher.c | 44 +-
libpurple/upnp.c | 216 +--
libpurple/util.c | 169 +--
libpurple/util.h | 15 -
libpurple/xmlnode.c | 6 +-
pidgin/gtkaccount.c | 15 +-
pidgin/gtkblist.c | 18 +-
pidgin/gtkcertmgr.c | 8 +-
pidgin/gtkconv.c | 57 +-
pidgin/gtkconv.h | 2 -
pidgin/gtkdebug.c | 8 +-
pidgin/gtkdialogs.c | 38 +-
pidgin/gtkft.c | 4 +-
pidgin/gtkimhtml.c | 2 +-
pidgin/gtkimhtmltoolbar.c | 2 +-
pidgin/gtklog.c | 4 +-
pidgin/gtkmain.c | 24 +-
pidgin/gtkmedia.c | 9 +-
pidgin/gtknotify.c | 2 +-
pidgin/gtkplugin.c | 11 +-
pidgin/gtkpluginpref.c | 8 +-
pidgin/gtkpounce.c | 13 +-
pidgin/gtkprefs.c | 98 +-
pidgin/gtkprivacy.c | 41 +-
pidgin/gtkrequest.c | 533 ++++++--
pidgin/gtksavedstatuses.c | 13 +-
pidgin/gtksession.c | 24 +-
pidgin/gtksmiley.c | 56 +-
pidgin/gtksound.c | 1 +
pidgin/gtkstatusbox.c | 63 +-
pidgin/gtkthemes.c | 2 +-
pidgin/gtkutils.c | 46 +-
pidgin/gtkutils.h | 5 +-
pidgin/gtkwebview.c | 176 ++-
pidgin/gtkwebview.h | 68 +-
pidgin/gtkwebviewtoolbar.c | 87 +-
pidgin/gtkwebviewtoolbar.h | 25 +-
pidgin/pidginstock.c | 8 +-
pidgin/pidginstock.h | 1 +
pidgin/pixmaps/emotes/default/24/Makefile.am | 2 +-
pidgin/pixmaps/emotes/none/Makefile.am | 2 +-
pidgin/pixmaps/emotes/small/16/Makefile.am | 2 +-
pidgin/plugins/disco/gtkdisco.c | 2 +-
pidgin/plugins/musicmessaging/Makefile.am | 4 +-
pidgin/plugins/musicmessaging/musicmessaging.c | 4 +
pidgin/plugins/perl/Makefile.am | 8 +-
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/pidginrc.c | 10 +-
pidgin/plugins/relnot.c | 4 +-
pidgin/plugins/spellchk.c | 11 +-
pidgin/plugins/webkit.c | 126 +--
pidgin/plugins/xmppconsole.c | 6 +-
pidgin/themes/Contents/Resources/main.css | 13 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 2 +
pidgin/win32/nsis/pidgin-installer.nsi | 7 +
pidgin/win32/prepare-workspace.sh | 13 +-
pidgin/win32/winpidgin.c | 24 +-
po/POTFILES.in | 20 +-
po/de.po | 6 +-
valgrind-suppressions | 69 +
307 files changed, 11446 insertions(+), 10519 deletions(-)
diffs (truncated from 33936 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,6 @@
+syntax: glob
+.*.swp
+
syntax: regexp
(.*/)?TAGS$
(.*/)?\.svn
@@ -71,6 +74,7 @@ libpurple/purple-client-example
libpurple/purple.h$
libpurple/tests/check_libpurple
libpurple/tests/libpurple..
+^libpurple/tests/test-suite\.log$
libpurple/version.h$
libpurple/win32/libpurplerc.rc$
libtool
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -132,6 +132,10 @@ version 3.0.0 (??/??/????):
* PurpleXfer.bytes_remaining is now a goffset
* PurpleXfer.bytes_sent is now a goffset
* PurpleXfer.size is now a goffset
+ * PurpleCertificateScheme.get_times now uses gint64 instead of
+ time_t to represent times
+ * purple_certificate_get_times now uses gint64 instead of
+ time_t to represent times
Removed:
* _GntFileType
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,11 @@ if ENABLE_GTK
appsdir = $(datadir)/applications
apps_in_files = pidgin.desktop.in
apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
+
+# silenced INTLTOOL_DESKTOP_RULE
+%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+ $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
+
endif #ENABLE_GTK
endif #INSTALL_I18N
diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -151,7 +151,9 @@ run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GET
run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
# This call to sed is needed to work around an annoying bug in intltool 0.40.6
# See https://developer.pidgin.im/ticket/9520 for details
-run_or_die ${SED} -i.bak -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
+run_or_die ${SED} -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
+# glib-gettextize doesn't seems to use AM_V_GEN macro
+${SED} -i -e "s:\\tfile=\`echo:\\t at echo -e \" GEN\\\\t\$\@\"; file=\`echo:g" po/Makefile.in.in
run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -981,14 +981,14 @@ if test "x$enable_farstream" != "xno"; t
PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2], [
AC_SUBST(FARSTREAM_CFLAGS)
AC_SUBST(FARSTREAM_LIBS)
- ], [
+ ], [
enable_farstream="no"
])
else
PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
AC_SUBST(FARSTREAM_CFLAGS)
AC_SUBST(FARSTREAM_LIBS)
- ], [
+ ], [
# Try farsight.
PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [
AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream])
@@ -997,7 +997,7 @@ if test "x$enable_farstream" != "xno"; t
], [
enable_farstream="no"
])
- ])
+ ])
fi
fi
@@ -1424,21 +1424,13 @@ if test "x$GCC" = "xyes"; then
dnl This leads to spurious warnings using GPOINTER_TO_INT(), et al. directly on a function call.
dnl We'd need an intermediate variable.
dnl
- dnl Consider adding -Wfloat-equal.
- dnl This leads to warnings with Perl.
- dnl Perhaps we could write ugly configure magic and pass -Wno-float-equal down to that subdirectory.
- dnl On the other hand, it's probably actually broken, so maybe the Perl folks should fix that?
- dnl
- dnl Consider removing -Wno-sign-compare (from the -Wextra set) and fixing all those cases.
- dnl This is likely non-trivial.
- dnl
for newflag in \
"-Waggregate-return" \
"-Wcast-align" \
"-Wdeclaration-after-statement" \
"-Wendif-labels" \
"-Werror-implicit-function-declaration" \
- "-Wextra -Wno-sign-compare -Wno-unused-parameter" \
+ "-Wextra -Wno-unused-parameter" \
"-Wformat-security" \
"-Werror=format-security" \
"-Winit-self" \
@@ -1446,6 +1438,7 @@ if test "x$GCC" = "xyes"; then
"-Wmissing-noreturn" \
"-Wmissing-prototypes" \
"-Wpointer-arith" \
+ "-Wfloat-equal" \
"-Wundef" \
; do
orig_CFLAGS="$CFLAGS"
@@ -1491,7 +1484,7 @@ fi
DEBUG_CPPFLAGS=`echo "$DEBUG_CFLAGS" | $sedpath 's/-Wdeclaration-after-statement//' | $sedpath 's/-Wmissing-prototypes//' | $sedpath 's/-Waggregate-return//'`
if test "x$SUNCC" = "xyes"; then
- CFLAGS="$CFLAGS -features=extensions"
+ CFLAGS="$CFLAGS -features=extensions"
fi
AC_SUBST(CFLAGS)
@@ -1565,13 +1558,22 @@ 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=no, 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], [
AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS)
AC_DEFINE(HAVE_GNOMEKEYRING, 1, [Define if we have GNOME Keyring.])
+ ], [
+ AC_MSG_RESULT(no)
+ enable_gnome_keyring="no"
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+GNOME Keyring development headers not found
+Use --disable-gnome-keyring if you do not need it.
+])
+ fi
])
fi
@@ -1581,54 +1583,20 @@ dnl ####################################
dnl # Check for KWallet headers
dnl #######################################################################
-AC_ARG_ENABLE(kwallet, [AC_HELP_STRING([--disable-kwallet], [enable KWallet support])], enable_kwallet=no, 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_WARN([
-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_WARN([
+ 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
@@ -1636,19 +1604,21 @@ 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)
- AC_SUBST(QT4_LIBS)
- ], [
- AC_MSG_RESULT(no)
- AC_MSG_WARN([
+ AC_SUBST(QT4_CFLAGS)
+ AC_SUBST(QT4_LIBS)
+ ], [
+ AC_MSG_RESULT(no)
+ enable_kwallet=no
+ if test "x$force_deps" = "xyes"; then
+ AC_MSG_ERROR([
Qt4 development headers not found.
Use --disable-kwallet if you do not need KWallet support.
])
- enable_kwallet=no
- ])
+ fi
+ ])
fi
if test "x$enable_kwallet" = "xyes"; then
@@ -1657,7 +1627,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"
@@ -1667,19 +1672,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
More information about the Commits
mailing list