[gnome-settings-daemon] smartcard: Fix build
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] smartcard: Fix build
- Date: Mon, 2 Jul 2012 18:13:00 +0000 (UTC)
commit 3fdd7bba13c642b10cbcc5b26193401b8dbe1bbb
Author: Colin Walters <walters verbum org>
Date: Mon Jul 2 14:08:50 2012 -0400
smartcard: Fix build
plugins/smartcard/Makefile.am | 2 ++
plugins/smartcard/gsd-smartcard-manager.c | 6 ++++++
plugins/smartcard/gsd-smartcard-manager.h | 2 ++
plugins/smartcard/test-smartcard.c | 2 +-
4 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 6f56454..e2a0add 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -12,6 +12,8 @@ gsd_test_smartcard_SOURCES = \
gsd_test_smartcard_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(NSS_CFLAGS) \
$(PLUGIN_CFLAGS) \
diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c
index 0c36288..9c91f82 100644
--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -392,6 +392,12 @@ gsd_smartcard_manager_error_quark (void)
}
GsdSmartcardManager *
+gsd_smartcard_manager_new_default (void)
+{
+ return gsd_smartcard_manager_new (NULL);
+}
+
+GsdSmartcardManager *
gsd_smartcard_manager_new (const char *module_path)
{
GsdSmartcardManager *instance;
diff --git a/plugins/smartcard/gsd-smartcard-manager.h b/plugins/smartcard/gsd-smartcard-manager.h
index d42a1bd..949f194 100644
--- a/plugins/smartcard/gsd-smartcard-manager.h
+++ b/plugins/smartcard/gsd-smartcard-manager.h
@@ -72,6 +72,8 @@ enum _GsdSmartcardManagerError {
GType gsd_smartcard_manager_get_type (void) G_GNUC_CONST;
GQuark gsd_smartcard_manager_error_quark (void) G_GNUC_CONST;
+GsdSmartcardManager *gsd_smartcard_manager_new_default (void);
+
GsdSmartcardManager *gsd_smartcard_manager_new (const char *module);
gboolean gsd_smartcard_manager_start (GsdSmartcardManager *manager,
diff --git a/plugins/smartcard/test-smartcard.c b/plugins/smartcard/test-smartcard.c
index b5ee3d5..b57d908 100644
--- a/plugins/smartcard/test-smartcard.c
+++ b/plugins/smartcard/test-smartcard.c
@@ -1,4 +1,4 @@
-#define NEW gsd_smartcard_manager_new
+#define NEW gsd_smartcard_manager_new_default
#define START gsd_smartcard_manager_start
#define STOP gsd_smartcard_manager_stop
#define MANAGER GsdSmartcardManager
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]