rpms/gnome-panel/devel gnome-panel.spec, 1.215, 1.216 redhat-panel-default-setup.entries, 1.13, 1.14

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14150

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Log Message:
Improved handling of launchers for preferred apps



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- gnome-panel.spec	4 Sep 2007 19:35:44 -0000	1.215
+++ gnome-panel.spec	6 Sep 2007 16:58:07 -0000	1.216
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -92,6 +92,12 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=456371
 Patch7: clock-timezones.patch
 
+# the next three patches belong together
+# http://bugzilla.gnome.org/show_bug.cgi?id=470966
+Patch8: launcher-desktop-files.patch
+Patch9: desktop-file-monitoring.patch
+Patch10: preferred-apps.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -124,6 +130,9 @@
 %patch4 -p1 -b .search
 #%patch6 -p0 -b .compiz-support
 %patch7 -p1 -b .clock-timezones
+%patch8 -p1 -b .launcher-desktop-files
+%patch9 -p1 -b .desktop-file-monitoring
+%patch10 -p1 -b .preferred-apps
 
 . %{SOURCE4}
 
@@ -302,6 +311,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-2
+- Improve the handling of preferred apps in launchers
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- redhat-panel-default-setup.entries	13 Feb 2007 20:58:10 -0000	1.13
+++ redhat-panel-default-setup.entries	6 Sep 2007 16:58:07 -0000	1.14
@@ -276,7 +276,7 @@
       <key>objects/web_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/redhat-web.desktop</string>
+        <string>preferred-web-browser.desktop</string>
       </value>
     </entry>
 
@@ -330,7 +330,7 @@
       <key>objects/email_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/redhat-email.desktop</string>
+        <string>preferred-mail-reader.desktop</string>
       </value>
     </entry>