|
|
Author: mclasen
Update of /cvs/dist/rpms/gnome-panel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1333
Modified Files:
gnome-panel-2.16.1-launcher-copy.patch gnome-panel.spec
Log Message:
fix the fix
gnome-panel-2.16.1-launcher-copy.patch:
launcher.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
Index: gnome-panel-2.16.1-launcher-copy.patch
===================================================================
RCS file:
/cvs/dist/rpms/gnome-panel/FC-6/gnome-panel-2.16.1-launcher-copy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.16.1-launcher-copy.patch 14 Nov 2006 22:45:02 -0000
1.1
+++ gnome-panel-2.16.1-launcher-copy.patch 16 Nov 2006 21:39:46 -0000
1.2
@@ -1,6 +1,16 @@
---- 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 @@
+--- gnome-panel-2.16.1/gnome-panel/launcher.c.launcher-copy 2006-10-01
08:39:40.000000000 -0400
++++ gnome-panel-2.16.1/gnome-panel/launcher.c 2006-11-16 16:34:41.000000000
-0500
+@@ -305,7 +305,8 @@
+ if (!launcher->location)
+ return;
+
+- if (panel_launcher_get_filename (location)) {
++ location = panel_launcher_get_filename (launcher->location);
++ if (location) {
+ GnomeVFSResult result;
+
+ result = gnome_vfs_unlink (location);
+@@ -1048,12 +1049,20 @@
GnomeVFSURI *dest_uri;
char *new_location;
const char *filename;
@@ -8,12 +18,13 @@
new_location = panel_make_unique_uri (NULL, ".desktop");
+- source_uri = gnome_vfs_uri_new (location);
+ 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);
++ source_uri = gnome_vfs_uri_new (path);
dest_uri = gnome_vfs_uri_new (new_location);
+ g_free (path);
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-6/gnome-panel.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gnome-panel.spec 14 Nov 2006 22:45:02 -0000 1.156
+++ gnome-panel.spec 16 Nov 2006 21:39:46 -0000 1.157
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.16.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -295,6 +295,10 @@
%{_datadir}/gtk-doc
%changelog
+* Thu Nov 16 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 2.16.1-3
+- Fix previous patch and also include the fix
+ for gnome bug 359707
+
* Tue Nov 14 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 2.16.1-2
- Fix copying of launchers by DND, bug 214334
- fix "Add this launcher to panel" chinese translation.
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|