auto-import changelog data from gnome-panel-2.6.0-9.src.rpmgnome-panel-2_6_0-9

Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-9
- Install battstat on the default panel on ppc too
Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-8
- Only put the battstat applet on the default panel on ix86 (i.e. the
    platforms where apmd is built) - bug #121098
Thu Apr 15 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-7
- Fix typo with laptop battery detection scriptlet - bug #120921
Thu Apr 15 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-6
- Overwrite panel-compatibility.schemas with
    redhat-panel-backwards-compat-config.schemas and install that so it
    doesn't seem like we've forgotten panel-compatibility.schemas
Thu Apr 08 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-5
- Fix problem with apm detection in %post on machines whose APM bios
    doesn't have battery lifetime support
Wed Apr 07 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-4
- Add patch to make the applications list in the run dialog work correctly
    with the new vfs menu module. Bug #118305.
Mon Apr 05 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-3
- Fix "vailed to parse hour_format" warnings on install (bug #119956)
Mon Apr 05 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-2
- Add patches to fixup how we install the default setup
- Require GConf2-2.6.0-2 for gconftool-2 --load fix
Wed Mar 31 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-1
- Update to 2.6.0

4 files changed, 300 insertions, 128 deletions

diff --git a/.cvsignore b/.cvsignore
index bc8531c..9816c75 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.5.92.tar.bz2
+gnome-panel-2.6.0.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 47536eb..3a8587b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -15,8 +15,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.5.92
-Release: 1
+Version: 2.6.0
+Release: 9
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source2: redhat-panel-default-setup.entries
@@ -33,7 +33,7 @@ Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-keyring
 
 Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm
-Prereq: GConf2 >= 2.3.3
+Prereq: GConf2 >= 2.6.0-2
 Prereq: scrollkeeper
 
 BuildRequires: intltool
@@ -54,6 +54,7 @@ BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: libtool automake autoconf
 BuildRequires: gnome-keyring-devel
 
+Patch1: gnome-panel-2.6.0-use-correct-applications-uri.patch
 ## http://bugzilla.gnome.org/show_bug.cgi?id=85723
 Patch2: gnome-panel-2.3.6.2-pager-rows.patch
 Patch3: gnome-panel-2.3.6.2-clock-date.patch
@@ -65,6 +66,11 @@ Patch8: gnome-panel-2.1.90.1-no-fortune.patch
 # on NFS.  See Gnome.org Bug #
 Patch9: gnome-panel-2.5.3.1-lockf.patch
 
+## Will be in 2.6.1
+Patch10: gnome-panel-2.6.0-apply-schemas-to-default-setup.patch
+Patch11: gnome-panel-2.6.0-load-default-setup.patch
+Patch12: gnome-panel-2.6.0-invalid-clock-format.patch
+
 %description
 
 The GNOME panel provides the window list, workspace switcher, menus, and other 
@@ -85,10 +91,9 @@ Panel Applets using the libpanel-applet library.
 %prep
 %setup -q
 
-cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
-
 #(cd po && tar xzvf %{SOURCE5} )
 
+%patch1 -p1 -b .use-correct-applications-uri
 %patch2 -p1 -b .pager-rows
 %patch3 -p1 -b .clock-seconds
 %patch4 -p1 -b .default-menu-flags
@@ -97,6 +102,13 @@ cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 %patch8 -p1 -b .no-fortune
 %patch9 -p1 -b .lockf
 
+%patch10 -p1 -b .apply-schemas-to-default-setup
+%patch11 -p1 -b .load-default-setup
+%patch12 -p1 -b .invalid-clock-format
+
+cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
+cp -f %{SOURCE4} gnome-panel/panel-compatibility.schemas
+
 ## use the main menu icon in the menu bar
 perl -pi -e 's/PANEL_STOCK_GNOME_LOGO/PANEL_STOCK_MAIN_MENU/g' gnome-panel/menu.c gnome-panel/panel-menu-bar.c
 
@@ -122,9 +134,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 ## install battstat schemas
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries
 
-## install backwards compat schemas
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
-
 ## blow away stuff we don't want
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
@@ -136,25 +145,37 @@ grep -q '/usr/share/locale' %{gettext_package}.lang || exit 1
 rm -rf $RPM_BUILD_ROOT
 
 %post
+#
+# The applet needs apmd which is only build on ix86
+# Need to figure out what to do here with ACPI when APM is off
+#
+%ifarch %{ix86} ppc
 apm=false
 if [ -f /proc/apm ]; then
-  mins=`cat /proc/apm|awk '{ print $8 }'`
-  if [ "$mins" != "-1" ]; then
+  # Battery present if top bits are unset
+  flag=$(cat /proc/apm | cut -d ' ' -f 6 | sed 's/0x\([0-9a-f]\)[0-9a-f]/\1/')
+  if [ "$flag" == "0" ]; then
     apm=true
   fi
 fi
+%endif
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel
-SCHEMAS="panel-global.schemas panel-general.schemas panel-toplevel.schemas panel-object.schemas gnome-panel-screenshot.schemas clock.schemas fish.schemas window-list.schemas workspace-switcher.schemas redhat-panel-backwards-compat-config.schemas"
+
+SCHEMAS="panel-global.schemas panel-general.schemas panel-toplevel.schemas panel-object.schemas gnome-panel-screenshot.schemas clock.schemas fish.schemas window-list.schemas workspace-switcher.schemas panel-compatibility.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /apps/panel
+
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries
+gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default
+
 if [ "$apm" = "true" ]; then
   gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries
+  gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries /apps/panel/profiles/default/applets/battstat_applet
 fi
+
 /sbin/ldconfig
 
 %postun
@@ -189,6 +210,39 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-9
+- Install battstat on the default panel on ppc too
+
+* Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-8
+- Only put the battstat applet on the default panel on ix86 (i.e. the
+  platforms where apmd is built) - bug #121098
+
+* Thu Apr 15 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-7
+- Fix typo with laptop battery detection scriptlet - bug #120921
+
+* Thu Apr 15 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-6
+- Overwrite panel-compatibility.schemas with
+  redhat-panel-backwards-compat-config.schemas and install that so
+  it doesn't seem like we've forgotten panel-compatibility.schemas
+
+* Thu Apr  8 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-5
+- Fix problem with apm detection in %post on machines whose
+  APM bios doesn't have battery lifetime support
+
+* Wed Apr  7 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-4
+- Add patch to make the applications list in the run dialog work
+  correctly with the new vfs menu module. Bug #118305.
+
+* Mon Apr  5 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-3
+- Fix "vailed to parse hour_format" warnings on install (bug #119956)
+
+* Fri Apr  5 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-2
+- Add patches to fixup how we install the default setup
+- Require GConf2-2.6.0-2 for gconftool-2 --load fix
+
+* Wed Mar 31 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-1
+- Update to 2.6.0
+
 * Wed Mar 10 2004 Mark McLoughlin <markmc@redhat.com>
 - Update to 2.5.92
 
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 0a3b2bd..bd7749c 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -1,11 +1,11 @@
 <gconfentryfile>
 
-  <entrylist base="/apps/panel/default_setup/general">
+  <entrylist base="/apps/panel/default_setup">
 
     <!-- List of toplevels -->
 
     <entry>
-      <key>toplevel_id_list</key>
+      <key>general/toplevel_id_list</key>
       <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
       <value>
         <list type="string">
@@ -19,7 +19,7 @@
     <!-- List of objects -->
 
     <entry>
-      <key>object_id_list</key>
+      <key>general/object_id_list</key>
       <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>
       <value>
         <list type="string">
@@ -47,10 +47,11 @@
         </list>
       </value>
     </entry>
+
     <!-- List of applets -->
 
     <entry>
-      <key>applet_id_list</key>
+      <key>general/applet_id_list</key>
       <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
       <value>
         <list type="string">
@@ -76,597 +77,714 @@
       </value>
     </entry>
 
-  </entrylist>
+    <entry><key>general/enable_program_list</key><schema_key>/schemas/apps/panel/general/enable_program_list</schema_key></entry>
+    <entry><key>general/show_program_list</key><schema_key>/schemas/apps/panel/general/show_program_list</schema_key></entry>
 
   <!-- Bottom Panel -->
 
-  <entrylist base="/apps/panel/default_setup/toplevels/bottom_panel">
     <entry>
-      <key>name</key>
+      <key>toplevels/bottom_panel/name</key>
       <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
       <value>
         <string>Bottom Panel</string>
       </value>
     </entry>
     <entry>
-      <key>expand</key>
+      <key>toplevels/bottom_panel/expand</key>
       <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>orientation</key>
+      <key>toplevels/bottom_panel/orientation</key>
       <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
       <value>
         <string>bottom</string>
       </value>
     </entry>
     <entry>
-      <key>size</key>
+      <key>toplevels/bottom_panel/size</key>
       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
       <value>
         <int>48</int>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>toplevels/bottom_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
+    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
 
   <!-- Main Menu -->
   
-  <entrylist base="/apps/panel/default_setup/objects/main_menu">
     <entry>
-      <key>object_type</key>
+      <key>objects/main_menu/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>menu-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/main_menu/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/main_menu/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>0</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/main_menu/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/main_menu/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
-  </entrylist>
-        
+
+    <entry><key>objects/main_menu/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
+    <entry><key>objects/main_menu/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
+    <entry><key>objects/main_menu/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
+    <entry><key>objects/main_menu/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
+    <entry><key>objects/main_menu/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
+    <entry><key>objects/main_menu/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
+    <entry><key>objects/main_menu/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
+    <entry><key>objects/main_menu/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
+    <entry><key>objects/main_menu/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
+    <entry><key>objects/main_menu/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
+    <entry><key>objects/main_menu/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
+    <entry><key>objects/main_menu/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
+    <entry><key>objects/main_menu/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
+    <entry><key>objects/main_menu/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
+    <entry><key>objects/main_menu/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+    <entry><key>objects/main_menu/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
+    <entry><key>objects/main_menu/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
+    <entry><key>objects/main_menu/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
+    <entry><key>objects/main_menu/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
+    <entry><key>objects/main_menu/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+
   <!-- Web Launcher -->
 
-  <entrylist base="/apps/panel/default_setup/objects/web_launcher">
     <entry>
-      <key>object_type</key>
+      <key>objects/web_launcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>launcher-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/web_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/web_launcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>1</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/web_launcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/web_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>launcher_location</key>
+      <key>objects/web_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
         <string>applications:///Internet/redhat-web.desktop</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>objects/web_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/web_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/web_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/web_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/web_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/web_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/web_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/web_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Email Launcher -->
 
-  <entrylist base="/apps/panel/default_setup/objects/email_launcher">
     <entry>
-      <key>object_type</key>
+      <key>objects/email_launcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>launcher-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/email_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/email_launcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>2</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/email_launcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/email_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>launcher_location</key>
+      <key>objects/email_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
         <string>applications:///Internet/redhat-email.desktop</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/email_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/email_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/email_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Wordprocessor Launcher -->
 
-  <entrylist base="/apps/panel/default_setup/objects/wordprocessor_launcher">
     <entry>
-      <key>object_type</key>
+      <key>objects/wordprocessor_launcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>launcher-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/wordprocessor_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/wordprocessor_launcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>3</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/wordprocessor_launcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/wordprocessor_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>launcher_location</key>
+      <key>objects/wordprocessor_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
         <string>applications:///Office/redhat-word-processor.desktop</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>objects/wordprocessor_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/wordprocessor_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/wordprocessor_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/wordprocessor_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/wordprocessor_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/wordprocessor_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/wordprocessor_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/wordprocessor_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Presentation Launcher -->
 
-  <entrylist base="/apps/panel/default_setup/objects/presentation_launcher">
     <entry>
-      <key>object_type</key>
+      <key>objects/presentation_launcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>launcher-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/presentation_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/presentation_launcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>4</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/presentation_launcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/presentation_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>launcher_location</key>
+      <key>objects/presentation_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
         <string>applications:///Office/redhat-presentations.desktop</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>objects/presentation_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/presentation_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/presentation_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/presentation_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/presentation_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/presentation_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/presentation_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/presentation_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Spreadsheet Launcher -->
 
-  <entrylist base="/apps/panel/default_setup/objects/spreadsheet_launcher">
     <entry>
-      <key>object_type</key>
+      <key>objects/spreadsheet_launcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>launcher-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/spreadsheet_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/spreadsheet_launcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>5</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/spreadsheet_launcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/spreadsheet_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>launcher_location</key>
+      <key>objects/spreadsheet_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
         <string>applications:///Office/redhat-spreadsheet.desktop</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>objects/spreadsheet_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/spreadsheet_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/spreadsheet_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/spreadsheet_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/spreadsheet_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/spreadsheet_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/spreadsheet_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/spreadsheet_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Print Launcher -->
 
-  <entrylist base="/apps/panel/default_setup/objects/print_launcher">
     <entry>
-      <key>object_type</key>
+      <key>objects/print_launcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>launcher-object</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>objects/print_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>objects/print_launcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>6</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>objects/print_launcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>objects/print_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>launcher_location</key>
+      <key>objects/print_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
         <string>applications:///Accessories/redhat-print.desktop</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>objects/print_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/print_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/print_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/print_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/print_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/print_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/print_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/print_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Workspace Switcher Applet -->
 
-  <entrylist base="/apps/panel/default_setup/applets/workspace_switcher">
     <entry>
-      <key>object_type</key>
+      <key>applets/workspace_switcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>applets/workspace_switcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>applets/workspace_switcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>7</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>applets/workspace_switcher/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>applets/workspace_switcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid_type</schema_key>
+      <key>applets/workspace_switcher/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
         <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
       </value>
     </entry>
-  </entrylist>
 
-  
+    <entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
   <!-- Window List Applet -->
 
-  <entrylist base="/apps/panel/default_setup/applets/window_list">
     <entry>
-      <key>object_type</key>
+      <key>applets/window_list/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>applets/window_list/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>applets/window_list/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>8</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>applets/window_list/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>applets/window_list/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid_type</schema_key>
+      <key>applets/window_list/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
         <string>OAFIID:GNOME_WindowListApplet</string>
       </value>
     </entry>
-  </entrylist>
+
+    <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Mixer Applet -->
 
-  <entrylist base="/apps/panel/default_setup/applets/mixer">
     <entry>
-      <key>object_type</key>
+      <key>applets/mixer/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>applets/mixer/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>applets/mixer/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>-1</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>applets/mixer/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>applets/mixer/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid_type</schema_key>
+      <key>applets/mixer/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
         <string>OAFIID:GNOME_MixerApplet</string>
       </value>
     </entry>
-  </entrylist>
-  
+
+    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
   <!-- System Tray Applet -->
 
-  <entrylist base="/apps/panel/default_setup/applets/systray">
     <entry>
-      <key>object_type</key>
+      <key>applets/systray/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>applets/systray/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>applets/systray/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>-2</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>applets/systray/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>applets/systray/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid_type</schema_key>
+      <key>applets/systray/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
         <string>OAFIID:GNOME_SystemTrayApplet</string>
       </value>
     </entry>
-  </entrylist>
-  
+
+    <entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
   <!-- Clock Applet -->
 
-  <entrylist base="/apps/panel/default_setup/applets/clock">
     <entry>
-      <key>object_type</key>
+      <key>applets/clock/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>toplevel_id</key>
+      <key>applets/clock/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>position</key>
+      <key>applets/clock/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>-4</int>
       </value>
     </entry>
     <entry>
-      <key>panel_right_stick</key>
+      <key>applets/clock/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>locked</key>
+      <key>applets/clock/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid_type</schema_key>
+      <key>applets/clock/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
         <string>OAFIID:GNOME_ClockApplet</string>
       </value>
     </entry>
+
+    <entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
   </entrylist>
  
 </gconfentryfile>
diff --git a/sources b/sources
index 4afaeb5..c4e7be1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45ea61a1cc2010c1c1322c6f9bb9eb09  gnome-panel-2.5.92.tar.bz2
+9e0ad03c9266d342b99837ca4e947b55  gnome-panel-2.6.0.tar.bz2