rpms/gnome-panel/devel gnome-panel-2.16.1-launcher-copy.patch, NONE, 1.1 gnome-panel.spec, 1.157, 1.158
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 14 22:41:18 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5506
Modified Files:
gnome-panel.spec
Added Files:
gnome-panel-2.16.1-launcher-copy.patch
Log Message:
fix launcher copying
gnome-panel-2.16.1-launcher-copy.patch:
launcher.c | 8 ++++++++
1 files changed, 8 insertions(+)
--- NEW FILE gnome-panel-2.16.1-launcher-copy.patch ---
--- gnome-panel-2.16.1/gnome-panel/launcher.c.launcher-copy 2006-11-14 17:20:12.000000000 -0500
+++ gnome-panel-2.16.1/gnome-panel/launcher.c 2006-11-14 17:20:46.000000000 -0500
@@ -1048,12 +1048,20 @@
GnomeVFSURI *dest_uri;
char *new_location;
const char *filename;
+ char *path;
new_location = panel_make_unique_uri (NULL, ".desktop");
+ if (!g_path_is_absolute (location))
+ path = panel_make_full_path (NULL, location);
+ else
+ path = g_strdup (location);
+
source_uri = gnome_vfs_uri_new (location);
dest_uri = gnome_vfs_uri_new (new_location);
+ g_free (path);
+
gnome_vfs_xfer_uri (source_uri,
dest_uri,
GNOME_VFS_XFER_FOLLOW_LINKS,
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gnome-panel.spec 14 Nov 2006 15:34:07 -0000 1.157
+++ gnome-panel.spec 14 Nov 2006 22:41:11 -0000 1.158
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.gnome.org
Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
Source1: redhat-panel-default-setup.entries
@@ -87,6 +87,8 @@
Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
Patch14: gnome-panel-2.15.92-no-seconds.patch
Patch15: gnome-panel-2.16.0-compiz-support.patch
+Patch16: gnome-panel-2.16.0-fix-chinese.patch
+Patch17: gnome-panel-2.16.1-copy-launcher.patch
# gnome bugzilla 365640
Patch16: gnome-panel-2.16.0-fix-chinese.patch
@@ -124,6 +126,7 @@
%patch14 -p1 -b .no-seconds
%patch15 -p0 -b .compiz-support
%patch16 -p1 -b .fix-chinese
+%patch17 -p1 -b .copy-launcher
. %{SOURCE4}
@@ -295,6 +298,9 @@
%{_datadir}/gtk-doc
%changelog
+* Tue Nov 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-4
+- Fix copying of launchers by DND, bug 214334
+
* Tue Nov 14 2006 Ray Strode <rstrode at redhat.com> - 2.16.1-3
- fix "Add this launcher to panel" chinese translation.
Patch by Caius Chance (bug 211569)
More information about the fedora-cvs-commits
mailing list