/dev/tomkiewicz/gg11: faa2fbeee139: Merge with main
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Tue Aug 13 03:03:46 EDT 2013
Changeset: faa2fbeee13975ef082280ac74f8d99b91e87d90
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-08-12 11:33 +0200
Branch: default
URL: https://hg.pidgin.im/dev/tomkiewicz/gg11/rev/faa2fbeee139
Description:
Merge with main
diffstat:
.hgignore | 5 +
COPYRIGHT | 1 +
ChangeLog | 20 +-
ChangeLog.API | 4 +
HACKING | 2 +-
NEWS | 6 +-
PLUGIN_HOWTO | 2 +-
README | 2 +-
README.hg | 4 +-
README.mingw | 2 +-
autogen.sh | 2 +-
config.h.mingw | 7 +-
configure.ac | 168 ++
doc/PERL-HOWTO.dox | 2 +-
doc/TCL-HOWTO.dox | 2 +-
doc/finch.1.in | 10 +-
doc/pidgin.1.in | 70 +-
doc/plugin-ids.dox | 4 +-
finch/finch.c | 4 +-
finch/gntaccount.c | 15 +-
finch/gntprefs.c | 49 +
finch/gntprefs.h | 5 +
finch/gntui.c | 1 +
finch/plugins/gnttinyurl.c | 51 +-
libpurple/Makefile.am | 6 +-
libpurple/Makefile.mingw | 49 +-
libpurple/account.c | 235 +++-
libpurple/account.h | 25 +-
libpurple/certificate.c | 53 +-
libpurple/certificate.h | 4 +-
libpurple/cipher.c | 9 +-
libpurple/ciphers/Makefile.am | 17 +-
libpurple/ciphers/aes.c | 564 ++++++++
libpurple/ciphers/ciphers.h | 28 +
libpurple/ciphers/des.c | 28 +-
libpurple/ciphers/pbkdf2.c | 323 +++++
libpurple/connection.c | 9 +-
libpurple/core.c | 6 +
libpurple/core.h | 4 +-
libpurple/example/nullclient.c | 2 +-
libpurple/ft.c | 156 +-
libpurple/ft.h | 25 +
libpurple/http.c | 1201 +++++++++++++++---
libpurple/http.h | 284 ++++-
libpurple/internal.h | 4 +-
libpurple/keyring.c | 1358 +++++++++++++++++++++
libpurple/keyring.h | 548 ++++++++
libpurple/media/backend-fs2.c | 12 +-
libpurple/mediamanager.c | 2 +-
libpurple/obsolete.c | 776 ------------
libpurple/obsolete.h | 110 -
libpurple/plugins/Makefile.am | 11 +-
libpurple/plugins/Makefile.mingw | 4 +
libpurple/plugins/ciphertest.c | 339 +++++
libpurple/plugins/debug_example.c | 2 +-
libpurple/plugins/fortuneprofile.pl | 2 +-
libpurple/plugins/keyrings/Makefile.am | 76 +
libpurple/plugins/keyrings/Makefile.mingw | 81 +
libpurple/plugins/keyrings/gnomekeyring.c | 454 +++++++
libpurple/plugins/keyrings/internalkeyring.c | 1048 ++++++++++++++++
libpurple/plugins/keyrings/kwallet.cpp | 582 +++++++++
libpurple/plugins/keyrings/secretservice.c | 337 +++++
libpurple/plugins/keyrings/wincred.c | 321 ++++
libpurple/plugins/notify_example.c | 4 +-
libpurple/plugins/one_time_password.c | 2 +-
libpurple/plugins/perl/common/Account.xs | 15 +-
libpurple/plugins/perl/common/Certificate.xs | 2 +-
libpurple/plugins/perl/common/Makefile.PL.in | 2 +-
libpurple/plugins/perl/common/Purple.pm | 6 +-
libpurple/plugins/perl/common/Util.xs | 31 -
libpurple/plugins/perl/common/typemap | 1 +
libpurple/plugins/perl/perl-handlers.c | 118 +
libpurple/plugins/perl/perl-handlers.h | 6 +
libpurple/plugins/perl/scripts/account.pl | 33 +
libpurple/plugins/perl/scripts/count_down.pl | 2 +-
libpurple/plugins/perl/scripts/gtk_frame_test.pl | 2 +-
libpurple/plugins/perl/scripts/signals-test.pl | 2 +-
libpurple/plugins/ssl/ssl-gnutls.c | 18 +-
libpurple/plugins/ssl/ssl-nss.c | 32 +-
libpurple/plugins/tcl/signal-test.tcl | 2 +-
libpurple/plugins/test.pl | 2 +-
libpurple/protocols/bonjour/bonjour.c | 3 +-
libpurple/protocols/gg/account.c | 8 +-
libpurple/protocols/gg/avatar.c | 115 +-
libpurple/protocols/gg/gg.c | 3 +-
libpurple/protocols/gg/oauth/oauth-parameter.c | 4 +-
libpurple/protocols/gg/oauth/oauth-purple.c | 137 +-
libpurple/protocols/gg/pubdir-prpl.c | 132 +-
libpurple/protocols/irc/msgs.c | 3 +-
libpurple/protocols/jabber/Makefile.mingw | 16 +-
libpurple/protocols/jabber/auth.c | 6 +-
libpurple/protocols/jabber/auth_cyrus.c | 12 +-
libpurple/protocols/jabber/bosh.c | 1323 +++++--------------
libpurple/protocols/jabber/bosh.h | 35 +-
libpurple/protocols/jabber/google/gmail.c | 2 +-
libpurple/protocols/jabber/google/jingleinfo.c | 2 +-
libpurple/protocols/jabber/google/relay.c | 73 +-
libpurple/protocols/jabber/jabber.c | 50 +-
libpurple/protocols/jabber/jabber.h | 24 +-
libpurple/protocols/jabber/jingle/jingle.c | 7 +
libpurple/protocols/jabber/oob.c | 211 +-
libpurple/protocols/jabber/useravatar.c | 43 +-
libpurple/protocols/msn/contact.c | 38 +-
libpurple/protocols/msn/httpconn.c | 945 ++++---------
libpurple/protocols/msn/httpconn.h | 87 +-
libpurple/protocols/msn/msn.c | 110 +-
libpurple/protocols/msn/nexus.c | 22 +-
libpurple/protocols/msn/oim.c | 17 +-
libpurple/protocols/msn/servconn.c | 5 +-
libpurple/protocols/msn/servconn.h | 2 +
libpurple/protocols/msn/session.c | 21 +-
libpurple/protocols/msn/session.h | 8 +-
libpurple/protocols/msn/slp.c | 34 +-
libpurple/protocols/msn/soap.c | 822 +++---------
libpurple/protocols/msn/soap.h | 37 +-
libpurple/protocols/mxit/Makefile.am | 2 -
libpurple/protocols/mxit/Makefile.mingw | 1 -
libpurple/protocols/mxit/actions.c | 7 +-
libpurple/protocols/mxit/cipher.c | 4 +-
libpurple/protocols/mxit/formcmds.c | 24 +-
libpurple/protocols/mxit/http.c | 340 -----
libpurple/protocols/mxit/http.h | 47 -
libpurple/protocols/mxit/login.c | 164 +-
libpurple/protocols/mxit/markup.c | 79 +-
libpurple/protocols/mxit/mxit.h | 3 +-
libpurple/protocols/mxit/protocol.c | 160 +-
libpurple/protocols/myspace/README | 2 +-
libpurple/protocols/myspace/myspace.c | 112 +-
libpurple/protocols/myspace/myspace.h | 4 -
libpurple/protocols/myspace/user.c | 35 +-
libpurple/protocols/myspace/user.h | 4 +-
libpurple/protocols/novell/novell.c | 4 +-
libpurple/protocols/oscar/clientlogin.c | 85 +-
libpurple/protocols/oscar/family_oservice.c | 147 --
libpurple/protocols/oscar/flap_connection.c | 2 +-
libpurple/protocols/oscar/oscar.c | 162 +--
libpurple/protocols/oscar/oscar.h | 9 +-
libpurple/protocols/oscar/oscar_data.c | 3 +-
libpurple/protocols/sametime/sametime.c | 2 +-
libpurple/protocols/silc/silc.c | 4 +-
libpurple/protocols/simple/simple.c | 2 +-
libpurple/protocols/yahoo/libyahoo.c | 5 +-
libpurple/protocols/yahoo/libyahoojp.c | 5 +-
libpurple/protocols/yahoo/libymsg.c | 779 ++++-------
libpurple/protocols/yahoo/libymsg.h | 15 +-
libpurple/protocols/yahoo/util.c | 6 +-
libpurple/protocols/yahoo/yahoo_aliases.c | 190 +-
libpurple/protocols/yahoo/yahoo_filexfer.c | 1421 ++++-----------------
libpurple/protocols/yahoo/yahoo_filexfer.h | 5 -
libpurple/protocols/yahoo/yahoo_picture.c | 241 +--
libpurple/protocols/yahoo/yahoo_profile.c | 84 +-
libpurple/protocols/yahoo/yahoochat.c | 183 +--
libpurple/proxy.c | 65 +-
libpurple/prpl.c | 7 +-
libpurple/request.h | 2 +
libpurple/sslconn.c | 11 +
libpurple/sslconn.h | 10 +
libpurple/tests/test_cipher.c | 44 +-
libpurple/upnp.c | 206 +-
libpurple/util.c | 174 +-
libpurple/util.h | 42 +-
libpurple/win32/global.mak | 22 +
libpurple/win32/win32dep.c | 10 +-
m4macros/purple.m4 | 2 +-
pidgin.apspec.in | 2 +-
pidgin.spec.in | 2 +-
pidgin/Makefile.mingw | 7 +-
pidgin/gtkaccount.c | 44 +-
pidgin/gtkblist.c | 9 +-
pidgin/gtkconn.c | 3 -
pidgin/gtkconv.c | 42 +-
pidgin/gtkconv.h | 2 -
pidgin/gtkdebug.c | 2 +-
pidgin/gtkdialogs.c | 22 +-
pidgin/gtklog.c | 2 +-
pidgin/gtkmain.c | 4 +-
pidgin/gtkmedia.c | 157 ++-
pidgin/gtknotify.c | 2 +-
pidgin/gtkpluginpref.c | 8 +-
pidgin/gtkpounce.c | 2 +-
pidgin/gtkprefs.c | 801 +++++++++---
pidgin/gtkrequest.c | 3 +-
pidgin/gtksavedstatuses.c | 11 +-
pidgin/gtksmiley.c | 56 +-
pidgin/gtksound.c | 50 +-
pidgin/gtkstatusbox.c | 55 +-
pidgin/gtkutils.c | 23 +-
pidgin/gtkutils.h | 5 +-
pidgin/gtkwebview.c | 109 +-
pidgin/gtkwebview.h | 68 +-
pidgin/gtkwebviewtoolbar.c | 62 +-
pidgin/gtkwebviewtoolbar.h | 25 +-
pidgin/plugins/musicmessaging/musicmessaging.c | 2 +
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/perl/common/Pidgin.pm | 6 +-
pidgin/plugins/pidginrc.c | 2 +-
pidgin/plugins/relnot.c | 4 +-
pidgin/plugins/vvconfig.c | 804 ------------
pidgin/plugins/xmppconsole.c | 6 +-
pidgin/themes/Contents/Resources/main.css | 7 +-
pidgin/win32/gtkwin32dep.c | 8 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 245 +++-
pidgin/win32/nsis/nsis_translations.desktop.in | 6 +-
pidgin/win32/nsis/pidgin-installer.nsi | 13 +-
pidgin/win32/prepare-workspace.sh | 20 +-
pidgin/win32/winpidgin.c | 134 +-
po/POTFILES.in | 26 +-
po/README | 2 +-
po/de.po | 6 +-
po/mai.po | 2 +-
210 files changed, 12725 insertions(+), 9255 deletions(-)
diffs (truncated from 30213 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,6 @@
+syntax: glob
+.*.swp
+
syntax: regexp
(.*/)?TAGS$
(.*/)?\.svn
@@ -28,6 +31,7 @@ syntax: regexp
.*\.pyo$
.*\.rej$
.*\.so$
+.*\.moc$
Doxyfile(\.mingw)?$
VERSION$
aclocal.m4
@@ -70,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/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -55,6 +55,7 @@ Matthew W.S. Bell
Igor Belyi
David Benjamin
Brian Bernas
+Vivien Bernet-Rollande
Paul Betts
Runa Bhattacharjee
Jonas Birmé
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -722,7 +722,7 @@ version 2.7.6 (11/21/2010):
* Added extended capabilities support (none implemented).
* Merged the work done on the Google SoC (major rewrite of SLP code)
* Reworked the data transfer architecture.
- (http://developer.pidgin.im/wiki/SlpArchitecture)
+ (https://developer.pidgin.im/wiki/SlpArchitecture)
* Lots of little changes.
* Don't process zero-length DC messages. (#12660)
* Fixed a bunch of memory leaks.
@@ -2123,7 +2123,7 @@ version 2.4.3 (07/01/2008):
* Various memory leak fixes
version 2.4.2 (05/17/2008):
- http://developer.pidgin.im/query?status=closed&milestone=2.4.2
+ https://developer.pidgin.im/query?status=closed&milestone=2.4.2
libpurple:
* In MySpaceIM, messages from spambots are discarded (Justin Williams)
* Strip mIRC formatting codes from quit and part messages.
@@ -2189,7 +2189,7 @@ version 2.4.2 (05/17/2008):
enabled).
version 2.4.1 (03/31/2008):
- http://developer.pidgin.im/query?status=closed&milestone=2.4.1
+ https://developer.pidgin.im/query?status=closed&milestone=2.4.1
libpurple:
* Treat AIM Unicode messages as UTF-16 rather than UCS-2; this
@@ -2225,7 +2225,7 @@ version 2.4.1 (03/31/2008):
on the right to show it.
version 2.4.0 (02/29/2008):
- http://developer.pidgin.im/query?status=closed&milestone=2.4.0
+ https://developer.pidgin.im/query?status=closed&milestone=2.4.0
libpurple:
* Added support for offline messages for AIM accounts (thanks to
@@ -2284,7 +2284,7 @@ version 2.4.0 (02/29/2008):
* Fixed a bug preventing finch working on x86_64
version 2.3.1 (12/7/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.3.1
+ https://developer.pidgin.im/query?status=closed&milestone=2.3.1
NOTE: Due to the way this release was made, it is possible that
bugs marked as fixed in 2.3.1 will not be fixed until the
next release.
@@ -2305,7 +2305,7 @@ version 2.3.1 (12/7/2007):
* Prevent autoaccept plugin overwriting existing files
version 2.3.0 (11/24/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.3.0
+ https://developer.pidgin.im/query?status=closed&milestone=2.3.0
NOTE: Some bugs marked fixed in 2.2.1, 2.2.2 or 2.2.3 may not
have been fixed until this release (2.3.0).
@@ -2378,7 +2378,7 @@ version 2.3.0 (11/24/2007):
* 'yank' operation for the entry boxes. The default binding is ctrl+y.
version 2.2.2 (10/23/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.2.2
+ https://developer.pidgin.im/query?status=closed&milestone=2.2.2
NOTE: Due to the way this release was made, it is possible that
bugs marked as fixed in 2.2.1 or 2.2.2 will not be fixed
until the next release.
@@ -2390,7 +2390,7 @@ version 2.2.2 (10/23/2007):
how this is done on other platforms.
version 2.2.1 (09/29/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.2.1
+ https://developer.pidgin.im/query?status=closed&milestone=2.2.1
NOTE: Due to the backporting that happened for the actual
release, it is possible bugs marked as fixed in 2.2.1
will not be fixed until 2.2.2.
@@ -2415,7 +2415,7 @@ version 2.2.1 (09/29/2007):
dialog.
version 2.2.0 (09/13/2007):
- http://developer.pidgin.im/query?status=closed&milestone=2.2.0
+ https://developer.pidgin.im/query?status=closed&milestone=2.2.0
libpurple:
* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
@@ -2793,7 +2793,7 @@ version 2.0.0 (5/3/2007):
Summer of Code)
* Updated Gadu-Gadu protocol support (Bartosz Oler, Google Summer of
Code). This requires the libgadu library. See
- http://pidgin.im/faq.php#libgadu for more information.
+ https://pidgin.im/faq.php#libgadu for more information.
* SIP/SIMPLE support (Thomas Butter, Google Summer of Code)
* Sametime protocol support
Requires the meanwhile library: http://meanwhile.sourceforge.net
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/HACKING b/HACKING
--- a/HACKING
+++ b/HACKING
@@ -1,2 +1,2 @@
For information on hacking on Pidgin, Finch, or libpurple, see:
- http://developer.pidgin.im
+ https://developer.pidgin.im
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
-Our development blog is available at: http://planet.pidgin.im
+Our development blog is available at: https://planet.pidgin.im
2.8.0 (06/07/2011):
Paul: I fixed a few things in this release, and committed some
@@ -537,7 +537,7 @@ 2.0.2 (6/14/2007):
2.0.1 (5/24/2007):
Sean: 2.0.1! Three weeks later, as scheduled! It is so nice to have
regular, frequent, releases again! This is a bugfix release; We have
- fixed over 100 issues reported to us at http://developer.pidgin.im.
+ fixed over 100 issues reported to us at https://developer.pidgin.im.
Thanks to everyone for their great work, and look for the next release
in another three weeks!
@@ -669,7 +669,7 @@ 2.0.0beta7 (4/29/2007):
branding and organizational changes that have been going on for
the last few months, so there are likely to be some snags --
please help us out by trying beta 7, searching for any bugs you
- find in the bug tracker at http://developer.pidgin.im/, and
+ find in the bug tracker at https://developer.pidgin.im/, and
documenting them if they are unknown or you can provide new
information. Help us make 2.0.0 final a release to be remembered
(in a good way)! I'd like to give huge thanks to all of the
diff --git a/PLUGIN_HOWTO b/PLUGIN_HOWTO
--- a/PLUGIN_HOWTO
+++ b/PLUGIN_HOWTO
@@ -1,5 +1,5 @@
For information on writing a plugin for Purple, Pidgin or Finch, go
-http://developer.pidgin.im and click on API. From there, see the
+https://developer.pidgin.im and click on API. From there, see the
HOWTOs in the "Related Pages" section.
You can also generate this documentation locally by installing
diff --git a/README b/README
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ you only need to run 'pidgin' or 'finch'
To get started, simply add a new account.
-If you come across a bug, please report it at: http://developer.pidgin.im
+If you come across a bug, please report it at: https://developer.pidgin.im
PLUGINS
=======
diff --git a/README.hg b/README.hg
--- a/README.hg
+++ b/README.hg
@@ -16,7 +16,7 @@ shiniest features -- but it will prevent
development bugs that we already know about but haven't gotten around to fixing.
If you are interested in hacking on Pidgin, Finch, and/or libpurple, please
-check out the information available at: http://developer.pidgin.im
+check out the information available at: https://developer.pidgin.im
By far the best documentation, however, is the documented code. If you have
doxygen, you can run "make docs" in the toplevel directory to generate pretty
@@ -30,4 +30,4 @@ libpurple developers by email at devel at p
in #pidgin. Please do as much homework as you can before contacting us; the
more you know about your question, the faster and more effectively we can help!
-Patches should be posted as Trac tickets at: http://developer.pidgin.im
+Patches should be posted as Trac tickets at: https://developer.pidgin.im
diff --git a/README.mingw b/README.mingw
--- a/README.mingw
+++ b/README.mingw
@@ -3,4 +3,4 @@ How to build Pidgin for Windows using Mi
For the latest build instructions, please refer to:
-http://developer.pidgin.im/wiki/BuildingWinPidgin
+https://developer.pidgin.im/wiki/BuildingWinPidgin
diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -150,7 +150,7 @@ run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FL
run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS:-"--force --copy"}
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 http://developer.pidgin.im/ticket/9520 for details
+# 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 ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -362,7 +362,12 @@
/* #undef TM_IN_SYS_TIME */
/* Use GStreamer for playing sounds */
-/* #define USE_GSTREAMER 1 */
+/* It's defined in global.mak. */
+/* #undef USE_GSTREAMER */
+
+/* Use voice and video */
+/* It's defined in global.mak. */
+/* #undef USE_VV */
/* Define if we're using GtkSpell */
#define USE_GTKSPELL 1
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,7 @@ AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_con
dnl Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
+AC_PROG_CXX
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
LIBTOOL="$LIBTOOL --silent"
@@ -1487,6 +1488,7 @@ if test "x$GCC" = "xyes"; then
DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
CFLAGS="-g $CFLAGS"
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"
@@ -1542,6 +1544,166 @@ else
fi
dnl #######################################################################
+dnl # Check for Secret Service headers
+dnl #######################################################################
+
+# disabled - see secretservice.c
+#AC_ARG_ENABLE(libsecret, [AC_HELP_STRING([--disable-libsecret], [enable Secret Service support])], enable_secret_service=no, enable_secret_service=yes)
+
+#if test "x$enable_secret_service" = "xyes" ; then
+# PKG_CHECK_MODULES(SECRETSERVICE, [libsecret-1], [
+# AC_SUBST(SECRETSERVICE_CFLAGS)
+# AC_SUBST(SECRETSERVICE_LIBS)
+# AC_DEFINE(HAVE_SECRETSERVICE, 1, [Define if we have Secret Service.])
+# ])
+#fi
+
+#AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x$enable_secret_service" = "xyes")
+AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x1" = "x2")
+
+dnl #######################################################################
+dnl # Check for GNOME Keyring headers
More information about the Commits
mailing list