[network-manager-applet/nma-0-9-10: 15/15] gconf-helpers: suppress deprecated warning for gnome-keyring-1



commit 7427eae263da45c4a2648916ff7ba87f32f224a4
Author: Thomas Haller <thaller redhat com>
Date:   Fri Oct 31 20:23:14 2014 +0100

    gconf-helpers: suppress deprecated warning for gnome-keyring-1
    
    libgnome-keyring is marked as deprecated in favour of libsecret.
    We only use it for the legacy gconf-helpers. That code will be
    removed in the future, so don't bother an just suppress the
    deprecation warning.
    
    Signed-off-by: Thomas Haller <thaller redhat com>
    (cherry picked from commit ad3b90cf877f444e57ffa9b55e8325cac74b1ed3)

 src/gconf-helpers/gconf-helpers.c      |    6 +++++-
 src/gconf-helpers/gconf-upgrade.c      |    4 ++++
 src/gconf-helpers/tests/fake-keyring.c |    4 ++++
 src/gconf-helpers/tests/test-upgrade.c |    4 ++++
 4 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
index 14ed13b..6f42f39 100644
--- a/src/gconf-helpers/gconf-helpers.c
+++ b/src/gconf-helpers/gconf-helpers.c
@@ -34,9 +34,13 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 #include <glib.h>
-#include <gnome-keyring.h>
 #include <dbus/dbus-glib.h>
 
+/* libgnome-keyring is deprecated. */
+#include "utils.h"
+NM_PRAGMA_WARNING_DISABLE("-Wdeprecated-declarations")
+#include <gnome-keyring.h>
+
 #include <nm-setting-bluetooth.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
diff --git a/src/gconf-helpers/gconf-upgrade.c b/src/gconf-helpers/gconf-upgrade.c
index cbda095..000d324 100644
--- a/src/gconf-helpers/gconf-upgrade.c
+++ b/src/gconf-helpers/gconf-upgrade.c
@@ -30,7 +30,11 @@
 #include <errno.h>
 #include <arpa/inet.h>
 
+/* libgnome-keyring is deprecated. */
+#include "utils.h"
+NM_PRAGMA_WARNING_DISABLE("-Wdeprecated-declarations")
 #include <gnome-keyring.h>
+
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
diff --git a/src/gconf-helpers/tests/fake-keyring.c b/src/gconf-helpers/tests/fake-keyring.c
index d71ed82..a08351e 100644
--- a/src/gconf-helpers/tests/fake-keyring.c
+++ b/src/gconf-helpers/tests/fake-keyring.c
@@ -25,7 +25,11 @@
 #include <stdarg.h>
 #include <glib.h>
 
+/* libgnome-keyring is deprecated. */
+#include "utils.h"
+NM_PRAGMA_WARNING_DISABLE("-Wdeprecated-declarations")
 #include <gnome-keyring.h>
+
 #include "fake-keyring.h"
 
 static GSList *secrets = NULL;
diff --git a/src/gconf-helpers/tests/test-upgrade.c b/src/gconf-helpers/tests/test-upgrade.c
index 67d9cef..1b6661d 100644
--- a/src/gconf-helpers/tests/test-upgrade.c
+++ b/src/gconf-helpers/tests/test-upgrade.c
@@ -22,6 +22,10 @@
 
 #include <glib.h>
 #include <string.h>
+
+/* libgnome-keyring is deprecated. */
+#include "utils.h"
+NM_PRAGMA_WARNING_DISABLE("-Wdeprecated-declarations")
 #include <gnome-keyring.h>
 
 #include <nm-setting-wireless-security.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]