summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2007-01-22 20:53:43 +0000
committerPeter Volkov <pva@gentoo.org>2007-01-22 20:53:43 +0000
commitc2a35bd67f7124132ff218519b85269211f2f428 (patch)
tree979c3d29c56627c59235cb0de5f355cea8897770 /gnome-base/gnome-vfs/files
parentFix HOMEPAGE (diff)
downloadhistorical-c2a35bd67f7124132ff218519b85269211f2f428.tar.gz
historical-c2a35bd67f7124132ff218519b85269211f2f428.tar.bz2
historical-c2a35bd67f7124132ff218519b85269211f2f428.zip
Fixed gnome_vfs_url_show_with_env does not work if empty 'Path=' entry exists in *.desktop. Bug #161089.
Package-Manager: portage-2.1.1-r2
Diffstat (limited to 'gnome-base/gnome-vfs/files')
-rw-r--r--gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r13
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff16
2 files changed, 19 insertions, 0 deletions
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1
new file mode 100644
index 000000000000..11e08a39e511
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1
@@ -0,0 +1,3 @@
+MD5 586d6fe3740385c000a864d5e2cf8215 gnome-vfs-2.16.3.tar.bz2 1900424
+RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc gnome-vfs-2.16.3.tar.bz2 1900424
+SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777 gnome-vfs-2.16.3.tar.bz2 1900424
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff
new file mode 100644
index 000000000000..1bda6cdc1d4d
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff
@@ -0,0 +1,16 @@
+diff -Naur gnome-vfs-2.16.3.ori/libgnomevfs/gnome-vfs-mime-handlers.c gnome-vfs-2.16.3/libgnomevfs/gnome-vfs-mime-handlers.c
+--- gnome-vfs-2.16.3.ori/libgnomevfs/gnome-vfs-mime-handlers.c 2006-11-20 10:44:13.000000000 +0300
++++ gnome-vfs-2.16.3/libgnomevfs/gnome-vfs-mime-handlers.c 2006-12-25 16:44:11.000000000 +0300
+@@ -1423,6 +1423,12 @@
+ app->priv->path = g_key_file_get_string (key_file, DESKTOP_ENTRY_GROUP,
+ "Path", NULL);
+
++ /* 'Path=' .desktop item is not working. bugzilla.gnome.org/389273 */
++ if (app->priv->path != NULL && *app->priv->path == 0) {
++ g_free (app->priv->path);
++ app->priv->path = NULL;
++ }
++
+ app->requires_terminal = g_key_file_get_boolean
+ (key_file, DESKTOP_ENTRY_GROUP, "Terminal", &err);
+ if (err) {