rpms/gnome-panel/FC-6 gnome-panel-2.16.0-fix-chinese.patch, NONE, 1.1 gnome-panel-2.16.1-launcher-copy.patch, NONE, 1.1 gnome-panel.spec, 1.155, 1.156

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8571

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.16.0-fix-chinese.patch 
	gnome-panel-2.16.1-launcher-copy.patch 
Log Message:
fix launcher copying


gnome-panel-2.16.0-fix-chinese.patch:
 zh_CN.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-panel-2.16.0-fix-chinese.patch ---
--- gnome-panel-2.16.0/po/zh_CN.po.fix-chinese	2006-11-08 21:35:50.000000000 -0500
+++ gnome-panel-2.16.0/po/zh_CN.po	2006-11-08 21:36:24.000000000 -0500
@@ -1064,11 +1064,11 @@
 
 #: ../gnome-panel/menu.c:935
 msgid "Add this launcher to _panel"
-msgstr "å°†æ­¤è¯¥å¯åŠ¨å™¨æ·»åŠ åˆ°é¢æ¿(_P)"
+msgstr "å°†æ­¤å¯åŠ¨å™¨æ·»åŠ åˆ°é¢æ¿(_P)"
 
 #: ../gnome-panel/menu.c:946
 msgid "Add this launcher to _desktop"
-msgstr "å°†è¯¥å¯åŠ¨å™¨æ·»åŠ åˆ°æ¡Œé¢(_D)"
+msgstr "å°†æ­¤å¯åŠ¨å™¨æ·»åŠ åˆ°æ¡Œé¢(_D)"
 
 #: ../gnome-panel/menu.c:962
 msgid "_Entire menu"

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/FC-6/gnome-panel.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-panel.spec	6 Nov 2006 17:13:51 -0000	1.155
+++ gnome-panel.spec	14 Nov 2006 22:45:02 -0000	1.156
@@ -21,7 +21,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.16.1
-Release: 1%{?dist} 
+Release: 2%{?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-launcher-copy.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -120,6 +122,8 @@
 %patch13 -p1 -b .move-suspend-to-menu
 %patch14 -p1 -b .no-seconds
 %patch15 -p0 -b .compiz-support
+%patch16 -p1 -b .fix-chinese
+%patch17 -p1 -b .launcher-copy
 
 . %{SOURCE4}
 
@@ -291,6 +295,11 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Nov 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-2
+- Fix copying of launchers by DND, bug 214334
+- fix "Add this launcher to panel" chinese translation.
+  Patch by Caius Chance (bug 211569)
+
 * Mon Nov  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1
 - Update to 2.16.1