summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-05-15 07:22:30 +0200
committerThomas Haller <thaller@redhat.com>2017-05-15 09:09:08 +0200
commit22cfbd9ab87306189e415d72f7a16387fec93f06 (patch)
tree7803ff0b232bbe75c7ff833b1b756e66fe434c34
parenta14643b54f77f1b7dc87c8a43bfa7fbe2ba5166d (diff)
downloadnetwork-manager-applet-22cfbd9ab87306189e415d72f7a16387fec93f06.tar.gz
Switch to stable libsecret API
Most of the libsecret API was declared stable in 0.18 and the stable API now provides everything we need, so switch from libsecret-unstable to libsecret-1. https://bugzilla.gnome.org/show_bug.cgi?id=782638
-rw-r--r--configure.ac2
-rw-r--r--src/applet-agent.c1
-rw-r--r--src/mobile-helpers.c1
-rw-r--r--src/mobile-helpers.h1
4 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index f1b404b2..9db551ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
-PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable])
+PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.18])
# Check for libnotify >= 0.7
PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
diff --git a/src/applet-agent.c b/src/applet-agent.c
index a9a8f5c7..b95075e2 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -23,7 +23,6 @@
#include <string.h>
-#define SECRET_API_SUBJECT_TO_CHANGE
#include <libsecret/secret.h>
#include "applet-agent.h"
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 81b2ac36..65a56a31 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -24,7 +24,6 @@
#include <ctype.h>
-#define SECRET_API_SUBJECT_TO_CHANGE
#include <libsecret/secret.h>
#include "utils.h"
diff --git a/src/mobile-helpers.h b/src/mobile-helpers.h
index 006bd44c..4b7589c7 100644
--- a/src/mobile-helpers.h
+++ b/src/mobile-helpers.h
@@ -24,7 +24,6 @@
#define APPLET_MOBILE_HELPERS_H
#include <gtk/gtk.h>
-#define SECRET_API_SUBJECT_TO_CHANGE
#include <libsecret/secret.h>
#include "applet.h"