[seahorse: 3/4] Remove last references to gconf, including dependencies.

[Stefan Walter <stefw src gnome org>]

commit d6b5e2ea6ba805e1e073e6fba385c908340618ad
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Jul 28 10:08:44 2011 +0200

    Remove last references to gconf, including dependencies.
    
     * Remove dependencies from configure.ac
     * And remove lots of comments referring to gconf

 configure.ac                             |    3 +--
 libseahorse/seahorse-context.c           |    1 -
 libseahorse/seahorse-keyserver-control.h |    2 +-
 libseahorse/seahorse-prefs.c             |    2 +-
 pgp/seahorse-hkp-source.c                |    9 +--------
 pgp/seahorse-pgp-key-properties.c        |    2 +-
 src/seahorse-key-manager.c               |    2 +-
 src/seahorse-keyserver-search.c          |    4 ++--
 8 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 908e2a7..ccefcda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,6 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INTLTOOL([0.35.0])
 AM_PROG_LIBTOOL
-AM_GCONF_SOURCE_2
 GNOME_DOC_INIT
 GTK_DOC_CHECK([1.9])
 
@@ -42,7 +41,7 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gconf-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED)
 
 GLIB_GSETTINGS
 
diff --git a/libseahorse/seahorse-context.c b/libseahorse/seahorse-context.c
index 7c802ae..38b6218 100644
--- a/libseahorse/seahorse-context.c
+++ b/libseahorse/seahorse-context.c
@@ -81,7 +81,6 @@ struct _SeahorseContextPrivate {
     GHashTable *auto_sources;               /* Automatically added sources (keyservers) */
     GHashTable *objects_by_source;          /* See explanation above */
     GHashTable *objects_by_type;            /* See explanation above */
-    guint notify_id;                        /* Notify for GConf watch */
     SeahorseMultiOperation *refresh_ops;    /* Operations for refreshes going on */
     SeahorseServiceDiscovery *discovery;    /* Adds sources from DNS-SD */
     gboolean in_destruction;                /* In destroy signal */
diff --git a/libseahorse/seahorse-keyserver-control.h b/libseahorse/seahorse-keyserver-control.h
index 20661a0..604a785 100644
--- a/libseahorse/seahorse-keyserver-control.h
+++ b/libseahorse/seahorse-keyserver-control.h
@@ -44,7 +44,7 @@ typedef struct _SeahorseKeyserverControlClass SeahorseKeyserverControlClass;
  * - Also displays shares for keys found via DNS-SD over the network.
  *
  * Properties:
- *   gconf-key: (gchar*) The GConf key to retrieve and set keyservers.
+ *   settings-key: (gchar*) The GSettings key to retrieve and set keyservers.
  *   none-option: (gchar*) Text to display for 'no key server'
  */
 
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index 92273bd..28aa1bc 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -94,7 +94,7 @@ on_prefs_keyserver_remove_clicked (GtkWidget *button, SeahorseWidget *swidget)
     gtk_tree_selection_selected_foreach (selection, remove_row, NULL);
 }
 
-/* Write key server list to gconf */
+/* Write key server list to settings */
 static void
 save_keyservers (GtkTreeModel *model)
 {
diff --git a/pgp/seahorse-hkp-source.c b/pgp/seahorse-hkp-source.c
index e411905..d1eb910 100644
--- a/pgp/seahorse-hkp-source.c
+++ b/pgp/seahorse-hkp-source.c
@@ -64,13 +64,6 @@
     
 #define HKP_ERROR_DOMAIN (get_hkp_error_domain())
 
-#define GCONF_USE_HTTP_PROXY    "/system/http_proxy/use_http_proxy"
-#define GCONF_HTTP_PROXY_HOST   "/system/http_proxy/host"
-#define GCONF_PROXY_PORT        "/system/http_proxy/port"
-#define GCONF_USE_AUTH          "/system/http_proxy/use_authentication"
-#define GCONF_AUTH_USER         "/system/http_proxy/authentication_user"
-#define GCONF_AUTH_PASS         "/system/http_proxy/authentication_password"
-
 /**
 *
 * Returns The GQuark for the HKP error
@@ -216,7 +209,7 @@ create_proxy_session (void)
 /**
 * hop: A SeahorseHKPOperation to init
 *
-* Reads settings from GConf and creates a new operation with a running Soup
+* Reads settings and creates a new operation with a running Soup
 *
 **/
 static void 
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index b41cb8e..19f5bde 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -281,7 +281,7 @@ on_pgp_names_revoke_clicked (GtkWidget *widget, SeahorseWidget *swidget)
         seahorse_revoke_show (SEAHORSE_PGP_KEY (skey), index - 1);
 
 #ifdef WITH_KEYSERVER
-        if (seahorse_gconf_get_boolean(AUTOSYNC_KEY) == TRUE) {
+        if (g_settings_get_boolean(AUTOSYNC_KEY) == TRUE) {
             keys = g_list_append (keys, skey);
             seahorse_keyserver_sync (keys);
             g_list_free(keys);
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index 59297bb..151cda5 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -879,7 +879,7 @@ seahorse_key_manager_constructed (GObject *object)
 	gtk_toggle_action_set_active (action, g_settings_get_boolean (self->pv->settings, "show-validity"));
 	seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), self->pv->view_actions);
 	
-	/* Notify us when gconf stuff changes under this key */
+	/* Notify us when settings change */
 	g_signal_connect_object (self->pv->settings, "changed", G_CALLBACK (on_manager_settings_changed), self, 0);
 
 	/* close event */
diff --git a/src/seahorse-keyserver-search.c b/src/seahorse-keyserver-search.c
index e92ddf4..2d183ea 100644
--- a/src/seahorse-keyserver-search.c
+++ b/src/seahorse-keyserver-search.c
@@ -228,7 +228,7 @@ foreach_child_select_checks (GtkWidget *widget, gpointer user_data)
 /**
  * swidget: the main widget
  *
- * Reads key servers from gconf and updates the UI content.
+ * Reads key servers from settings and updates the UI content.
  *
  **/
 static void
@@ -387,7 +387,7 @@ refresh_shared_keys (SeahorseServiceDiscovery *ssd, const gchar *name, SeahorseW
  * @button: ignored
  * @swidget: The SeahorseWidget to work with
  *
- * Extracts data, stores it in GConf and starts a search using the entered
+ * Extracts data, stores it in settings and starts a search using the entered
  * search data.
  *
  * This function gets the things done