* SUNWgnome-applets.spec: Add back mixer applet files, after bumping
of gnome-applets to 2.25.90
* base-specs/gnome-panel.spec : Bump to 2.25.91
* patches/gnome-panel-01-default-setup-indiana.diff : Re-Apply
* patches/gnome-panel-01-default-setup.diff : Re-Apply
--- a/ChangeLog Wed Feb 18 10:44:34 2009 +0000
+++ b/ChangeLog Wed Feb 18 11:02:57 2009 +0000
@@ -1,10 +1,21 @@
+2009-02-18 Matt Keenan <[email protected]>
+
+ * SUNWgnome-applets.spec: Add back mixer applet files, after bumping
+ of gnome-applets to 2.25.90
+ * base-specs/gnome-panel.spec : Bump to 2.25.91
+ * patches/gnome-panel-01-default-setup-indiana.diff : Re-Apply
+ * patches/gnome-panel-01-default-setup.diff : Re-Apply
+
2009-02-18 Ke Wang <[email protected]>
+
* SUNWPython26.spec: Add the missing %patch14 -p1
2009-02-18 Ke Wang <[email protected]>
+
* base-specs/libsoup.spec: Bump to 2.25.91
2009-02-18 Ke Wang <[email protected]>
+
* patches/Python26-14-ctypes-util-find-library.diff: Added.
* SUNWPython26.spec: Add patch 14 to make ctypes.util.find_library use
crle instead of ldconfig
--- a/SUNWgnome-applets.spec Wed Feb 18 10:44:34 2009 +0000
+++ b/SUNWgnome-applets.spec Wed Feb 18 11:02:57 2009 +0000
@@ -457,17 +457,17 @@
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/bonobo/servers/GNOME_MixerApplet.server
%{_libdir}/bonobo/servers/GNOME_CDPlayerApplet.server
-# %{_libexecdir}/mixer_applet2
+%{_libexecdir}/mixer_applet2
%dir %attr(0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/gnome
-# %{_datadir}/gnome/help/mixer_applet2/C
-# %{_datadir}/omf/mixer_applet*/mixer_applet*-C.omf
-# %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml
+%{_datadir}/gnome/help/mixer_applet2/C
+%{_datadir}/omf/mixer_applet*/mixer_applet*-C.omf
+%{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml
%files -n SUNWgnome-mm-applets-root
%defattr(-, root, sys)
%dir %attr(0755, root, sys) %{_sysconfdir}
-#%{_sysconfdir}/gconf/schemas/mixer.schemas
+%{_sysconfdir}/gconf/schemas/mixer.schemas
%files -n SUNWgnome-utility-applets
%defattr (-, root, bin)
@@ -588,7 +588,9 @@
# %{_datadir}/omf/gnome-netstatus/*-[a-z][a-z]_*.omf
%changelog
-* Fri Jan 30 2008 - [email protected]
+* Tue Feb 17 2009 - [email protected]
+- Bump tarball to 2.25.90, and add back mixer applet files
+* Fri Jan 30 2009 - [email protected]
- Removed lines to remove all drivemount files, this is now done
through reworked patch: gnome-applets-01-disable-drivemount.diff
- Temporary commented lines for mixer applet. The mixer applet will be available
--- a/base-specs/gnome-panel.spec Wed Feb 18 10:44:34 2009 +0000
+++ b/base-specs/gnome-panel.spec Wed Feb 18 11:02:57 2009 +0000
@@ -11,7 +11,7 @@
Name: gnome-panel
License: GPL
Group: System/GUI/GNOME
-Version: 2.25.90
+Version: 2.25.91
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -263,6 +263,8 @@
%{_mandir}/man3/*
%changelog
+* Wed Feb 18 2009 - [email protected]
+- Bump to 2.25.91
* Thu Jan 29 2009 - [email protected]
- Bump to 2.25.5.1
- Remove 16-shutdownbutton.diff as bug fixed upstream
--- 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)
--- a/patches/gnome-panel-01-default-setup.diff Wed Feb 18 10:44:34 2009 +0000
+++ b/patches/gnome-panel-01-default-setup.diff Wed Feb 18 11:02:57 2009 +0000
@@ -1,6 +1,6 @@
-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
+/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 11:38:49.604274000 +0000
++++ gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries 2009-02-18 12:05:06.411085000 +0000
@@ -10,9 +10,6 @@
<value>
<list type="string">
@@ -26,7 +26,7 @@
</value>
</list>
</value>
-@@ -47,78 +38,30 @@
+@@ -47,75 +38,30 @@
<value>
<list type="string">
<value>
@@ -34,27 +34,26 @@
+ <string>clock</string>
</value>
<value>
-- <string>mixer</string>
+- <string>clock</string>
+ <string>show_desktop</string>
</value>
<value>
-- <string>clock</string>
-+ <string>window_list</string>
- </value>
- <value>
- <string>notification_area</string>
-+ <string>workspace_switcher</string>
++ <string>window_list</string>
</value>
<value>
- <string>show_desktop_button</string>
-+ <string>notification_area</string>
++ <string>workspace_switcher</string>
</value>
<value>
- <string>window_list</string>
-+ <string>mixer</string>
++ <string>notification_area</string>
</value>
<value>
- <string>workspace_switcher</string>
++ <string>mixer</string>
++ </value>
++ <value>
+ <string>trash</string>
</value>
</list>
@@ -112,7 +111,7 @@
<!-- Bottom Panel -->
<entry>
-@@ -139,7 +82,7 @@
+@@ -136,7 +82,7 @@
<key>toplevels/bottom_panel/size</key>
<schema_key>/schemas/apps/panel/toplevels/size</schema_key>
<value>
@@ -121,7 +120,7 @@
</value>
</entry>
<entry>
-@@ -165,331 +108,312 @@
+@@ -162,277 +108,313 @@
<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>
@@ -134,7 +133,7 @@
- <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
- <!-- Menu Bar -->
--
+
<entry>
- <key>objects/menu_bar/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
@@ -142,53 +141,46 @@
+ <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
<value>
- <string>menu-bar</string>
-- </value>
-- </entry>
-- <entry>
++ <bool>image</bool>
+ </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/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-- <value>
++ <key>toplevels/bottom_panel/background/image</key>
++ <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
+ <value>
- <string>top_panel</string>
-- </value>
-- </entry>
++ <string>/usr/share/gnome-panel/pixmaps/bottom-panel-image.png</string>
+ </value>
+ </entry>
- <entry>
- <key>objects/menu_bar/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
-- <value>
++ <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>
+ <value>
- <int>0</int>
-- </value>
-- </entry>
++ <bool>true</bool>
+ </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>
+- </value>
+- </entry>
+- <entry>
- <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>
++ <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key>
<value>
-- <bool>true</bool>
-+ <string>/usr/share/gnome-panel/pixmaps/bottom-panel-image.png</string>
+ <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>
-+ <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>
@@ -280,16 +272,16 @@
<entry>
- <key>objects/email_launcher/object_type</key>
-+ <key>applets/clock/object_type</key>
++ <key>objects/clock/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>launcher-object</string>
-+ <string>bonobo-applet</string>
++ <string>bonobo-object</string>
</value>
</entry>
<entry>
- <key>objects/email_launcher/toplevel_id</key>
-+ <key>applets/clock/toplevel_id</key>
++ <key>objects/clock/toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
- <string>top_panel</string>
@@ -298,7 +290,7 @@
</entry>
<entry>
- <key>objects/email_launcher/position</key>
-+ <key>applets/clock/position</key>
++ <key>objects/clock/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>2</int>
@@ -307,7 +299,7 @@
</entry>
<entry>
- <key>objects/email_launcher/panel_right_stick</key>
-+ <key>applets/clock/panel_right_stick</key>
++ <key>objects/clock/panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
<value>
<bool>false</bool>
@@ -315,7 +307,7 @@
</entry>
<entry>
- <key>objects/email_launcher/locked</key>
-+ <key>applets/clock/locked</key>
++ <key>objects/clock/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
<bool>true</bool>
@@ -428,70 +420,52 @@
+ <entry><key>applets/show_desktop/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
+ <entry><key>applets/show_desktop/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
-- <!-- Mixer Applet -->
+- <!-- Clock Applet -->
+ <!-- Window List Applet -->
-
- <entry>
-- <key>applets/mixer/object_type</key>
++
++ <entry>
+ <key>applets/window_list/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/object_type</schema_key>
++ <value>
++ <string>bonobo-applet</string>
++ </value>
++ </entry>
++ <entry>
+ <key>applets/window_list/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
-- <string>top_panel</string>
++ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
++ <value>
+ <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
-- <key>applets/mixer/position</key>
++ </value>
++ </entry>
++ <entry>
+ <key>applets/window_list/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
-- <int>1</int>
++ <schema_key>/schemas/apps/panel/objects/position</schema_key>
++ <value>
+ <int>3</int>
- </value>
- </entry>
- <entry>
-- <key>applets/mixer/panel_right_stick</key>
++ </value>
++ </entry>
++ <entry>
+ <key>applets/window_list/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
-- <bool>true</bool>
++ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
++ <value>
+ <bool>false</bool>
- </value>
- </entry>
- <entry>
-- <key>applets/mixer/locked</key>
++ </value>
++ </entry>
++ <entry>
+ <key>applets/window_list/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/locked</schema_key>
++ <value>
++ <bool>true</bool>
++ </value>
++ </entry>
++ <entry>
+ <key>applets/window_list/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
-- <string>OAFIID:GNOME_MixerApplet</string>
++ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
++ <value>
+ <string>OAFIID:GNOME_WindowListApplet</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>
++ </value>
++ </entry>
++
+ <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+ <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+ <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
@@ -503,8 +477,7 @@
+ <entry><key>applets/window_list/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
+ <entry><key>applets/window_list/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
+ <entry><key>applets/window_list/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
-
-- <!-- Clock Applet -->
++
+ <!-- Workspace Switcher Applet -->
<entry>
@@ -581,7 +554,7 @@
<!-- Notification Area Applet -->
-@@ -504,14 +420,14 @@
+@@ -447,14 +429,14 @@
<key>applets/notification_area/toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
@@ -598,7 +571,7 @@
</value>
</entry>
<entry>
-@@ -544,168 +460,123 @@
+@@ -487,168 +469,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>
@@ -809,10 +782,9 @@
</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
+/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 11:38:49.693245000 +0000
++++ gnome-panel-2.25.91/icons/Makefile.am 2009-02-18 12:05:42.744003000 +0000
@@ -7,6 +7,7 @@ gegl_DATA = \
gnome-gegl2-2.png \
gnome-gegl2.png \
@@ -821,6 +793,3 @@
$(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