[network-manager-openconnect/nm-0-9-8] Remove stray GConf references

[Dan Winship <danw src gnome org>]

commit 8a5ff7b4371645753e5af4e908526d9797f3c313
Author: Dan Winship <danw gnome org>
Date:   Mon Jun 24 12:14:18 2013 -0400

    Remove stray GConf references
    
    GConf has not actually been used since 0.9, but we were still linking
    against it.

 auth-dialog/Makefile.am |    2 --
 auth-dialog/main.c      |   10 +---------
 configure.ac            |    4 ----
 properties/Makefile.am  |    2 --
 4 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 2d00d76..3c9c209 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -6,7 +6,6 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
        $(NM_CFLAGS) \
        $(GTHREAD_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(GCONF_CFLAGS) \
        $(OPENCONNECT_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(GNOMEKEYRING_CFLAGS) \
@@ -25,7 +24,6 @@ nm_openconnect_auth_dialog_SOURCES = \
 nm_openconnect_auth_dialog_LDADD = \
        $(GTK_LIBS) \
        $(NM_LIBS) \
-       $(GCONF_LIBS) \
        $(OPENCONNECT_LIBS) \
        $(LIBXML_LIBS) \
        $(GNOMEKEYRING_LIBS)
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index fd8c59d..438db36 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -36,8 +36,6 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <gconf/gconf-client.h>
-
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib-unix.h>
@@ -105,12 +103,6 @@ enum certificate_response{
        CERT_ACCEPTED,
 };
 
-struct gconf_key {
-       char *key;
-       char *value;
-       struct gconf_key *next;
-};
-
 /* This struct holds all information we need to add a password to
  * gnome-keyring. It’s used in success_passwords. */
 struct keyring_password {
@@ -1784,7 +1776,7 @@ int main (int argc, char **argv)
 
        _ui_data = init_ui_data(vpn_name, options, secrets, vpn_uuid);
        if (get_config(options, secrets, _ui_data->vpninfo)) {
-               fprintf(stderr, "Failed to find VPN UUID %s in gconf\n", vpn_uuid);
+               fprintf(stderr, "Failed to find VPN UUID %s\n", vpn_uuid);
                return 1;
        }
        build_main_dialog(_ui_data);
diff --git a/configure.ac b/configure.ac
index 5f0208a..9ea73da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,10 +88,6 @@ if test x"$with_gnome" != xno; then
        AC_SUBST(GNOMEKEYRING_CFLAGS)
        AC_SUBST(GNOMEKEYRING_LIBS)
 
-       PKG_CHECK_MODULES(GCONF, gconf-2.0)
-       AC_SUBST(GCONF_CFLAGS)
-       AC_SUBST(GCONF_LIBS)
-
        if test x"$with_authdlg" != xno; then
                PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)
                AC_SUBST(OPENCONNECT_CFLAGS)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 0a88601..45fb153 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -12,7 +12,6 @@ ui_DATA = nm-openconnect-dialog.ui
 
 libnm_openconnect_properties_la_CFLAGS =                \
        $(GTK_CFLAGS)                                   \
-       $(GCONF_CFLAGS)                                 \
        $(NM_CFLAGS)                                    \
        $(OPENCONNECT_CFLAGS)                           \
        -DICONDIR=\""$(datadir)/pixmaps"\"              \
@@ -24,7 +23,6 @@ libnm_openconnect_properties_la_CFLAGS =                \
 
 libnm_openconnect_properties_la_LIBADD = \
        $(GTK_LIBS) \
-       $(GCONF_LIBS) \
        $(NM_LIBS) \
        $(OPENCONNECT_LIBS)