- Remove hacks to add battery applet to default panel configuration wheregnome-panel-2_12_0-3

    ACPI/APM is available (#169621) and GIMLET in CJK locales (#169430)

1 files changed, 22 insertions, 59 deletions

diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index e3942a1..ddc751e 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -53,11 +53,28 @@
     <entry>
       <key>general/applet_id_list</key>
       <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
-
-      <!-- We pull the value from the schema default so that we can
-           add gimlet in certain locales
-           See add-gimlet-for-cjk.xsl -->
-
+      <value>
+        <list type="string">
+          <value>
+            <string>mixer</string>
+          </value>
+          <value>
+            <string>clock</string>
+          </value>
+          <value>
+            <string>systray</string>
+          </value>
+          <value>
+            <string>show_desktop_button</string>
+          </value>
+          <value>
+            <string>window_list</string>
+          </value>
+          <value>
+            <string>workspace_switcher</string>
+          </value>
+        </list>
+      </value>
     </entry>
 
   <!-- Top Panel -->
@@ -644,60 +661,6 @@
     <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>
 
-    <!-- GIMLET -->
-
-    <entry>
-      <key>applets/gimlet/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gimlet/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gimlet/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>3</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gimlet/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gimlet/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gimlet/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_imswitcher</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/gimlet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/gimlet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/gimlet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/gimlet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/gimlet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/gimlet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/gimlet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/gimlet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
   <!-- Show Desktop Applet -->
 
     <entry>