[gnome-packagekit] Move a few GConf keys to the correct places

[Richard Hughes <rhughes src gnome org>]

commit 19d85d96398c832f9165878ea8f3f09677daa8e3
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jun 25 09:32:29 2009 +0100

    Move a few GConf keys to the correct places

 data/gnome-packagekit.schemas.in |   88 +++++++++++++++++++-------------------
 src/gpk-common.h                 |   55 ++++++++++++------------
 2 files changed, 71 insertions(+), 72 deletions(-)
---
diff --git a/data/gnome-packagekit.schemas.in b/data/gnome-packagekit.schemas.in
index db94f4e..34d10a9 100644
--- a/data/gnome-packagekit.schemas.in
+++ b/data/gnome-packagekit.schemas.in
@@ -14,8 +14,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/banned_firmware</key>
-      <applyto>/apps/gnome-packagekit/banned_firmware</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/banned_firmware</key>
+      <applyto>/apps/gnome-packagekit/update-icon/banned_firmware</applyto>
       <owner>gnome-packagekit</owner>
       <type>string</type>
       <default>*/intel-ucode/*</default>
@@ -26,8 +26,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/ignored_messages</key>
-      <applyto>/apps/gnome-packagekit/ignored_messages</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/ignored_messages</key>
+      <applyto>/apps/gnome-packagekit/update-icon/ignored_messages</applyto>
       <owner>gnome-packagekit</owner>
       <type>string</type>
       <default>backend-*,untrusted-package</default>
@@ -74,8 +74,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_update_failed</key>
-      <applyto>/apps/gnome-packagekit/notify_update_failed</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_update_failed</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_update_failed</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -86,8 +86,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_update_complete</key>
-      <applyto>/apps/gnome-packagekit/notify_update_complete</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_update_complete</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_update_complete</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>false</default>
@@ -98,8 +98,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_update_complete_restart</key>
-      <applyto>/apps/gnome-packagekit/notify_update_complete_restart</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_update_complete_restart</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_update_complete_restart</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -110,8 +110,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_update_not_battery</key>
-      <applyto>/apps/gnome-packagekit/notify_update_not_battery</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_update_not_battery</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_update_not_battery</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -122,8 +122,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_update_started</key>
-      <applyto>/apps/gnome-packagekit/notify_update_started</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_update_started</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_update_started</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -134,8 +134,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_message</key>
-      <applyto>/apps/gnome-packagekit/notify_message</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_message</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_message</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>false</default>
@@ -146,8 +146,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_errors</key>
-      <applyto>/apps/gnome-packagekit/notify_errors</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_errors</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_errors</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -158,8 +158,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_complete</key>
-      <applyto>/apps/gnome-packagekit/notify_complete</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_complete</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_complete</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -170,8 +170,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_available</key>
-      <applyto>/apps/gnome-packagekit/notify_available</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_available</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_available</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -182,8 +182,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_distro_upgrades</key>
-      <applyto>/apps/gnome-packagekit/notify_distro_upgrades</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_distro_upgrades</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_distro_upgrades</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -194,8 +194,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/notify_critical</key>
-      <applyto>/apps/gnome-packagekit/notify_critical</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/notify_critical</key>
+      <applyto>/apps/gnome-packagekit/update-icon/notify_critical</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -206,8 +206,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/connection_use_mobile</key>
-      <applyto>/apps/gnome-packagekit/connection_use_mobile</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/connection_use_mobile</key>
+      <applyto>/apps/gnome-packagekit/update-icon/connection_use_mobile</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>false</default>
@@ -218,8 +218,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/connection_use_wifi</key>
-      <applyto>/apps/gnome-packagekit/connection_use_wifi</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/connection_use_wifi</key>
+      <applyto>/apps/gnome-packagekit/update-icon/connection_use_wifi</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>true</default>
@@ -242,8 +242,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/session_startup_timeout</key>
-      <applyto>/apps/gnome-packagekit/session_startup_timeout</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/session_startup_timeout</key>
+      <applyto>/apps/gnome-packagekit/update-icon/session_startup_timeout</applyto>
       <owner>gnome-packagekit</owner>
       <type>int</type>
       <default>300</default>
@@ -254,8 +254,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/force_get_updates_login</key>
-      <applyto>/apps/gnome-packagekit/force_get_updates_login</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/force_get_updates_login</key>
+      <applyto>/apps/gnome-packagekit/update-icon/force_get_updates_login</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>false</default>
@@ -269,8 +269,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/frequency_get_updates</key>
-      <applyto>/apps/gnome-packagekit/frequency_get_updates</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/frequency_get_updates</key>
+      <applyto>/apps/gnome-packagekit/update-icon/frequency_get_updates</applyto>
       <owner>gnome-packagekit</owner>
       <type>int</type>
       <default>86400</default>
@@ -281,8 +281,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/frequency_get_upgrades</key>
-      <applyto>/apps/gnome-packagekit/frequency_get_upgrades</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/frequency_get_upgrades</key>
+      <applyto>/apps/gnome-packagekit/update-icon/frequency_get_upgrades</applyto>
       <owner>gnome-packagekit</owner>
       <type>int</type>
       <default>604800</default>
@@ -293,8 +293,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/frequency_refresh_cache</key>
-      <applyto>/apps/gnome-packagekit/frequency_refresh_cache</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/frequency_refresh_cache</key>
+      <applyto>/apps/gnome-packagekit/update-icon/frequency_refresh_cache</applyto>
       <owner>gnome-packagekit</owner>
       <type>int</type>
       <default>86400</default>
@@ -305,8 +305,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/auto_update</key>
-      <applyto>/apps/gnome-packagekit/auto_update</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/auto_update</key>
+      <applyto>/apps/gnome-packagekit/update-icon/auto_update</applyto>
       <owner>gnome-packagekit</owner>
       <type>string</type>
       <default>none</default>
@@ -317,8 +317,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-packagekit/update_battery</key>
-      <applyto>/apps/gnome-packagekit/update_battery</applyto>
+      <key>/schemas/apps/gnome-packagekit/update-icon/update_battery</key>
+      <applyto>/apps/gnome-packagekit/update-icon/update_battery</applyto>
       <owner>gnome-packagekit</owner>
       <type>bool</type>
       <default>false</default>
diff --git a/src/gpk-common.h b/src/gpk-common.h
index 5822a4f..4a30683 100644
--- a/src/gpk-common.h
+++ b/src/gpk-common.h
@@ -32,45 +32,44 @@
 G_BEGIN_DECLS
 
 #define GPK_CONF_DIR				"/apps/gnome-packagekit"
-#define GPK_CONF_NOTIFY_COMPLETED		"/apps/gnome-packagekit/notify_complete"
-#define GPK_CONF_NOTIFY_AVAILABLE		"/apps/gnome-packagekit/notify_available"
-#define GPK_CONF_NOTIFY_DISTRO_UPGRADES		"/apps/gnome-packagekit/notify_distro_upgrades"
-#define GPK_CONF_NOTIFY_CRITICAL		"/apps/gnome-packagekit/notify_critical"
-#define GPK_CONF_NOTIFY_ERROR			"/apps/gnome-packagekit/notify_errors"
-#define GPK_CONF_NOTIFY_MESSAGE			"/apps/gnome-packagekit/notify_message"
-#define GPK_CONF_NOTIFY_UPDATE_STARTED		"/apps/gnome-packagekit/notify_update_started"
-#define GPK_CONF_NOTIFY_UPDATE_NOT_BATTERY	"/apps/gnome-packagekit/notify_update_not_battery"
-#define GPK_CONF_NOTIFY_UPDATE_FAILED		"/apps/gnome-packagekit/notify_update_failed"
-#define GPK_CONF_NOTIFY_UPDATE_COMPLETE		"/apps/gnome-packagekit/notify_update_complete"
-#define GPK_CONF_NOTIFY_UPDATE_COMPLETE_RESTART	"/apps/gnome-packagekit/notify_update_complete_restart"
-#define GPK_CONF_CONNECTION_USE_MOBILE		"/apps/gnome-packagekit/connection_use_mobile"
-#define GPK_CONF_CONNECTION_USE_WIFI		"/apps/gnome-packagekit/connection_use_wifi"
 #define GPK_CONF_AUTOCOMPLETE			"/apps/gnome-packagekit/autocomplete"
-#define GPK_CONF_SESSION_STARTUP_TIMEOUT	"/apps/gnome-packagekit/session_startup_timeout"
-#define GPK_CONF_FORCE_GET_UPDATES_LOGIN	"/apps/gnome-packagekit/force_get_updates_login"
-#define GPK_CONF_FREQUENCY_GET_UPDATES		"/apps/gnome-packagekit/frequency_get_updates"
-#define GPK_CONF_FREQUENCY_GET_UPGRADES		"/apps/gnome-packagekit/frequency_get_upgrades"
-#define GPK_CONF_FREQUENCY_REFRESH_CACHE	"/apps/gnome-packagekit/frequency_refresh_cache"
-#define GPK_CONF_AUTO_UPDATE			"/apps/gnome-packagekit/auto_update"
-#define GPK_CONF_UPDATE_BATTERY			"/apps/gnome-packagekit/update_battery"
 #define GPK_CONF_SHOW_DEPENDS			"/apps/gnome-packagekit/show_depends"
 #define GPK_CONF_SHOW_COPY_CONFIRM		"/apps/gnome-packagekit/show_copy_confirm"
-#define GPK_CONF_BANNED_FIRMWARE		"/apps/gnome-packagekit/banned_firmware"
 #define GPK_CONF_DBUS_DEFAULT_INTERACTION	"/apps/gnome-packagekit/dbus_default_interaction"
 #define GPK_CONF_DBUS_ENFORCED_INTERACTION	"/apps/gnome-packagekit/dbus_enforced_interaction"
+#define GPK_CONF_ENABLE_FONT_HELPER		"/apps/gnome-packagekit/enable_font_helper"
+#define GPK_CONF_ENABLE_CODEC_HELPER		"/apps/gnome-packagekit/enable_codec_helper"
+#define GPK_CONF_ENABLE_MIME_TYPE_HELPER	"/apps/gnome-packagekit/enable_mime_type_helper"
+#define GPK_CONF_ENABLE_CHECK_FIRMWARE		"/apps/gnome-packagekit/enable_check_firmware"
+#define GPK_CONF_ENABLE_CHECK_HARDWARE		"/apps/gnome-packagekit/enable_check_hardware"
 #define GPK_CONF_REPO_SHOW_DETAILS		"/apps/gnome-packagekit/repo/show_details"
+#define GPK_CONF_CONNECTION_USE_MOBILE		"/apps/gnome-packagekit/update-icon/connection_use_mobile"
+#define GPK_CONF_CONNECTION_USE_WIFI		"/apps/gnome-packagekit/update-icon/connection_use_wifi"
+#define GPK_CONF_NOTIFY_COMPLETED		"/apps/gnome-packagekit/update-icon/notify_complete"
+#define GPK_CONF_NOTIFY_AVAILABLE		"/apps/gnome-packagekit/update-icon/notify_available"
+#define GPK_CONF_NOTIFY_DISTRO_UPGRADES		"/apps/gnome-packagekit/update-icon/notify_distro_upgrades"
+#define GPK_CONF_NOTIFY_CRITICAL		"/apps/gnome-packagekit/update-icon/notify_critical"
+#define GPK_CONF_NOTIFY_ERROR			"/apps/gnome-packagekit/update-icon/notify_errors"
+#define GPK_CONF_NOTIFY_MESSAGE			"/apps/gnome-packagekit/update-icon/notify_message"
+#define GPK_CONF_NOTIFY_UPDATE_STARTED		"/apps/gnome-packagekit/update-icon/notify_update_started"
+#define GPK_CONF_NOTIFY_UPDATE_NOT_BATTERY	"/apps/gnome-packagekit/update-icon/notify_update_not_battery"
+#define GPK_CONF_NOTIFY_UPDATE_FAILED		"/apps/gnome-packagekit/update-icon/notify_update_failed"
+#define GPK_CONF_NOTIFY_UPDATE_COMPLETE		"/apps/gnome-packagekit/update-icon/notify_update_complete"
+#define GPK_CONF_NOTIFY_UPDATE_COMPLETE_RESTART	"/apps/gnome-packagekit/update-icon/notify_update_complete_restart"
+#define GPK_CONF_SESSION_STARTUP_TIMEOUT	"/apps/gnome-packagekit/update-icon/session_startup_timeout"
+#define GPK_CONF_FORCE_GET_UPDATES_LOGIN	"/apps/gnome-packagekit/update-icon/force_get_updates_login"
+#define GPK_CONF_FREQUENCY_GET_UPDATES		"/apps/gnome-packagekit/update-icon/frequency_get_updates"
+#define GPK_CONF_FREQUENCY_GET_UPGRADES		"/apps/gnome-packagekit/update-icon/frequency_get_upgrades"
+#define GPK_CONF_FREQUENCY_REFRESH_CACHE	"/apps/gnome-packagekit/update-icon/frequency_refresh_cache"
+#define GPK_CONF_AUTO_UPDATE			"/apps/gnome-packagekit/update-icon/auto_update"
+#define GPK_CONF_UPDATE_BATTERY			"/apps/gnome-packagekit/update-icon/update_battery"
+#define GPK_CONF_BANNED_FIRMWARE		"/apps/gnome-packagekit/update-icon/banned_firmware"
+#define GPK_CONF_IGNORED_MESSAGES		"/apps/gnome-packagekit/update-icon/ignored_messages"
 #define GPK_CONF_APPLICATION_FILTER_BASENAME	"/apps/gnome-packagekit/application/filter_basename"
 #define GPK_CONF_APPLICATION_FILTER_NEWEST	"/apps/gnome-packagekit/application/filter_newest"
 #define GPK_CONF_APPLICATION_CATEGORY_GROUPS	"/apps/gnome-packagekit/application/category_groups"
 #define GPK_CONF_APPLICATION_SEARCH_MODE	"/apps/gnome-packagekit/application/search_mode"
 #define GPK_CONF_UPDATE_VIEWER_MOBILE_BBAND	"/apps/gnome-packagekit/update-viewer/notify_mobile_connection"
-#define GPK_CONF_IGNORED_MESSAGES		"/apps/gnome-packagekit/ignored_messages"
-
-#define GPK_CONF_ENABLE_FONT_HELPER		"/apps/gnome-packagekit/enable_font_helper"
-#define GPK_CONF_ENABLE_CODEC_HELPER		"/apps/gnome-packagekit/enable_codec_helper"
-#define GPK_CONF_ENABLE_MIME_TYPE_HELPER	"/apps/gnome-packagekit/enable_mime_type_helper"
-#define GPK_CONF_ENABLE_CHECK_FIRMWARE		"/apps/gnome-packagekit/enable_check_firmware"
-#define GPK_CONF_ENABLE_CHECK_HARDWARE		"/apps/gnome-packagekit/enable_check_hardware"
 
 #define GPK_BUGZILLA_URL			"https://bugs.freedesktop.org/";