- updated for gnome-panel-2.6.2

[packages/gnome-panel.git] / gnome-panel-no_launchers_on_panel.patch

diff --git a/gnome-panel-no_launchers_on_panel.patch b/gnome-panel-no_launchers_on_panel.patch
index 9e36d47eabb9cec797f7426b7abf5e77c3f0b824..f78503cedd745a8cf5cf7f0a47a5e8da6a852a9d 100644 (file)
--- a/gnome-panel-no_launchers_on_panel.patch
+++ b/gnome-panel-no_launchers_on_panel.patch
@@ -1,6 +1,6 @@
-diff -aurN gnome-panel-2.4.0.orig/gnome-panel/panel-compatibility.schemas gnome-panel-2.4.0/gnome-panel/panel-compatibility.schemas
---- gnome-panel-2.4.0.orig/gnome-panel/panel-compatibility.schemas     2003-09-05 15:22:02.000000000 +0200
-+++ gnome-panel-2.4.0/gnome-panel/panel-compatibility.schemas  2003-10-01 23:53:03.202850264 +0200
+diff -urN aa/gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas
+--- aa/gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas       2003-09-05 14:35:53.000000000 +0200
++++ gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas  2004-04-20 00:03:54.872682832 +0200
 @@ -182,14 +182,6 @@
        </schema>
       
@@ -31,9 +31,9 @@ diff -aurN gnome-panel-2.4.0.orig/gnome-panel/panel-compatibility.schemas gnome-
       
        <schema>
          <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
-diff -aurN gnome-panel-2.4.0.orig/gnome-panel/panel-default-setup.entries gnome-panel-2.4.0/gnome-panel/panel-default-setup.entries
---- gnome-panel-2.4.0.orig/gnome-panel/panel-default-setup.entries     2003-07-01 16:25:01.000000000 +0200
-+++ gnome-panel-2.4.0/gnome-panel/panel-default-setup.entries  2003-10-01 23:54:41.656882976 +0200
+diff -urN aa/gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries
+--- aa/gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries       2004-04-02 19:05:41.000000000 +0200
++++ gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries  2004-04-20 00:05:32.229882288 +0200
 @@ -29,12 +29,6 @@
            <value>
              <string>menu_bar</string>
@@ -47,104 +47,118 @@ diff -aurN gnome-panel-2.4.0.orig/gnome-panel/panel-default-setup.entries gnome-
          </list>
        </value>
      </entry>
-@@ -176,100 +170,6 @@
-     </entry>
-   </entrylist>
+@@ -223,114 +217,6 @@
+     <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+     <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
  
 -  <!-- Nautilus Launcher -->
 -
--  <entrylist base="/apps/panel/default_setup/objects/nautilus_launcher">
 -    <entry>
--      <key>object_type</key>
+-      <key>objects/nautilus_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/nautilus_launcher/toplevel_id</key>
 -      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
 -      <value>
 -        <string>top_panel</string>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>position</key>
+-      <key>objects/nautilus_launcher/position</key>
 -      <schema_key>/schemas/apps/panel/objects/position</schema_key>
 -      <value>
 -        <int>1</int>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>panel_right_stick</key>
--      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+-      <key>objects/nautilus_launcher/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
 -      <value>
 -        <bool>false</bool>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>locked</key>
+-      <key>objects/nautilus_launcher/locked</key>
 -      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
 -      <value>
 -        <bool>true</bool>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>launcher_location</key>
+-      <key>objects/nautilus_launcher/launcher_location</key>
 -      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
 -      <value>
 -        <string>applications:///nautilus.desktop</string>
 -      </value>
 -    </entry>
--  </entrylist>
+-
+-    <entry><key>objects/nautilus_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+-    <entry><key>objects/nautilus_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>objects/nautilus_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>objects/nautilus_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>objects/nautilus_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>objects/nautilus_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>objects/nautilus_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>objects/nautilus_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 -
 -  <!-- Terminal Launcher -->
 -
--  <entrylist base="/apps/panel/default_setup/objects/terminal_launcher">
 -    <entry>
--      <key>object_type</key>
+-      <key>objects/terminal_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/terminal_launcher/toplevel_id</key>
 -      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
 -      <value>
 -        <string>top_panel</string>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>position</key>
+-      <key>objects/terminal_launcher/position</key>
 -      <schema_key>/schemas/apps/panel/objects/position</schema_key>
 -      <value>
 -        <int>2</int>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>panel_right_stick</key>
--      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+-      <key>objects/terminal_launcher/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
 -      <value>
 -        <bool>false</bool>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>locked</key>
+-      <key>objects/terminal_launcher/locked</key>
 -      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
 -      <value>
 -        <bool>true</bool>
 -      </value>
 -    </entry>
 -    <entry>
--      <key>launcher_location</key>
+-      <key>objects/terminal_launcher/launcher_location</key>
 -      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
 -      <value>
 -        <string>applications:///System/gnome-terminal.desktop</string>
 -      </value>
 -    </entry>
--  </entrylist>
+-
+-    <entry><key>objects/terminal_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+-    <entry><key>objects/terminal_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>objects/terminal_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>objects/terminal_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>objects/terminal_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>objects/terminal_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>objects/terminal_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>objects/terminal_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 -
    <!-- Window Menu Applet -->
  
-   <entrylist base="/apps/panel/default_setup/applets/window_menu">
+     <entry>