--- a/ChangeLog	Tue Oct 23 23:50:36 2007 +0000
+++ b/ChangeLog	Wed Oct 24 00:04:15 2007 +0000
@@ -1,3 +1,9 @@
+2007-10-24  Glynn Foster  <[email protected]>
+
+	* base-specs/gnome-panel.spec,
+         patches/gnome-panel-01-default-setup-indiana.diff: Fix panel launchers
+        so they now point at thunderbird and firefox.
+
 2007-10-24  Glynn Foster  <[email protected]>
 
 	* patches/gdm-01-indiana-branding.diff: Update so we use the Indiana

--- a/base-specs/gnome-panel.spec	Tue Oct 23 23:50:36 2007 +0000
+++ b/base-specs/gnome-panel.spec	Wed Oct 24 00:04:15 2007 +0000
@@ -28,6 +28,9 @@
 # date:2003-05-30 type:branding owner:gman
 Patch1:		gnome-panel-01-default-setup.diff
 %endif
+%if %option_with_indiana_branding
+Patch1:		gnome-panel-01-default-setup-indiana.diff
+%endif
 # date:2004-09-30 type:branding owner:mattman 
 Patch2:		gnome-panel-02-fish-applet.diff
 # date:2004-10-18 type:feature bugster:4984097 owner:mattman 
@@ -109,9 +112,7 @@
 # bugster 6486542,6346647,6444413,6399297 bugzilla 404898,402399,411097
 sh -x %SOURCE5 --disable-gnu-extensions --disable-sun-linguas
 
-%if %option_with_sun_branding
 %patch1 -p1
-%endif
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-panel-01-default-setup-indiana.diff	Wed Oct 24 00:04:15 2007 +0000
@@ -0,0 +1,21 @@
+diff -urN gnome-panel-2.20.0.1/gnome-panel/panel-default-setup.entries gnome-panel-2.20.0.1-hacked/gnome-panel/panel-default-setup.entries
+--- gnome-panel-2.20.0.1/gnome-panel/panel-default-setup.entries	2007-09-19 01:56:51.000000000 +1200
++++ gnome-panel-2.20.0.1-hacked/gnome-panel/panel-default-setup.entries	2007-10-24 13:03:15.159199000 +1300
+@@ -262,7 +262,7 @@
+       <key>objects/browser_launcher/launcher_location</key>
+       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+       <value>
+-        <string>epiphany.desktop</string>
++        <string>firefox.desktop</string>
+       </value>
+     </entry>
+ 
+@@ -316,7 +316,7 @@
+       <key>objects/email_launcher/launcher_location</key>
+       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+       <value>
+-        <string>evolution.desktop</string>
++        <string>thunderbird.desktop</string>
+       </value>
+     </entry>
+