Merge lp:~mterry/update-notifier/gsettings into lp:update-notifier/ubuntu

[Michael Terry]

Port to gsettings (and update debian/ directory for gtk3/gdbus/gsettings).

=== modified file 'README.testing'
--- README.testing	2009-06-26 16:07:39 +0000
+++ README.testing	2011-07-13 15:23:55 +0000
@@ -30,4 +30,4 @@
 funtionatliy
 $ NO_FAKE_STAT=1 faketime '10 days' update-notifier --debug-updates
 # aftwards the launch time in u-m needs to be reset
-$ gconftool --unset /apps/update-manager/launch_time
+$ gsettings reset com.ubuntu.update-manager launch-time

=== modified file 'configure.in'
--- configure.in	2011-07-13 15:23:55 +0000
+++ configure.in	2011-07-13 15:23:55 +0000
@@ -11,8 +11,9 @@
 AC_HEADER_STDC
 
 GNOME_COMMON_INIT
+GLIB_GSETTINGS
 
-pkg_modules="gtk+-3.0 gconf-2.0 libnotify gio-2.0 >= 2.26 x11"
+pkg_modules="gtk+-3.0 libnotify gio-2.0 >= 2.26 x11"
 
 PKG_CHECK_EXISTS(gdu, [ HAVE_GDU=1 ])
 if test "x$HAVE_GDU" != "x"; then
@@ -42,9 +43,6 @@
 
 AM_GLIB_GNU_GETTEXT
 
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
 dnl AC_ARG_WITH(pkg-manager, [ --with-pkg-manager=PATH Package manager to use.])
 dnl if test "x$with_pkg_manager" != "x"; then
 dnl  AC_DEFINE_UNQUOTED(PKG_MANAGER, "$with_pkg_manager", [Package manager to use.])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-11-17 19:54:35 +0000
+++ data/Makefile.am	2011-07-13 15:23:55 +0000
@@ -4,10 +4,12 @@
 desktop_in_files = update-notifier.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-schemadir = $(datadir)/gconf/schemas
-schema_in_files = update-notifier.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+gsettings_SCHEMAS = com.canonical.update-notifier.gschema.xml
+
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = update-notifier.convert
 
 helperdir = $(libdir)/update-notifier
 helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot
@@ -17,8 +19,7 @@
 
 EXTRA_DIST= $(helper_SCRIPTS) \
 	    $(desktop_in_files) \
-	    $(schema_in_files)
-
-#install-data-local:
-#	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-
+	    $(gsettings_SCHEMAS:.xml=.xml.in)
+
+CLEANFILES = \
+	    $(gsettings_SCHEMAS)

=== renamed file 'data/update-notifier.schemas.in' => 'data/com.canonical.update-notifier.gschema.xml.in'
--- data/update-notifier.schemas.in	2009-10-12 07:24:10 +0000
+++ data/com.canonical.update-notifier.gschema.xml.in	2011-07-13 15:23:55 +0000
@@ -1,70 +1,39 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/update-notifier/show_apport_crashes</key>
-      <applyto>/apps/update-notifier/show_apport_crashes</applyto>
-      <type>bool</type>
+<schemalist>
+  <schema id="com.canonical.update-notifier" path="/com/canonical/update-notifier/">
+    <key name="show-apport-crashes" type="b">
       <default>true</default>
-      <locale name="C">
-        <short>Display apport crash reports automatically</short>
-        <long>If this is disabled, the user will not be notified about pending apport crash reports.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/update-notifier/end_system_uids</key>
-      <applyto>/apps/update-notifier/end_system_uids</applyto>
-      <type>int</type>
+      <summary>Display apport crash reports automatically</summary>
+      <description>If this is disabled, the user will not be notified about pending apport crash reports.</description>
+    </key>
+    <key name="end-system-uids" type="i">
       <default>500</default>
-      <locale name="C">
-        <short>The maximum UID that is reserved for system users</short>
-        <long>Update-notifier will not be started for system users, this
-specifies the upper bound of this range.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/update-notifier/auto_launch</key>
-      <applyto>/apps/update-notifier/auto_launch</applyto>
-      <type>bool</type>
+      <summary>The maximum UID that is reserved for system users</summary>
+      <description>Update-notifier will not be started for system users, this specifies the upper bound of this range.</description>
+    </key>
+    <key name="auto-launch" type="b">
       <default>true</default>
-      <locale name="C">
-        <short>Automatically launch the default action</short>
-        <long>The default action (update-manager) will be started 
-	automatically. All dialog boxes like notification hooks,  
-	reboot required, media detected will open automatically
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/update-notifier/regular_auto_launch_interval</key>
-      <applyto>/apps/update-notifier/regular_auto_launch_interval</applyto>
-      <type>int</type>
+      <summary>Automatically launch the default action</summary>
+      <description>The default action (update-manager) will be started automatically. All dialog boxes like notification hooks, reboot required, media detected will open automatically</description>
+    </key>
+    <key name="regular-auto-launch-interval" type="i">
       <default>7</default>
-      <locale name="C">
-        <short>Interval (in days) when to auto launch for normal updates</short>
-        <long>The interval (in days) when auto launching update-manager
-	for normal updates. Please note that it will auto launch for
-	security updates immediately. If you set it to "0" it will 
-	also launch as soon as updates become available.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/update-notifier/hide_reboot_notification</key>
-      <applyto>/apps/update-notifier/hide_reboot_notification</applyto>
-      <type>bool</type>
-      <default>False</default>
-      <locale name="C">
-        <short>Hide the reboot notification</short>
-        <long>Do not display a reboot required icon or dialog. This is
-	useful for sysadmin who want to prevent this feature from users.
-        </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
+      <summary>Interval (in days) when to auto launch for normal updates</summary>
+      <description>The interval (in days) when auto launching update-manager for normal updates. Please note that it will auto launch for security updates immediately. If you set it to "0" it will also launch as soon as updates become available.</description>
+    </key>
+    <key name="hide-reboot-notification" type="b">
+      <default>false</default>
+      <summary>Hide the reboot notification</summary>
+      <description>Do not display a reboot required icon or dialog. This is useful for sysadmins who want to prevent this feature from users.</description>
+    </key>
+    <key name="no-show-notifications" type="b">
+      <default>false</default>
+      <summary>Stop showing update notifications</summary>
+      <description>Do not display a notification when updates are available.</description>
+    </key>
+    <key name="release-check-time" type="u">
+      <default>0</default>
+      <summary>Time of last release check</summary>
+      <description>The last time update-notifier checked for a new release.  The format is seconds since UNIX epoch.</description>
+    </key>
+  </schema>
+</schemalist>

=== added file 'data/update-notifier.convert'
--- data/update-notifier.convert	1970-01-01 00:00:00 +0000
+++ data/update-notifier.convert	2011-07-13 15:23:55 +0000
@@ -0,0 +1,8 @@
+[com.canonical.update-notifier]
+show-apport-crashes = /apps/update-notifier/show_apport_crashes
+end-system-uids = /apps/update-notifier/end_system_uids
+auto-launch = /apps/update-notifier/auto_launch
+regular-auto-launch-interval = /apps/update-notifier/regular_auto_launch_interval
+hide-reboot-notification = /apps/update-notifier/hide_reboot_notification
+no-show-notifications = /apps/update-notifier/no_show_notifications
+release-check-time = /apps/update-notifier/release_check_time

=== modified file 'debian/control'
--- debian/control	2011-06-08 07:28:28 +0000
+++ debian/control	2011-07-13 15:23:55 +0000
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
-               libgtk2.0-dev (>= 2.18.0),
-               libgconf2-dev,
+               libgtk-3-dev,
+               libglib2.0-dev (>= 2.26),
                libgdu-dev,
-               libdbus-glib-1-dev (>= 0.60),
                intltool,
                libnotify-dev (>= 0.7),
                libgudev-1.0-dev,

=== modified file 'debian/update-notifier.install'
--- debian/update-notifier.install	2009-06-26 16:00:13 +0000
+++ debian/update-notifier.install	2011-07-13 15:23:55 +0000
@@ -5,5 +5,6 @@
 usr/share/icons/hicolor/22x22/
 usr/share/icons/hicolor/24x24/
 usr/share/icons/hicolor/48x48/
-usr/share/gconf/schemas/update-notifier.schemas
+usr/share/glib-2.0/schemas/com.canonical.update-notifier.gschema.xml
+usr/share/GConf/gsettings/update-notifier.convert
 usr/bin/update-notifier

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-07-08 15:22:36 +0000
+++ po/POTFILES.in	2011-07-13 15:23:55 +0000
@@ -15,5 +15,5 @@
 src/update-notifier.c
 [type: gettext/glade]ui/hooks-dialog.ui
 [type: gettext/glade]ui/reboot-dialog.ui
-data/update-notifier.schemas.in
+data/com.canonical.update-notifier.gschema.xml.in
 data/update-notifier.desktop.in

=== modified file 'src/clipboard.c'
--- src/clipboard.c	2010-10-05 16:33:46 +0000
+++ src/clipboard.c	2011-07-13 15:23:55 +0000
@@ -10,7 +10,6 @@
 
 #include "config.h"
 
-#include <gconf/gconf-client.h>
 #include <gdk/gdkx.h>
 
 #include "update-notifier.h"

=== modified file 'src/crash.c'
--- src/crash.c	2011-07-13 15:23:55 +0000
+++ src/crash.c	2011-07-13 15:23:55 +0000
@@ -131,9 +131,9 @@
       return FALSE;
 
    // Check whether the user doesn't want notifications
-   if (!gconf_client_get_bool ((GConfClient*) ta->user_data,
-       GCONF_KEY_APPORT_NOTIFICATIONS, NULL)) {
-      g_debug("apport notifications disabled in gconf, not displaying crashes");
+   if (!g_settings_get_boolean ((GSettings*) ta->user_data,
+       SETTINGS_KEY_APPORT_NOTIFICATIONS)) {
+      g_debug("apport notifications disabled, not displaying crashes");
       return FALSE;
    }
 
@@ -159,8 +159,8 @@
    crashreports_found = !exitcode || system_crashes;
 
    // in autolaunch mode, just open windows, 
-   gboolean autolaunch = gconf_client_get_bool((GConfClient*) ta->user_data,
-                                               GCONF_KEY_AUTO_LAUNCH, NULL); 
+   gboolean autolaunch = g_settings_get_boolean((GSettings*) ta->user_data,
+                                                SETTINGS_KEY_AUTO_LAUNCH); 
    if (autolaunch) {
       if (crashreports_found > 0) {
          g_debug("autolaunch mode, just running apport now");
@@ -214,7 +214,7 @@
 crashreport_tray_icon_init (TrayApplet *ta)
 {
 
-	ta->user_data = gconf_client_get_default();
+	ta->user_data = g_settings_new(SETTINGS_SCHEMA);
         g_signal_connect (G_OBJECT(ta->tray_icon),
 			  "activate",
 			  G_CALLBACK (button_release_cb),

=== modified file 'src/hooks.c'
--- src/hooks.c	2011-07-13 15:23:55 +0000
+++ src/hooks.c	2011-07-13 15:23:55 +0000
@@ -670,8 +670,8 @@
    assert(button_next);
 
    // check if we do a notification or a dialog
-   GConfClient *gconf = gconf_client_get_default();
-   if(gconf_client_get_bool(gconf, GCONF_KEY_AUTO_LAUNCH, NULL)) {
+   GSettings *settings = g_settings_new(SETTINGS_SCHEMA);
+   if(g_settings_get_boolean(settings, SETTINGS_KEY_AUTO_LAUNCH)) {
       g_debug_hooks("showing hooks with focus on map == FALSE");
       if (unseen_count < 2)
 	 gtk_widget_hide(button_next);
@@ -680,6 +680,7 @@
       show_hooks(ta, FALSE);
       return TRUE;
    }
+   g_object_unref(settings);
 
    // no dialog, do the notification
    if((unseen_count > 0) && !gtk_status_icon_get_visible (ta->tray_icon))

=== modified file 'src/reboot.c'
--- src/reboot.c	2011-07-13 15:23:55 +0000
+++ src/reboot.c	2011-07-13 15:23:55 +0000
@@ -195,13 +195,13 @@
 
 	// if we are not supposed to show the reboot notification
 	// just skip it 
-	if(gconf_client_get_bool((GConfClient*) ta->user_data,
-				 GCONF_KEY_HIDE_REBOOT, NULL))
+	if(g_settings_get_boolean((GSettings*) ta->user_data,
+	                          SETTINGS_KEY_HIDE_REBOOT))
 	   return;
 	// no auto-open of this dialog 
-	if(gconf_client_get_bool((GConfClient*) ta->user_data,
-				 GCONF_KEY_AUTO_LAUNCH, NULL)) {
-           g_debug ("Skipping reboot required");
+	if(g_settings_get_boolean((GSettings*) ta->user_data,
+	                          SETTINGS_KEY_AUTO_LAUNCH)) {
+	   g_debug ("Skipping reboot required");
 	   return;
 	}
 
@@ -227,8 +227,8 @@
 	gtk_status_icon_set_visible (ta->tray_icon, TRUE);
 
 	/* Check whether the user doesn't like notifications */
-	if (gconf_client_get_bool ((GConfClient*) ta->user_data,
-				   GCONF_KEY_NO_UPDATE_NOTIFICATIONS, NULL))
+	if (g_settings_get_boolean ((GSettings*) ta->user_data,
+	                            SETTINGS_KEY_NO_UPDATE_NOTIFICATIONS))
 		return;
 
 	/* Show the notification, after a delay so it doesn't look ugly
@@ -274,7 +274,7 @@
 	GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (icon_theme, "un-reboot",
 						      48, 0,NULL);
 	gtk_status_icon_set_from_pixbuf (ta->tray_icon, pixbuf);
-	ta->user_data = gconf_client_get_default();
+	ta->user_data = g_settings_new(SETTINGS_SCHEMA);
 
         g_signal_connect (G_OBJECT(ta->tray_icon),
 			  "activate",

=== modified file 'src/release.c'
--- src/release.c	2010-03-31 18:56:10 +0000
+++ src/release.c	2011-07-13 15:23:55 +0000
@@ -28,15 +28,11 @@
 {
    g_debug_release ("check_new_release");
 
-   GError *error = NULL;
-   GConfClient *client = (GConfClient*)user_data;
+   GSettings *settings = (GSettings*)user_data;
    
    time_t now = time(NULL);
-   time_t last_check = gconf_client_get_int(client, GCONF_KEY_LAST_RELEASE_CHECK, &error);
-   if ( error != NULL ) {
-      g_warning ("could not get %s", GCONF_KEY_LAST_RELEASE_CHECK);
-      return FALSE;
-   }
+   time_t last_check = (time_t)g_settings_get_uint(settings,
+                                                   SETTINGS_KEY_LAST_RELEASE_CHECK);
 
    // test if we need to run
    if ( (last_check + RELEASE_UPGRADE_CHECK_WAIT) > now ) {
@@ -57,7 +53,7 @@
    g_spawn_async ("/", argv, NULL, 0, NULL, NULL, NULL, NULL);
 
    // and update the timestamp so we don't check again too soon
-   gconf_client_set_int(client, GCONF_KEY_LAST_RELEASE_CHECK, now, NULL);
+   g_settings_set_uint(settings, SETTINGS_KEY_LAST_RELEASE_CHECK, (guint)now);
 
    return TRUE;
 }
@@ -67,14 +63,14 @@
 {
    g_debug_release ("release_checker_init");
 
-   GConfClient *client = gconf_client_get_default();
+   GSettings *settings = g_settings_new(SETTINGS_SCHEMA);
    
    // check once at startup
-   check_new_release (client);
+   check_new_release (settings);
    // release upgrades happen not that frequently, we use two timers
    // check every 10 min if 48h are reached and then run 
    // "check-release-upgrade-gtk" again
-   g_timeout_add_seconds (60*10, check_new_release, client);
+   g_timeout_add_seconds (60*10, check_new_release, settings);
 
    return TRUE;
 }

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2011-01-03 15:21:35 +0000
+++ src/update-notifier.c	2011-07-13 15:23:55 +0000
@@ -489,12 +489,11 @@
     * (see /usr/share/gdm/guest-session/guest-session-setup.sh)
     */
    int end_system_uid = 500;
-   GConfClient *gconf = gconf_client_get_default();
-   if (gconf) {
-      int i = gconf_client_get_int(gconf, GCONF_KEY_END_SYSTEM_UIDS, NULL);
-      if (i>0)
-	 end_system_uid = i;
-   }
+   GSettings *settings = g_settings_new(SETTINGS_SCHEMA);
+   int i = g_settings_get_int(settings, SETTINGS_KEY_END_SYSTEM_UIDS);
+   if (i>0)
+      end_system_uid = i;
+   g_object_unref(settings);
 
    uid_t uid = getuid();
    if (uid < end_system_uid)
@@ -600,8 +599,9 @@
 
 	// do not run as system user (e.g. guest user)
 	if (FORCE_RELEASE_CHECK) {
-	   GConfClient *gconf = gconf_client_get_default();
-	   gconf_client_unset(gconf, GCONF_KEY_LAST_RELEASE_CHECK, NULL);
+	   GSettings *settings = g_settings_new(SETTINGS_SCHEMA);
+	   g_settings_reset(settings, SETTINGS_KEY_LAST_RELEASE_CHECK);
+	   g_object_unref(settings);
 	}
 
 	// check if it is running already

=== modified file 'src/update-notifier.h'
--- src/update-notifier.h	2010-06-29 19:31:20 +0000
+++ src/update-notifier.h	2011-07-13 15:23:55 +0000
@@ -22,19 +22,20 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
 
 #define CLIPBOARD_NAME 	"UPGRADE_NOTIFIER_SELECTION"
-#define GCONF_KEY_DEFAULT_ACTION "/apps/update-notifier/default_action"
-#define GCONF_KEY_NO_UPDATE_NOTIFICATIONS "/apps/update-notifier/no_show_notifications"
-#define GCONF_KEY_APPORT_NOTIFICATIONS "/apps/update-notifier/show_apport_crashes"
-#define GCONF_KEY_END_SYSTEM_UIDS "/apps/update-notifier/end_system_uids"
-#define GCONF_KEY_AUTO_LAUNCH "/apps/update-notifier/auto_launch"
-#define GCONF_KEY_AUTO_LAUNCH_INTERVAL "/apps/update-notifier/regular_auto_launch_interval"
-#define GCONF_KEY_HIDE_REBOOT "/apps/update-notifier/hide_reboot_notification"
-#define GCONF_KEY_LAST_LAUNCH "/apps/update-manager/launch_time"
-#define GCONF_KEY_LAST_RELEASE_CHECK "/apps/update-notifier/release_check_time"
+
+#define SETTINGS_SCHEMA "com.canonical.update-notifier"
+#define SETTINGS_KEY_NO_UPDATE_NOTIFICATIONS "no-show-notifications"
+#define SETTINGS_KEY_APPORT_NOTIFICATIONS "show-apport-crashes"
+#define SETTINGS_KEY_END_SYSTEM_UIDS "end-system-uids"
+#define SETTINGS_KEY_AUTO_LAUNCH "auto-launch"
+#define SETTINGS_KEY_AUTO_LAUNCH_INTERVAL "regular-auto-launch-interval"
+#define SETTINGS_KEY_HIDE_REBOOT "hide-reboot-notification"
+#define SETTINGS_KEY_LAST_RELEASE_CHECK "release-check-time"
+
+#define SETTINGS_UM_SCHEMA "com.ubuntu.update-manager"
+#define SETTINGS_UM_KEY_LAST_LAUNCH "launch-time"
 
 #define HOOKS_DIR "/var/lib/update-notifier/user.d/"
 #define CRASHREPORT_HELPER "/usr/share/apport/apport-checkreports"
@@ -87,8 +88,6 @@
    TrayApplet *hook;
    TrayApplet *crashreport;
 
-   GConfClient *gconf;
-
    guint update_finished_timer; 
 
    

=== modified file 'src/update.c'
--- src/update.c	2011-07-13 15:23:55 +0000
+++ src/update.c	2011-07-13 15:23:55 +0000
@@ -108,7 +108,6 @@
    invoke (actions[i][0], _(actions[i][2]), (long)actions[i][3]);
 
    UpdateTrayAppletPrivate *priv = (UpdateTrayAppletPrivate*)ta->user_data;
-   gconf_client_set_int(priv->gconf, GCONF_KEY_DEFAULT_ACTION, i, NULL);
 }
 
 void 
@@ -126,8 +125,8 @@
       UpdateTrayAppletPrivate *priv = (UpdateTrayAppletPrivate*)ta->user_data;
 
       gboolean b = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self));
-      gconf_client_set_bool(priv->gconf, GCONF_KEY_NO_UPDATE_NOTIFICATIONS, 
-			    !b,NULL);
+      g_settings_set_boolean(priv->settings,
+                             SETTINGS_KEY_NO_UPDATE_NOTIFICATIONS, !b);
       
 
       NotifyNotification *n = priv->active_notification;
@@ -162,9 +161,8 @@
 
 	menuitem = gtk_check_menu_item_new_with_label(_("Show notifications"));
 	UpdateTrayAppletPrivate *priv = (UpdateTrayAppletPrivate*)ta->user_data;
-	gboolean b = gconf_client_get_bool(priv->gconf,
-					   GCONF_KEY_NO_UPDATE_NOTIFICATIONS, 
-					   NULL);
+	gboolean b = g_settings_get_boolean(priv->settings,
+	                                    SETTINGS_KEY_NO_UPDATE_NOTIFICATIONS);
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), !b);
 	gtk_menu_shell_append (GTK_MENU_SHELL (ta->menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "toggled", 
@@ -194,7 +192,7 @@
 
    // if the user wants auto-launch mode, do not show the icon
    // the auto launch stuff will do its magic later
-   if(gconf_client_get_bool(priv->gconf, GCONF_KEY_AUTO_LAUNCH, NULL))
+   if(g_settings_get_boolean(priv->settings, SETTINGS_KEY_AUTO_LAUNCH))
       return;
 
    if(is_running) {
@@ -525,20 +523,20 @@
 #endif
 
    // when checking for regular updates honor the 
-   // regular_auto_launch_interval
-   interval_days = gconf_client_get_int(priv->gconf,
-					GCONF_KEY_AUTO_LAUNCH_INTERVAL, 
-					NULL);
-   g_debug_update ("interval_days from gconf: %i\n", interval_days);
+   // regular-auto-launch-interval
+   interval_days = g_settings_get_int(priv->settings,
+					SETTINGS_KEY_AUTO_LAUNCH_INTERVAL);
+   g_debug_update ("interval_days: %i\n", interval_days);
 
    if (interval_days <= 0) 
       return TRUE;
 
    // check last launch time 
-   last_launch = gconf_client_get_int(priv->gconf,
-				      GCONF_KEY_LAST_LAUNCH,
-				      NULL);
-   g_debug_update ("last_launch from gconf: %i (%s)\n", last_launch, ctime(&last_launch));
+   GSettings *um_settings = g_settings_new(SETTINGS_UM_SCHEMA);
+   last_launch = g_settings_get_int(um_settings,
+                                    SETTINGS_UM_KEY_LAST_LAUNCH);
+   g_debug_update ("last_launch: %i (%s)\n", last_launch, ctime(&last_launch));
+   g_object_unref(um_settings);
 
    time_t now = time(NULL);
    if (auto_launch_security_now(priv, now, last_launch))
@@ -660,8 +658,7 @@
 
    // check if the user wants to see the icon or launch
    // the default action
-   if(gconf_client_get_bool(priv->gconf,
-			    GCONF_KEY_AUTO_LAUNCH, NULL)) 
+   if(g_settings_get_boolean(priv->settings, SETTINGS_KEY_AUTO_LAUNCH))
    {
       gtk_status_icon_set_visible(ta->tray_icon, FALSE);
       if (auto_launch_now(priv)) 
@@ -680,8 +677,8 @@
    gtk_status_icon_set_visible(ta->tray_icon, TRUE);
    
    // the user does not no notification messages
-   if(gconf_client_get_bool(priv->gconf,
-			    GCONF_KEY_NO_UPDATE_NOTIFICATIONS, NULL))
+   if(g_settings_get_boolean(priv->settings,
+                             SETTINGS_KEY_NO_UPDATE_NOTIFICATIONS))
       return TRUE;
 
    // show the notification with some delay. otherwise on a login
@@ -697,7 +694,7 @@
 {
    // create the private data struct
    UpdateTrayAppletPrivate *priv = g_new0(UpdateTrayAppletPrivate, 1);
-   priv->gconf = gconf_client_get_default();
+   priv->settings = g_settings_new(SETTINGS_SCHEMA);
    priv->apt_is_running = FALSE;
    priv->active_notification = NULL;
    ta->user_data = priv;

=== modified file 'src/update.h'
--- src/update.h	2009-03-02 14:51:55 +0000
+++ src/update.h	2011-07-13 15:23:55 +0000
@@ -10,7 +10,7 @@
 typedef struct _UpdateTrayAppletPrivate UpdateTrayAppletPrivate;
 struct _UpdateTrayAppletPrivate 
 {
-   GConfClient* gconf;
+   GSettings* settings;
    // this is a permanent marker if apt is runing currently
    // (the difference to the one in update-notifier.h is that
    //  the one in here is "global" and not "per-timeslice" information