[eog] Drop GConf dependency

[Felix Riemann <friemann src gnome org>]

commit 99f8997a71a6fecd70512432eb3c481d0dc34d8b
Author: Felix Riemann <friemann gnome org>
Date:   Sat Nov 20 14:11:15 2010 +0100

    Drop GConf dependency
    
    Concludes the GSettings migration. Closes bug 620121.

 configure.ac          |    3 ---
 src/eog-config-keys.h |    2 +-
 src/eog-window.c      |   22 ----------------------
 3 files changed, 1 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 344baab..ce9a08f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,6 @@ GTK_REQUIRED=2.91.1
 GLIB_REQUIRED=2.25.9
 GNOME_DESKTOP_REQUIRED=2.91.2
 GDKPIXBUF_REQUIRED=2.4.0
-# Require GConf 2.31+ for GConf-GSettings-Backend
-GCONF_REQUIRED=2.31.1
 GTK_PRINT_REQUIRED=2.90.4
 GNOME_ICON_THEME_REQUIRED=2.19.1
 SHARED_MIME_INFO_REQUIRED=0.20
@@ -102,7 +100,6 @@ EOG_MODULES="gtk+-3.0 >= $GTK_REQUIRED \
              gthread-2.0 >= $GLIB_REQUIRED \
              gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED \
              gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
-             gconf-2.0 >= $GCONF_REQUIRED \
              gtk+-unix-print-3.0 >= $GTK_PRINT_REQUIRED \
              gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED \
              shared-mime-info >= $SHARED_MIME_INFO_REQUIRED \
diff --git a/src/eog-config-keys.h b/src/eog-config-keys.h
index 1fd5333..2da80fd 100644
--- a/src/eog-config-keys.h
+++ b/src/eog-config-keys.h
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - GConf Keys Macros
+/* Eye Of Gnome - GSettings Keys Macros
  *
  * Copyright (C) 2000-2006 The Free Software Foundation
  *
diff --git a/src/eog-window.c b/src/eog-window.c
index 09133ba..2bae553 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -66,7 +66,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gio/gdesktopappinfo.h>
 #include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
 
 #if HAVE_LCMS
 #include <X11/Xlib.h>
@@ -119,19 +118,11 @@ enum {
 
 static gint signals[SIGNAL_LAST];
 
-/* GConfNotifications */
-enum {
-	EOG_WINDOW_NOTIFY_CAN_SAVE,
-	EOG_WINDOW_NOTIFY_LENGTH
-};
-
 struct _EogWindowPrivate {
 	GSettings           *fullscreen_settings;
 	GSettings           *ui_settings;
 	GSettings           *view_settings;
 	GSettings           *lockdown_settings;
-        GConfClient         *client;
-        guint                client_notifications[EOG_WINDOW_NOTIFY_LENGTH];
 
         EogListStore        *store;
         EogImage            *image;
@@ -4461,8 +4452,6 @@ eog_window_init (EogWindow *window)
 	priv->view_settings = g_settings_new (EOG_CONF_VIEW);
 	priv->lockdown_settings = g_settings_new (EOG_CONF_DESKTOP_LOCKDOWN_SCHEMA);
 
-	priv->client = gconf_client_get_default ();
-
 	window->priv->store = NULL;
 	window->priv->image = NULL;
 
@@ -4581,17 +4570,6 @@ eog_window_dispose (GObject *object)
 
 	eog_window_clear_transform_job (window);
 
-	if (priv->client) {
-		int i;
-
-		for (i = 0; i < EOG_WINDOW_NOTIFY_LENGTH; ++i) {
-			gconf_client_notify_remove (priv->client,
-						 priv->client_notifications[i]);
-		}
-		g_object_unref (priv->client);
-		priv->client = NULL;
-	}
-
 	if (priv->view_settings) {
 		g_object_unref (priv->view_settings);
 		priv->view_settings = NULL;