Mercurial > pidgin3 / changeset

--- a/configure.ac	Sun Aug 17 06:41:47 2008 +0000
+++ b/configure.ac	Sun Aug 17 21:30:50 2008 +0000
@@ -1230,6 +1230,7 @@
 
 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes)
 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes)
+AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--disable-gnome-keyring], [disable Gnome-Keyring support (requires D-Bus)])], enable_gnome_keyring=$enableval, enable_gnome_keyring=yes)
 
 if test "x$enable_dbus" = "xyes" ; then
 	AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
@@ -1262,10 +1263,34 @@
 ])
 			fi])
 	fi
+
+
+PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
+dnl Check for gnome-keyring.h; if we don't have it, oh well
+	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.])
+		], [
+			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 Gnome-Keyring support.
+])
+			fi])
+	fi
 else
+	enable_gnome_keyring=no
 	enable_nm=no
 fi
 
+AM_CONDITIONAL(ENABLE_GNOMEKEYRING, test "x$enable_gnome_keyring" = "xyes")
+
+
+
+
+
 dnl #######################################################################
 dnl # Check for Python
 dnl #######################################################################
@@ -2455,6 +2480,7 @@
 	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
 fi
 echo Build with NetworkManager..... : $enable_nm
+echo Build with Gnome-Keyring...... : $enable_gnome_keyring
 echo SSL Library/Libraries......... : $msg_ssl
 if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
 	eval eval echo SSL CA certificates directory. : $SSL_CERTIFICATES_DIR

--- a/libpurple/keyring.c	Sun Aug 17 06:41:47 2008 +0000
+++ b/libpurple/keyring.c	Sun Aug 17 21:30:50 2008 +0000
@@ -1022,7 +1022,7 @@
 
 	if (error != NULL) {
 		purple_notify_error(NULL, _("Keyrings"),
-			_("Failed to save password in keyring.")
+			_("Failed to save password in keyring."),
 			error->message);
 	}
 

--- a/libpurple/plugins/keyrings/Makefile.am	Sun Aug 17 06:41:47 2008 +0000
+++ b/libpurple/plugins/keyrings/Makefile.am	Sun Aug 17 21:30:50 2008 +0000
@@ -3,25 +3,35 @@
 
 plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-gnomekeyring_la_LDFLAGS     = -module -avoid-version
-internalkeyring_la_LDFLAGS  = -module -avoid-version
+
+if ENABLE_GNOMEKEYRING
 
-GNOME_KEYRING_CFLAGS = -I/usr/include/gnome-keyring-1
-GNOME_KEYRING_LIBS   = -lgnome-keyring
+gnomekeyring_la_LDFLAGS     = -module -avoid-version
+GKRSOURCES = gnomekeyring.c
+#GNOME_KEYRING_CFLAGS = -I/usr/include/gnome-keyring-1
+#GNOME_KEYRING_LIBS   = -lgnome-keyring
+GNOME_KEYRING_LA = internalkeyring.la
 
-GKRSOURCES = gnomekeyring.c
+endif #ENABLE_GNOMEKEYRING
+
+internalkeyring_la_LDFLAGS  = -module -avoid-version
 IKSOURCES = internalkeyring.c
 
 if PLUGINS
 
 plugin_LTLIBRARIES = \
-	gnomekeyring.la       \
+	$(GNOME_KEYRING_LA)\
 	internalkeyring.la
 
-gnomekeyring_la_SOURCES     = gnomekeyring.c
-internalkeyring_la_SOURCES  = internalkeyring.c
+
+if ENABLE_GNOMEKEYRING
 
-gnomekeyring_la_LIBADD  = $(GLIB_LIBS) $(GNOME_KEYRING_LIBS)
+gnomekeyring_la_SOURCES     = $(GKRSOURCES)
+gnomekeyring_la_LIBADD  = $(GLIB_LIBS) $(GNOMEKEYRING_LIBS)
+
+endif #ENABLE_GNOMEKEYRING
+
+internalkeyring_la_SOURCES  = $(IKSOURCES)
 internalkeyring_la_LIBADD   = $(GLIB_LIBS)
 
 endif #PLUGINS
@@ -34,7 +44,9 @@
 	$(PLUGIN_CFLAGS) \
 	$(GNOME_KEYRING_CFLAGS)
 
-gnomekeyring_la_CFLAGS = $(AM_CPPFLAGS) $(GNOME_KEYRING_CFLAGS)
+if ENABLE_GNOMEKEYRING
+gnomekeyring_la_CFLAGS = $(AM_CPPFLAGS) $(GNOMEKEYRING_CFLAGS)
+endif #ENABLE_GNOMEKEYRING
 internalkeyring_la_CFLAGS = $(AM_CPPFLAGS)
 
 

--- a/pidgin/gtkprefs.c	Sun Aug 17 06:41:47 2008 +0000
+++ b/pidgin/gtkprefs.c	Sun Aug 17 21:30:50 2008 +0000
@@ -1645,7 +1645,7 @@
 	PurpleKeyring * keyring;
 
 	g_return_if_fail(type == PURPLE_PREF_STRING);
-	g_return_if_fail(g_strcmp0(val,"/purple/keyring/active") == 0);
+	g_return_if_fail(g_strcmp0(name,"/purple/keyring/active") == 0);
 
 	/**
 	 * This part is annoying.
@@ -1654,6 +1654,7 @@
 	 * have to rely on the prefs system, and find the keyring that
 	 * is (or will be) used, from there.
 	 */
+
 	keyring = purple_keyring_get_keyring_by_id(val);
 
 	if (purple_keyring_get_change_master(keyring))