patches/gnome-panel-01-default-setup-indiana.diff
changeset 15139 86ed401f0f51
parent 15012 ca6b39b26bc7
child 16014 657275c2abd8
--- a/patches/gnome-panel-01-default-setup-indiana.diff	Wed Feb 18 10:44:34 2009 +0000
+++ b/patches/gnome-panel-01-default-setup-indiana.diff	Wed Feb 18 11:02:57 2009 +0000
@@ -1,6 +1,6 @@
-diff -rup gnome-panel-2.24.2/gnome-panel/panel-default-setup.entries gnome-panel-2.24.2-new/gnome-panel/panel-default-setup.entries
---- gnome-panel-2.24.2/gnome-panel/panel-default-setup.entries	2008-11-25 13:02:15.000000000 +0000
-+++ gnome-panel-2.24.2-new/gnome-panel/panel-default-setup.entries	2009-01-28 14:33:15.645455454 +0000
+/jds/bin/diff -uprN gnome-panel-2.25.91.old/gnome-panel/panel-default-setup.entries gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries
+--- gnome-panel-2.25.91.old/gnome-panel/panel-default-setup.entries	2009-02-18 12:21:51.516708000 +0000
++++ gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries	2009-02-18 12:43:49.436966000 +0000
 @@ -30,11 +30,20 @@
              <string>menu_bar</string>
            </value>
@@ -22,7 +22,7 @@
          </list>
        </value>
      </entry>
-@@ -47,7 +59,7 @@
+@@ -47,7 +56,7 @@
        <value>
          <list type="string">
            <value>
@@ -30,8 +30,8 @@
 +            <string>netstatus_applet</string>
            </value>
            <value>
-             <string>mixer</string>
-@@ -67,6 +79,9 @@
+             <string>clock</string>
+@@ -64,6 +73,9 @@
            <value>
              <string>workspace_switcher</string>
            </value>
@@ -41,7 +41,7 @@
          </list>
        </value>
      </entry>
-@@ -91,7 +106,7 @@
+@@ -88,7 +100,7 @@
        <key>toplevels/top_panel/size</key>
        <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
        <value>
@@ -50,7 +50,7 @@
        </value>
      </entry>
  
-@@ -111,13 +126,37 @@
+@@ -108,13 +120,37 @@
      <entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
      <entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
      <entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
@@ -60,12 +60,14 @@
 +      <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
 +      <value>
 +        <string>image</string>
-+      </value>
++     </value>
 +    </entry>
      <entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
      <entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
 -    <entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
 -    <entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
+-    <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
+-    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
 +    <entry>
 +      <key>toplevels/top_panel/background/image</key>
 +      <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
@@ -78,8 +80,6 @@
 +        <bool>true</bool>
 +      </value>
 +    </entry>
--    <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
--    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
 +     <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
 +      <value>
 +        <bool>true</bool>
@@ -93,7 +93,7 @@
  
    <!-- Bottom Panel -->
  
-@@ -139,7 +174,7 @@
+@@ -136,7 +172,7 @@
        <key>toplevels/bottom_panel/size</key>
        <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
        <value>
@@ -102,7 +102,7 @@
        </value>
      </entry>
      <entry>
-@@ -165,13 +200,37 @@
+@@ -162,13 +198,37 @@
      <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>
@@ -118,6 +118,8 @@
      <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>
 +    <entry>
 +      <key>toplevels/bottom_panel/background/image</key>
 +      <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
@@ -130,8 +132,6 @@
 +        <bool>true</bool>
 +      </value>
 +    </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>
 +    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
 +      <value>
 +        <bool>true</bool>
@@ -145,7 +145,7 @@
  
    <!-- Menu Bar -->
  
-@@ -221,6 +276,60 @@
+@@ -218,6 +278,60 @@
      <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>
  
@@ -206,7 +206,7 @@
    <!-- Browser Launcher -->
  
      <entry>
-@@ -241,7 +350,7 @@
+@@ -238,7 +352,7 @@
        <key>objects/browser_launcher/position</key>
        <schema_key>/schemas/apps/panel/objects/position</schema_key>
        <value>
@@ -215,7 +215,7 @@
        </value>
      </entry>
      <entry>
-@@ -262,7 +371,7 @@
+@@ -259,7 +373,7 @@
        <key>objects/browser_launcher/launcher_location</key>
        <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
        <value>
@@ -224,7 +224,7 @@
        </value>
      </entry>
  
-@@ -295,7 +404,7 @@
+@@ -292,7 +406,7 @@
        <key>objects/email_launcher/position</key>
        <schema_key>/schemas/apps/panel/objects/position</schema_key>
        <value>
@@ -233,7 +233,7 @@
        </value>
      </entry>
      <entry>
-@@ -316,7 +425,7 @@
+@@ -313,7 +427,7 @@
        <key>objects/email_launcher/launcher_location</key>
        <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
        <value>
@@ -242,7 +242,7 @@
        </value>
      </entry>
  
-@@ -329,59 +435,174 @@
+@@ -326,59 +440,174 @@
      <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>
  
@@ -302,8 +302,9 @@
 +    <entry><key>objects/ips_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 +
 +  <!-- Terminal Launcher -->
-+
-+    <entry>
+ 
+     <entry>
+-      <key>applets/window_menu/object_type</key>
 +      <key>objects/terminal_launcher/object_type</key>
 +      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
 +      <value>
@@ -356,9 +357,8 @@
 +    <entry><key>objects/terminal_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 +
 +  <!-- Netstatus Applet -->
- 
-     <entry>
--      <key>applets/window_menu/object_type</key>
++
++    <entry>
 +      <key>applets/netstatus_applet/object_type</key>
        <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
        <value>
@@ -405,15 +405,15 @@
        <value>
 -        <string>OAFIID:GNOME_WindowMenuApplet</string>
 +        <string>OAFIID:GNOME_NetstatusApplet</string>
-+      </value>
-+    </entry>
+       </value>
+     </entry>
 +    <entry>
 +      <key>applets/netstatus_applet/prefs/track_active_interface</key>
 +      <schema_key>/schemas/apps/netstatus_applet/prefs/track_active_interface</schema_key>
 +      <value>
 +        <bool>true</bool>
-       </value>
-     </entry>
++       </value>
++     </entry>
  
 -    <entry><key>applets/window_menu/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
 -    <entry><key>applets/window_menu/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
@@ -432,9 +432,9 @@
 +    <entry><key>applets/netstatus_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
 +    <entry><key>applets/netstatus_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
  
-   <!-- Mixer Applet -->
+   <!-- Clock Applet -->
  
-@@ -457,7 +735,7 @@
+@@ -400,7 +629,7 @@
        <key>applets/clock/position</key>
        <schema_key>/schemas/apps/panel/objects/position</schema_key>
        <value>
@@ -443,7 +443,7 @@
        </value>
      </entry>
      <entry>
-@@ -673,7 +951,7 @@
+@@ -616,7 +845,7 @@
        <key>applets/workspace_switcher/position</key>
        <schema_key>/schemas/apps/panel/objects/position</schema_key>
        <value>
@@ -452,7 +452,7 @@
        </value>
      </entry>
      <entry>
-@@ -707,6 +985,60 @@
+@@ -650,6 +879,60 @@
      <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>
  
@@ -513,15 +513,15 @@
    </entrylist>
  
  </gconfentryfile>
-diff -rup ../gnome-panel-2.23.92/icons/Makefile.am gnome-panel-2.23.92/icons/Makefile.am
---- ../gnome-panel-2.23.92/icons/Makefile.am	2008-09-19 15:07:03.259964571 +0200
-+++ gnome-panel-2.23.92/icons/Makefile.am	2008-09-19 15:41:48.941009279 +0200
+/jds/bin/diff -uprN gnome-panel-2.25.91.old/icons/Makefile.am gnome-panel-2.25.91/icons/Makefile.am
+--- gnome-panel-2.25.91.old/icons/Makefile.am	2009-02-18 12:21:51.813990000 +0000
++++ gnome-panel-2.25.91/icons/Makefile.am	2009-02-18 12:44:35.300855000 +0000
 @@ -7,6 +7,8 @@ gegl_DATA = 				\
  	gnome-gegl2-2.png		\
  	gnome-gegl2.png			\
  	world_map-960.png		\
 +	top-panel-image.png		\
-+	bottom-panel-image.png		\
++	bottom-panel-image.png	\
  	$(NULL)
  
  EXTRA_DIST = $(gegl_DATA)