--- a/ChangeLog	Fri Feb 06 15:54:44 2009 +0000
+++ b/ChangeLog	Mon Feb 09 02:52:58 2009 +0000
@@ -1,3 +1,11 @@
+2009-02-09  Wang Xin  <[email protected]>
+
+	Fixes doo 6322, 6345 and 6385.
+
+	* patches/gnome-panel-01-default-setup-indiana.diff:
+	* patches/gnome-panel-01-default-setup.diff:
+	* patches/gnome-panel-08-launch-menu-indiana.diff:
+
 2009-02-05  Brian Cameron  <[email protected]>
 
 	* SUNWdbus.spec: Do not package /var/run files.  They are created by

--- a/patches/gnome-panel-01-default-setup-indiana.diff	Fri Feb 06 15:54:44 2009 +0000
+++ b/patches/gnome-panel-01-default-setup-indiana.diff	Mon Feb 09 02:52:58 2009 +0000
@@ -1,7 +1,7 @@
 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
-@@ -30,11 +30,23 @@
+@@ -30,11 +30,20 @@
              <string>menu_bar</string>
            </value>
            <value>
@@ -19,9 +19,6 @@
 +          <value>
 +            <string>terminal_launcher</string>
 +          </value>
-+          <value>
-+            <string>search_launcher</string>
-+          </value>
          </list>
        </value>
      </entry>
@@ -53,7 +50,7 @@
        </value>
      </entry>
  
-@@ -111,13 +126,33 @@
+@@ -111,13 +126,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>
@@ -81,8 +78,13 @@
 +        <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/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>
++      </value>
++    </entry>
 +    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key>
 +      <value>
 +        <bool>true</bool>
@@ -100,7 +102,7 @@
        </value>
      </entry>
      <entry>
-@@ -165,13 +200,33 @@
+@@ -165,13 +200,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>
@@ -128,8 +130,13 @@
 +        <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/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>
++      </value>
++    </entry>
 +    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key>
 +      <value>
 +        <bool>true</bool>
@@ -235,7 +242,7 @@
        </value>
      </entry>
  
-@@ -329,59 +438,228 @@
+@@ -329,59 +435,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>
  
@@ -348,60 +355,6 @@
 +    <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>
 +
-+  <!-- Search Tool Launcher -->
-+
-+    <entry>
-+      <key>objects/search_launcher/object_type</key>
-+      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-+      <value>
-+        <string>launcher-object</string>
-+      </value>
-+    </entry>
-+    <entry>
-+      <key>objects/search_launcher/toplevel_id</key>
-+      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-+      <value>
-+        <string>top_panel</string>
-+      </value>
-+    </entry>
-+    <entry>
-+      <key>objects/search_launcher/position</key>
-+      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-+      <value>
-+        <int>6</int>
-+      </value>
-+    </entry>
-+    <entry>
-+      <key>objects/search_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/search_launcher/locked</key>
-+      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-+      <value>
-+        <bool>true</bool>
-+      </value>
-+    </entry>
-+    <entry>
-+      <key>objects/search_launcher/launcher_location</key>
-+      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-+      <value>
-+        <string>tracker-search-tool.desktop</string>
-+      </value>
-+    </entry>
-+
-+    <entry><key>objects/search_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-+    <entry><key>objects/search_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-+    <entry><key>objects/search_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-+    <entry><key>objects/search_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-+    <entry><key>objects/search_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-+    <entry><key>objects/search_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-+    <entry><key>objects/search_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-+    <entry><key>objects/search_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-+
 +  <!-- Netstatus Applet -->
  
      <entry>

--- a/patches/gnome-panel-01-default-setup.diff	Fri Feb 06 15:54:44 2009 +0000
+++ b/patches/gnome-panel-01-default-setup.diff	Mon Feb 09 02:52:58 2009 +0000
@@ -121,7 +121,7 @@
        </value>
      </entry>
      <entry>
-@@ -165,331 +108,304 @@
+@@ -165,331 +108,312 @@
      <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>
@@ -179,8 +179,16 @@
        </value>
      </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/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
++    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
  
 -    <entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
 -    <entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>

--- a/patches/gnome-panel-08-launch-menu-indiana.diff	Fri Feb 06 15:54:44 2009 +0000
+++ b/patches/gnome-panel-08-launch-menu-indiana.diff	Mon Feb 09 02:52:58 2009 +0000
@@ -66,15 +66,6 @@
  GtkWidget *
  create_main_menu (PanelWidget *panel)
  {
-@@ -1887,6 +1934,8 @@
- 
- 	main_menu = create_applications_menu ("applications.menu", NULL);
- 	g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
-+	g_object_set_data (G_OBJECT (main_menu), "panel-menu-needs-appending", TRUE);
-+	g_signal_connect (main_menu, "show", G_CALLBACK (applications_menu_append), NULL);
- 	/* FIXME need to update the panel on parent_set */
- 
- 	g_object_set_data (G_OBJECT (main_menu),
 diff -ur gnome-panel-2.23.90.1-orig/gnome-panel/menu.h gnome-panel-2.23.90.1/gnome-panel/menu.h
 --- gnome-panel-2.23.90.1-orig/gnome-panel/menu.h	2008-08-21 20:58:00.000000000 +0800
 +++ gnome-panel-2.23.90.1/gnome-panel/menu.h	2008-08-26 11:24:42.749333950 +0800