From 5f86620759f2e522bda0e73f6c56fcb7c50d5295 Mon Sep 17 00:00:00 2001
From: Brent Hull <bhull2010@live.com>
Date: Sat, 15 Dec 2012 20:04:05 -0500
Subject: Make mate-keyring support optional

---
 src/Makefile.am   |  3 +++
 src/gpm-control.c | 21 ++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 6393bbd..a808b14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ INCLUDES =						\
 	$(GLIB_CFLAGS)					\
 	$(DBUS_CFLAGS)					\
 	$(MATE_CFLAGS)					\
+	$(KEYRING_CFLAGS)				\
 	$(UNIQUE_CFLAGS)				\
 	$(X11_CFLAGS)					\
 	$(LIBMATENOTIFY_CFLAGS)				\
@@ -184,6 +185,7 @@ mate_power_manager_LDADD =				\
 	$(X11_LIBS)				\
 	$(GSTREAMER_LIBS)				\
 	$(MATE_LIBS)					\
+	$(KEYRING_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(X11_LIBS)						\
 	$(CANBERRA_LIBS)				\
@@ -250,6 +252,7 @@ mate_power_self_test_LDADD =				\
 	$(GLIB_LIBS)					\
 	$(X11_LIBS)					\
 	$(MATE_LIBS)					\
+	$(KEYRING_LIBS)					\
 	$(GSTREAMER_LIBS)				\
 	$(UPOWER_LIBS)					\
 	$(DBUS_LIBS)					\
diff --git a/src/gpm-control.c b/src/gpm-control.c
index 4b6c959..105a6d1 100644
--- a/src/gpm-control.c
+++ b/src/gpm-control.c
@@ -39,9 +39,12 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <mate-keyring.h>
 #include <libupower-glib/upower.h>
 
+#ifdef WITH_KEYRING
+#include <mate-keyring.h>
+#endif /* WITH_KEYRING */
+
 #include "egg-debug.h"
 #include "egg-console-kit.h"
 
@@ -157,10 +160,12 @@ gpm_control_suspend (GpmControl *control, GError **error)
 	gboolean ret = FALSE;
 	gboolean do_lock;
 	gboolean nm_sleep;
-	gboolean lock_mate_keyring;
-	MateKeyringResult keyres;
 	GpmScreensaver *screensaver;
 	guint32 throttle_cookie = 0;
+#ifdef WITH_KEYRING
+	gboolean lock_mate_keyring;
+	MateKeyringResult keyres;
+#endif /* WITH_KEYRING */
 
 	screensaver = gpm_screensaver_new ();
 
@@ -173,6 +178,7 @@ gpm_control_suspend (GpmControl *control, GError **error)
 		goto out;
 	}
 
+#ifdef WITH_KEYRING
 	/* we should perhaps lock keyrings when sleeping #375681 */
 	lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
 	if (lock_mate_keyring) {
@@ -180,6 +186,7 @@ gpm_control_suspend (GpmControl *control, GError **error)
 		if (keyres != MATE_KEYRING_RESULT_OK)
 			egg_warning ("could not lock keyring");
 	}
+#endif /* WITH_KEYRING */
 
 	do_lock = gpm_control_get_lock_policy (control, GPM_SETTINGS_LOCK_ON_SUSPEND);
 	if (do_lock) {
@@ -225,10 +232,12 @@ gpm_control_hibernate (GpmControl *control, GError **error)
 	gboolean ret = FALSE;
 	gboolean do_lock;
 	gboolean nm_sleep;
-	gboolean lock_mate_keyring;
-	MateKeyringResult keyres;
 	GpmScreensaver *screensaver;
 	guint32 throttle_cookie = 0;
+#ifdef WITH_KEYRING
+	gboolean lock_mate_keyring;
+	MateKeyringResult keyres;
+#endif /* WITH_KEYRING */
 
 	screensaver = gpm_screensaver_new ();
 
@@ -241,6 +250,7 @@ gpm_control_hibernate (GpmControl *control, GError **error)
 		goto out;
 	}
 
+#ifdef WITH_KEYRING
 	/* we should perhaps lock keyrings when sleeping #375681 */
 	lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
 	if (lock_mate_keyring) {
@@ -249,6 +259,7 @@ gpm_control_hibernate (GpmControl *control, GError **error)
 			egg_warning ("could not lock keyring");
 		}
 	}
+#endif /* WITH_KEYRING */
 
 	do_lock = gpm_control_get_lock_policy (control, GPM_SETTINGS_LOCK_ON_HIBERNATE);
 	if (do_lock) {
-- 
cgit v1.2.1