[network-manager-openconnect] Remove stray GConf references



commit f08febb6fb44e77e235ec91e9e93ba8e125681f2
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 1d97b07..563faf5 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -6,7 +6,6 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
        $(NM_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(GCONF_CFLAGS) \
        $(OPENCONNECT_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(LIBSECRET_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) \
        $(LIBSECRET_LIBS)
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 68bdb8b..8bc13b8 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>
@@ -107,12 +105,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
  * the secret store. It’s used in success_passwords. */
 struct keyring_password {
@@ -1723,7 +1715,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 ed0f6b9..43699c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,10 +75,6 @@ if test x"$with_gnome" != xno; then
        AC_SUBST(LIBSECRET_CFLAGS)
        AC_SUBST(LIBSECRET_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 8673889..ee86fc7 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -13,7 +13,6 @@ ui_DATA = nm-openconnect-dialog.ui
 libnm_openconnect_properties_la_CFLAGS =                \
        $(GLIB_CFLAGS)                                  \
        $(GTK_CFLAGS)                                   \
-       $(GCONF_CFLAGS)                                 \
        $(NM_CFLAGS)                                    \
        $(OPENCONNECT_CFLAGS)                           \
        -DICONDIR=\""$(datadir)/pixmaps"\"              \
@@ -25,7 +24,6 @@ libnm_openconnect_properties_la_CFLAGS =                \
 
 libnm_openconnect_properties_la_LIBADD = \
        $(GTK_LIBS) \
-       $(GCONF_LIBS) \
        $(NM_LIBS) \
        $(OPENCONNECT_LIBS)
 


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