/cpw/tomkiewicz/masterpassword: e3507bd26a39: Disable Secret Ser...
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Mon May 13 19:44:07 EDT 2013
Changeset: e3507bd26a39d2fb2b1d60e443850cd05b2584fe
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-05-14 01:43 +0200
Branch: soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/e3507bd26a39
Description:
Disable Secret Service keyring, because of its (current) poor quality, far away from being ready to ship
diffstat:
configure.ac | 23 ++++++++++++-----------
libpurple/plugins/keyrings/secretservice.c | 14 +++++++++++++-
2 files changed, 25 insertions(+), 12 deletions(-)
diffs (75 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1539,18 +1539,19 @@ dnl ####################################
dnl # Check for Secret Service headers
dnl #######################################################################
-AC_ARG_ENABLE(libsecret, [AC_HELP_STRING([--disable-libsecret], [enable Secret Service support])], enable_secret_service=no, enable_secret_service=yes)
+# 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)
-dnl Check for libsecret; if we don't have it, oh well
-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
+#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 "x$enable_secret_service" = "xyes")
+AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x1" = "x2")
dnl #######################################################################
dnl # Check for GNOME Keyring headers
@@ -2939,9 +2940,9 @@ echo Use startup notification...... : $e
echo Build with GtkSpell support... : $enable_gtkspell
echo Build with GCR widgets........ : $enable_gcr
echo
-echo Build with Secret Service..... : $enable_secret_service
echo Build with GNOME Keyring...... : $enable_gnome_keyring
echo Build with KWallet............ : $enable_kwallet
+#echo Build with Secret Service..... : $enable_secret_service
echo
echo Build with plugin support..... : $enable_plugins
echo Build with Mono support....... : $enable_mono
diff --git a/libpurple/plugins/keyrings/secretservice.c b/libpurple/plugins/keyrings/secretservice.c
--- a/libpurple/plugins/keyrings/secretservice.c
+++ b/libpurple/plugins/keyrings/secretservice.c
@@ -1,7 +1,6 @@
/* purple
* @file secretservice.c Secret Service password storage
* @ingroup plugins
- * @todo rewrite it with Complete API
*
* Purple is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
@@ -22,6 +21,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+#error "This keyring needs some more work (see TODO)"
+
+/* TODO
+ *
+ * This keyring needs some more work, so it will be disabled until its quality
+ * was raised. Some of the pain points:
+ * - throws a lot of g_warnings
+ * - it doesn't notify about some backend faults (like access denied), some of
+ * them are not handled at all
+ * - it could use libsecret's Complete API
+ * - code formatting could be better
+ */
+
#include "internal.h"
#include "account.h"
#include "debug.h"
More information about the Commits
mailing list