2008-09-19 Erwann Chenede - <
[email protected]>
* patches/gnome-panel-01-default-setup-indiana.diff
* patches/gnome-panel-01-default-setup.diff
* ext-sources/top-panel-image.png
* ext-sources/bottom-panel-image.png
* base-specs/gnome-panel.spec : added background image
for the panel in nevada and OpenSolaris.
* patches/gnome-settings-daemon-07-use-default-dpi.diff : removed
* patches/gnome-settings-daemon-07-default-dpi-and-aa.diff : added
* base-specs/gnome-settings-daemon.spec : enable
subpixel antialiasing by default 6717847
--- a/ChangeLog Fri Sep 19 14:52:18 2008 +0000
+++ b/ChangeLog Fri Sep 19 14:55:26 2008 +0000
@@ -1,3 +1,17 @@
+2008-09-19 Erwann Chenede - <[email protected]>
+
+ * patches/gnome-panel-01-default-setup-indiana.diff
+ * patches/gnome-panel-01-default-setup.diff
+ * ext-sources/top-panel-image.png
+ * ext-sources/bottom-panel-image.png
+ * base-specs/gnome-panel.spec : added background image
+ for the panel in nevada and OpenSolaris.
+
+ * patches/gnome-settings-daemon-07-use-default-dpi.diff : removed
+ * patches/gnome-settings-daemon-07-default-dpi-and-aa.diff : added
+ * base-specs/gnome-settings-daemon.spec : enable
+ subpixel antialiasing by default 6717847
+
2008-09-19 Christian Kelly <[email protected]>
* SUNWevolution-exchange.spec: Set permissions on /usr/share/doc.
--- a/base-specs/gnome-panel.spec Fri Sep 19 14:52:18 2008 +0000
+++ b/base-specs/gnome-panel.spec Fri Sep 19 14:55:26 2008 +0000
@@ -24,6 +24,8 @@
Source3: world_map-960.png
Source4: %{name}-po-sun-%{po_sun_version}.tar.bz2
Source5: l10n-configure.sh
+Source6: top-panel-image.png
+Source7: bottom-panel-image.png
%if %build_l10n
Source6: l10n-configure.sh
%endif
@@ -150,6 +152,8 @@
%patch15 -p1
cp %SOURCE3 icons
+cp %SOURCE6 icons
+cp %SOURCE7 icons
%if %option_with_sun_branding
cp %SOURCE1 icons/gnome-main-menu.png
%endif
--- a/base-specs/gnome-settings-daemon.spec Fri Sep 19 14:52:18 2008 +0000
+++ b/base-specs/gnome-settings-daemon.spec Fri Sep 19 14:55:26 2008 +0000
@@ -34,8 +34,8 @@
Patch5: gnome-settings-daemon-05-sticky-timeout.diff
# date:2008-01-24 owner:dkenny type:bug bugzilla:511733
Patch6: gnome-settings-daemon-06-xft.diff
-# date:2008-01-24 owner:erwannc type:bug bugster:146
-Patch7: gnome-settings-daemon-07-use-default-dpi.diff
+# date:2008-01-24 owner:erwannc type:bug bugzilla:146 bugster:6717847
+Patch7: gnome-settings-daemon-07-default-dpi-and-aa.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Binary file ext-sources/bottom-panel-image.png has changed
Binary file ext-sources/top-panel-image.png has changed
--- a/patches/gnome-panel-01-default-setup-indiana.diff Fri Sep 19 14:52:18 2008 +0000
+++ b/patches/gnome-panel-01-default-setup-indiana.diff Fri Sep 19 14:55:26 2008 +0000
@@ -1,6 +1,6 @@
-diff -up gnome-panel-2.23.90.1/gnome-panel/panel-default-setup.entries-clean gnome-panel-2.23.90.1/gnome-panel/panel-default-setup.entries
---- gnome-panel-2.23.90.1/gnome-panel/panel-default-setup.entries-clean 2008-08-29 11:15:44.167206732 +0100
-+++ gnome-panel-2.23.90.1/gnome-panel/panel-default-setup.entries 2008-08-29 11:18:49.460226954 +0100
+diff -rup ../gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries
+--- ../gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries 2008-09-19 15:07:03.349073659 +0200
++++ gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries 2008-09-19 15:41:19.740717368 +0200
@@ -30,11 +30,23 @@
<string>menu_bar</string>
</value>
@@ -53,7 +53,32 @@
</value>
</entry>
-@@ -139,7 +154,7 @@
+@@ -111,10 +126,22 @@
+ <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>
+- <entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
++ <entry>
++ <key>toplevels/top_panel/background/type</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
++ <value>
++ <string>image</string>
++ </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/image</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
++ <value>
++ <string>/usr/share/gnome-panel/pixmaps/top-panel-image.png</string>
++ </value>
++ </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>
+@@ -139,7 +166,7 @@
<key>toplevels/bottom_panel/size</key>
<schema_key>/schemas/apps/panel/toplevels/size</schema_key>
<value>
@@ -62,7 +87,32 @@
</value>
</entry>
<entry>
-@@ -221,6 +236,60 @@
+@@ -165,10 +192,22 @@
+ <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>
+- <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
++ <entry>
++ <key>toplevels/bottom_panel/background/type</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
++ <value>
++ <string>image</string>
++ </value>
++ </entry>
+ <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+ <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/image</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
++ <value>
++ <string>/usr/share/gnome-panel/pixmaps/bottom-panel-image.png</string>
++ </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>
+@@ -221,6 +260,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>
@@ -123,7 +173,7 @@
<!-- Browser Launcher -->
<entry>
-@@ -241,7 +310,7 @@
+@@ -241,7 +334,7 @@
<key>objects/browser_launcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
@@ -132,7 +182,7 @@
</value>
</entry>
<entry>
-@@ -262,7 +331,7 @@
+@@ -262,7 +355,7 @@
<key>objects/browser_launcher/launcher_location</key>
<schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
<value>
@@ -141,7 +191,7 @@
</value>
</entry>
-@@ -295,7 +364,7 @@
+@@ -295,7 +388,7 @@
<key>objects/email_launcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
@@ -150,7 +200,7 @@
</value>
</entry>
<entry>
-@@ -316,7 +385,7 @@
+@@ -316,7 +409,7 @@
<key>objects/email_launcher/launcher_location</key>
<schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
<value>
@@ -159,15 +209,14 @@
</value>
</entry>
-@@ -329,59 +398,228 @@
+@@ -329,59 +422,228 @@
<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 -->
+ <!-- Package Manager Launcher -->
-
- <entry>
-- <key>applets/window_menu/object_type</key>
++
++ <entry>
+ <key>objects/ips_launcher/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
@@ -328,8 +377,9 @@
+ <entry><key>objects/search_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Netstatus Applet -->
-+
-+ <entry>
+
+ <entry>
+- <key>applets/window_menu/object_type</key>
+ <key>applets/netstatus_applet/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
@@ -405,7 +455,7 @@
<!-- Mixer Applet -->
-@@ -457,7 +695,7 @@
+@@ -457,7 +719,7 @@
<key>applets/clock/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
@@ -414,7 +464,7 @@
</value>
</entry>
<entry>
-@@ -673,7 +911,7 @@
+@@ -673,7 +935,7 @@
<key>applets/workspace_switcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
@@ -423,7 +473,7 @@
</value>
</entry>
<entry>
-@@ -707,6 +945,60 @@
+@@ -707,6 +969,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>
@@ -484,4 +534,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
+@@ -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 \
+ $(NULL)
+
+ EXTRA_DIST = $(gegl_DATA)
--- a/patches/gnome-panel-01-default-setup.diff Fri Sep 19 14:52:18 2008 +0000
+++ b/patches/gnome-panel-01-default-setup.diff Fri Sep 19 14:55:26 2008 +0000
@@ -1,16 +1,6 @@
---- gnome-panel-2.23.90.old/applets/clock/clock.schemas.in 2008-08-26 09:52:16.104676000 +0100
-+++ gnome-panel-2.23.90/applets/clock/clock.schemas.in 2008-08-26 09:53:01.024184000 +0100
-@@ -18,7 +18,7 @@
- if you translate this to "24 sata" or anything else that isn't "24-hour" or
- "12-hour", things will not work.
- -->
-- 24-hour
-+ 12-hour
- </default>
- <short>Hour format</short>
- <long>
---- gnome-panel-2.23.91.old/gnome-panel/panel-default-setup.entries 2008-09-10 11:53:56.902972000 +0100
-+++ gnome-panel-2.23.91/gnome-panel/panel-default-setup.entries 2008-09-10 11:54:15.549572000 +0100
+diff -rup ../gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries
+--- ../gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries 2008-09-19 15:07:03.349073659 +0200
++++ gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries 2008-09-19 16:16:53.527790041 +0200
@@ -10,9 +10,6 @@
<value>
<list type="string">
@@ -131,55 +121,66 @@
</value>
</entry>
<entry>
-@@ -173,323 +116,284 @@
- <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>
-
+@@ -165,331 +108,304 @@
+ <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>
+- <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
+- <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+- <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>
+-
- <!-- Menu Bar -->
-+ <!-- Main Menu -->
-
+-
<entry>
- <key>objects/menu_bar/object_type</key>
-+ <key>objects/main_menu/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
++ <key>toplevels/bottom_panel/background/type</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
<value>
- <string>menu-bar</string>
-+ <string>menu-object</string>
- </value>
- </entry>
- <entry>
+- </value>
+- </entry>
+- <entry>
- <key>objects/menu_bar/toplevel_id</key>
-+ <key>objects/main_menu/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
+- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+- <value>
- <string>top_panel</string>
-+ <string>bottom_panel</string>
+- </value>
+- </entry>
+- <entry>
+- <key>objects/menu_bar/position</key>
+- <schema_key>/schemas/apps/panel/objects/position</schema_key>
+- <value>
+- <int>0</int>
+- </value>
+- </entry>
+- <entry>
+- <key>objects/menu_bar/panel_right_stick</key>
+- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+- <value>
+- <bool>false</bool>
++ <string>image</string>
</value>
</entry>
++ <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
++ <entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
<entry>
-- <key>objects/menu_bar/position</key>
-+ <key>objects/main_menu/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
+- <key>objects/menu_bar/locked</key>
+- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
++ <key>toplevels/bottom_panel/background/image</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
<value>
- <int>0</int>
+- <bool>true</bool>
++ <string>/usr/share/gnome-panel/pixmaps/bottom-panel-image.png</string>
</value>
</entry>
- <entry>
-- <key>objects/menu_bar/panel_right_stick</key>
-+ <key>objects/main_menu/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
-- <key>objects/menu_bar/locked</key>
-+ <key>objects/main_menu/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </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>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>
@@ -190,6 +191,69 @@
- <entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
- <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 -->
++ <!-- Main Menu -->
+
+ <entry>
+- <key>objects/browser_launcher/object_type</key>
++ <key>objects/main_menu/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+- <string>launcher-object</string>
++ <string>menu-object</string>
+ </value>
+ </entry>
+ <entry>
+- <key>objects/browser_launcher/toplevel_id</key>
++ <key>objects/main_menu/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+- <string>top_panel</string>
++ <string>bottom_panel</string>
+ </value>
+ </entry>
+ <entry>
+- <key>objects/browser_launcher/position</key>
++ <key>objects/main_menu/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+- <int>1</int>
++ <int>0</int>
+ </value>
+ </entry>
+ <entry>
+- <key>objects/browser_launcher/panel_right_stick</key>
++ <key>objects/main_menu/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>
++ <key>objects/main_menu/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>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>
+ <entry><key>objects/main_menu/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+ <entry><key>objects/main_menu/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+ <entry><key>objects/main_menu/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
@@ -203,11 +267,11 @@
+ <entry><key>objects/main_menu/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
+ <entry><key>objects/main_menu/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
-- <!-- Browser Launcher -->
+- <!-- Email Launcher -->
+ <!-- Clock Applet -->
<entry>
-- <key>objects/browser_launcher/object_type</key>
+- <key>objects/email_launcher/object_type</key>
+ <key>applets/clock/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
@@ -216,7 +280,7 @@
</value>
</entry>
<entry>
-- <key>objects/browser_launcher/toplevel_id</key>
+- <key>objects/email_launcher/toplevel_id</key>
+ <key>applets/clock/toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
@@ -225,15 +289,16 @@
</value>
</entry>
<entry>
-- <key>objects/browser_launcher/position</key>
+- <key>objects/email_launcher/position</key>
+ <key>applets/clock/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>1</int>
+- <int>2</int>
++ <int>1</int>
</value>
</entry>
<entry>
-- <key>objects/browser_launcher/panel_right_stick</key>
+- <key>objects/email_launcher/panel_right_stick</key>
+ <key>applets/clock/panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
<value>
@@ -241,7 +306,7 @@
</value>
</entry>
<entry>
-- <key>objects/browser_launcher/locked</key>
+- <key>objects/email_launcher/locked</key>
+ <key>applets/clock/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
@@ -249,24 +314,24 @@
</value>
</entry>
<entry>
-- <key>objects/browser_launcher/launcher_location</key>
+- <key>objects/email_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+ <key>applets/clock/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
<value>
-- <string>epiphany.desktop</string>
+- <string>evolution.desktop</string>
+ <string>OAFIID:GNOME_ClockApplet</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>
+- <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>
+ <entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+ <entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+ <entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
@@ -279,20 +344,19 @@
+ <entry><key>applets/clock/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
+ <entry><key>applets/clock/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
-- <!-- Email Launcher -->
+- <!-- Window Menu Applet -->
+ <!-- Show Desktop Applet -->
<entry>
-- <key>objects/email_launcher/object_type</key>
+- <key>applets/window_menu/object_type</key>
+ <key>applets/show_desktop/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
-- <string>launcher-object</string>
-+ <string>bonobo-applet</string>
+ <string>bonobo-applet</string>
</value>
</entry>
<entry>
-- <key>objects/email_launcher/toplevel_id</key>
+- <key>applets/window_menu/toplevel_id</key>
+ <key>applets/show_desktop/toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
@@ -301,76 +365,24 @@
</value>
</entry>
<entry>
-- <key>objects/email_launcher/position</key>
+- <key>applets/window_menu/position</key>
+ <key>applets/show_desktop/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>
-+ <key>applets/show_desktop/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
+- <int>0</int>
++ <int>2</int>
</value>
</entry>
<entry>
-- <key>objects/email_launcher/locked</key>
-- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-- <value>
+- <key>applets/window_menu/panel_right_stick</key>
++ <key>applets/show_desktop/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
- <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>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>
-- <key>applets/window_menu/object_type</key>
-- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-- <value>
-- <string>bonobo-applet</string>
-- </value>
-- </entry>
-- <entry>
-- <key>applets/window_menu/toplevel_id</key>
-- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-- <value>
-- <string>top_panel</string>
-- </value>
-- </entry>
-- <entry>
-- <key>applets/window_menu/position</key>
-- <schema_key>/schemas/apps/panel/objects/position</schema_key>
-- <value>
-- <int>0</int>
-- </value>
-- </entry>
-- <entry>
-- <key>applets/window_menu/panel_right_stick</key>
-- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-- <value>
-- <bool>true</bool>
-- </value>
-- </entry>
-- <entry>
++ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
- <key>applets/window_menu/locked</key>
+ <key>applets/show_desktop/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
@@ -561,7 +573,7 @@
<!-- Notification Area Applet -->
-@@ -504,14 +408,14 @@
+@@ -504,14 +420,14 @@
<key>applets/notification_area/toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
@@ -578,7 +590,7 @@
</value>
</entry>
<entry>
-@@ -544,168 +448,123 @@
+@@ -544,168 +460,123 @@
<entry><key>applets/notification_area/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
<entry><key>applets/notification_area/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>applets/notification_area/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
@@ -789,3 +801,18 @@
</entrylist>
+Only in gnome-panel-2.23.92/gnome-panel: panel-default-setup.entries~
+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 16:17:15.471779094 +0200
+@@ -7,6 +7,7 @@ gegl_DATA = \
+ gnome-gegl2-2.png \
+ gnome-gegl2.png \
+ world_map-960.png \
++ bottom-panel-image.png \
+ $(NULL)
+
+ EXTRA_DIST = $(gegl_DATA)
+Only in gnome-panel-2.23.92/icons: Makefile.am~
+Only in gnome-panel-2.23.92/icons: bottom-panel-image.png
+Only in gnome-panel-2.23.92/icons: top-panel-image.png
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-07-default-dpi-and-aa.diff Fri Sep 19 14:55:26 2008 +0000
@@ -0,0 +1,34 @@
+diff -rup ../gnome-settings-daemon-2.23.91/data/desktop_gnome_font_rendering.schemas.in gnome-settings-daemon-2.23.91/data/desktop_gnome_font_rendering.schemas.in
+--- ../gnome-settings-daemon-2.23.91/data/desktop_gnome_font_rendering.schemas.in 2008-09-19 16:02:38.852794484 +0200
++++ gnome-settings-daemon-2.23.91/data/desktop_gnome_font_rendering.schemas.in 2008-09-19 16:03:59.241796681 +0200
+@@ -6,6 +6,7 @@
+ <applyto>/desktop/gnome/font_rendering/dpi</applyto>
+ <owner>gnome</owner>
+ <type>float</type>
++ <default>96</default>
+ <locale name="C">
+ <short>DPI</short>
+ <long>
+@@ -19,7 +20,7 @@
+ <applyto>/desktop/gnome/font_rendering/antialiasing</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+- <default>grayscale</default>
++ <default>rgba</default>
+ <locale name="C">
+ <short>Antialiasing</short>
+ <long>
+Only in gnome-settings-daemon-2.23.91/data: desktop_gnome_font_rendering.schemas.in~
+diff -rup ../gnome-settings-daemon-2.23.91/plugins/xsettings/gsd-xsettings-manager.c gnome-settings-daemon-2.23.91/plugins/xsettings/gsd-xsettings-manager.c
+--- ../gnome-settings-daemon-2.23.91/plugins/xsettings/gsd-xsettings-manager.c 2008-09-19 16:02:38.843383015 +0200
++++ gnome-settings-daemon-2.23.91/plugins/xsettings/gsd-xsettings-manager.c 2008-09-19 16:03:21.037940093 +0200
+@@ -267,7 +267,7 @@ get_dpi_from_gconf_or_x_server (GConfCli
+ GConfValue *value;
+ double dpi;
+
+- value = gconf_client_get_without_default (client, FONT_DPI_KEY, NULL);
++ value = gconf_client_get (client, FONT_DPI_KEY, NULL);
+
+ /* If the user has ever set the DPI preference in GConf, we use that.
+ * Otherwise, we see if the X server reports a reasonable DPI value: some X
+Only in gnome-settings-daemon-2.23.91/plugins/xsettings: gsd-xsettings-manager.c.orig
--- a/patches/gnome-settings-daemon-07-use-default-dpi.diff Fri Sep 19 14:52:18 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -x '*.*~' -rup ../gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in
---- ../gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in 2008-07-08 22:11:42.193135824 +0200
-+++ gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in 2008-07-08 22:13:17.821803625 +0200
-@@ -6,6 +6,7 @@
- <applyto>/desktop/gnome/font_rendering/dpi</applyto>
- <owner>gnome</owner>
- <type>float</type>
-+ <default>96</default>
- <locale name="C">
- <short>DPI</short>
- <long>
-diff -x '*.*~' -rup ../gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c
---- ../gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c 2008-07-08 22:11:42.199879692 +0200
-+++ gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c 2008-07-08 22:12:41.357744656 +0200
-@@ -238,7 +238,7 @@ get_dpi_from_gconf_or_x_server (GConfCli
- GConfValue *value;
- double dpi;
-
-- value = gconf_client_get_without_default (client, FONT_DPI_KEY, NULL);
-+ value = gconf_client_get (client, FONT_DPI_KEY, NULL);
-
- /* If the user has ever set the DPI preference in GConf, we use that.
- * Otherwise, we see if the X server reports a reasonable DPI value: some X
