SOURCES: gnome-panel-no_launchers_on_panel.patch - merged from DEVEL

freetz freetz at pld-linux.org
Sun Apr 2 09:00:13 CEST 2006 

Author: freetz                       Date: Sun Apr  2 07:00:13 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SOURCES:
   gnome-panel-no_launchers_on_panel.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/gnome-panel-no_launchers_on_panel.patch
diff -u SOURCES/gnome-panel-no_launchers_on_panel.patch:1.4 SOURCES/gnome-panel-no_launchers_on_panel.patch:1.5
--- SOURCES/gnome-panel-no_launchers_on_panel.patch:1.4	Tue Sep  6 15:21:08 2005
+++ SOURCES/gnome-panel-no_launchers_on_panel.patch	Sun Apr  2 09:00:08 2006
@@ -1,12 +1,10 @@
-diff -urN gnome-panel-2.12.0.orig/gnome-panel/panel-compatibility.schemas gnome-panel-2.12.0/gnome-panel/panel-compatibility.schemas
---- gnome-panel-2.12.0.orig/gnome-panel/panel-compatibility.schemas	2005-09-06 15:14:47.749805808 +0200
-+++ gnome-panel-2.12.0/gnome-panel/panel-compatibility.schemas	2005-09-06 15:15:02.122620808 +0200
-@@ -180,15 +180,7 @@
-         <default>launcher-object</default>
- 	<locale name="C"/>
+diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-compatibility.schemas gnome-panel-2.13.90/gnome-panel/panel-compatibility.schemas
+--- gnome-panel-2.13.90.orig/gnome-panel/panel-compatibility.schemas	2003-09-05 14:35:53.000000000 +0200
++++ gnome-panel-2.13.90/gnome-panel/panel-compatibility.schemas	2006-01-27 21:40:03.374369000 +0100
+@@ -182,14 +182,6 @@
        </schema>
--     
--      <schema>
+      
+       <schema>
 -        <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/launcher_location</key>
 -        <owner>panel</owner>
 -        <type>string</type>
@@ -14,28 +12,28 @@
 -	<locale name="C"/>
 -      </schema>
 -     
-+
-       <schema>
+-      <schema>
          <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_id</key>
          <owner>panel</owner>
-@@ -220,14 +212,6 @@
-         <default>launcher-object</default>
- 	<locale name="C"/>
+         <type>string</type>
+@@ -222,14 +214,6 @@
        </schema>
--
--      <schema>
+ 
+       <schema>
 -        <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/launcher_location</key>
 -        <owner>panel</owner>
 -        <type>string</type>
 -        <default>applications:///System/gnome-terminal.desktop</default>
 -	<locale name="C"/>
 -      </schema>
-      
-       <schema>
+-     
+-      <schema>
          <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
-diff -urN gnome-panel-2.12.0.orig/gnome-panel/panel-default-setup.entries.in gnome-panel-2.12.0/gnome-panel/panel-default-setup.entries.in
---- gnome-panel-2.12.0.orig/gnome-panel/panel-default-setup.entries.in	2005-09-06 15:14:47.752805352 +0200
-+++ gnome-panel-2.12.0/gnome-panel/panel-default-setup.entries.in	2005-09-06 15:17:04.029088208 +0200
+         <owner>panel</owner>
+         <type>string</type>
+diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries gnome-panel-2.13.90/gnome-panel/panel-default-setup.entries
+--- gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries	2006-01-22 12:34:03.000000000 +0100
++++ gnome-panel-2.13.90/gnome-panel/panel-default-setup.entries	2006-01-27 21:41:51.414369000 +0100
 @@ -29,12 +29,6 @@
            <value>
              <string>menu_bar</string>
@@ -49,31 +47,179 @@
          </list>
        </value>
      </entry>
-@@ -248,13 +242,6 @@
-         <bool>true</bool>
-       </value>
-     </entry>
+@@ -211,114 +205,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>
+ 
+-  <!-- Browser Launcher -->
+-
+-    <entry>
+-      <key>objects/browser_launcher/object_type</key>
+-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+-      <value>
+-        <string>launcher-object</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/toplevel_id</key>
+-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+-      <value>
+-        <string>top_panel</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/position</key>
+-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+-      <value>
+-        <int>1</int>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+-      <value>
+-        <bool>false</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/locked</key>
+-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+-      <value>
+-        <bool>true</bool>
+-      </value>
+-    </entry>
 -    <entry>
 -      <key>objects/browser_launcher/launcher_location</key>
 -      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
 -      <value>
--        <string>@DATADIR@/applications/epiphany.desktop</string>
+-        <string>epiphany.desktop</string>
+-      </value>
+-    </entry>
+-
+-    <entry><key>objects/browser_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+-    <entry><key>objects/browser_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>objects/browser_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>objects/browser_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>objects/browser_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>objects/browser_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>objects/browser_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>objects/browser_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-
+-  <!-- Email Launcher -->
+-
+-    <entry>
+-      <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>objects/email_launcher/toplevel_id</key>
+-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+-      <value>
+-        <string>top_panel</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/position</key>
+-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+-      <value>
+-        <int>2</int>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+-      <value>
+-        <bool>false</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/locked</key>
+-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+-      <value>
+-        <bool>true</bool>
 -      </value>
 -    </entry>
- 
-     <entry><key>objects/browser_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-     <entry><key>objects/browser_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-@@ -302,13 +289,6 @@
-         <bool>true</bool>
-       </value>
-     </entry>
 -    <entry>
 -      <key>objects/email_launcher/launcher_location</key>
 -      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
 -      <value>
--        <string>@DATADIR@/applications/evolution.desktop</string>
+-        <string>evolution.desktop</string>
+-      </value>
+-    </entry>
+-
+-    <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>
+-
+   <!-- 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><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>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gnome-panel-no_launchers_on_panel.patch?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list