- merged from DEVEL

Changed files:
    gnome-panel-no_launchers_on_panel.patch -> 1.6

diff --git a/gnome-panel-no_launchers_on_panel.patch b/gnome-panel-no_launchers_on_panel.patch
index a12f491aa7f1b13d7eb55cc589fca4cbff7dada7..826efb10f2cab28aa4bd110bc2d2f93dec247319 100644 (file)
--- a/gnome-panel-no_launchers_on_panel.patch
+++ b/gnome-panel-no_launchers_on_panel.patch
@@ -161,65 +161,4 @@ diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries gnom
 -
    <!-- Window Menu Applet -->
  
-     <entry>
-@@ -373,60 +259,6 @@
-     <entry><key>applets/window_menu/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-     <entry><key>applets/window_menu/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
- 
--  <!-- Mixer Applet -->
--
--    <entry>
--      <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>applets/mixer/toplevel_id</key>
--      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
--      <value>
--        <string>top_panel</string>
--      </value>
--    </entry>
--    <entry>
--      <key>applets/mixer/position</key>
--      <schema_key>/schemas/apps/panel/objects/position</schema_key>
--      <value>
--        <int>1</int>
--      </value>
--    </entry>
--    <entry>
--      <key>applets/mixer/panel_right_stick</key>
--      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
--      <value>
--        <bool>true</bool>
--      </value>
--    </entry>
--    <entry>
--      <key>applets/mixer/locked</key>
--      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
--      <value>
--        <bool>true</bool>
--      </value>
--    </entry>
--    <entry>
--      <key>applets/mixer/bonobo_iid</key>
--      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
--      <value>
--        <string>OAFIID:GNOME_MixerApplet</string>
--      </value>
--    </entry>
--
--    <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>
--
-   <!-- Clock Applet -->
- 
      <entry>