rpms/glib2/devel gio-2.18-always-pass-fuse-file-uri.patch, NONE, 1.1 glib2.spec, 1.183, 1.184 gio-2.16-only-pass-uri-to-gio-apps.patch, 1.3, NONE

[David Zeuthen]

Author: davidz

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4262

Modified Files:
	glib2.spec 
Added Files:
	gio-2.18-always-pass-fuse-file-uri.patch 
Removed Files:
	gio-2.16-only-pass-uri-to-gio-apps.patch 
Log Message:
* Wed Oct  1 2008 David Zeuthen <davidz at redhat.com> - 2.18.1-2
- Update the patch to always pass FUSE POSIX URI's



gio-2.18-always-pass-fuse-file-uri.patch:

--- NEW FILE gio-2.18-always-pass-fuse-file-uri.patch ---
--- trunk/gio/gdesktopappinfo.c	2008/09/26 19:57:36	7554
+++ trunk/gio/gdesktopappinfo.c	2008/10/01 17:46:57	7566
@@ -530,9 +530,32 @@
 {
   GList *uris = *uri_list;
   char *expanded;
-  
+  gboolean force_file_uri;
+  char force_file_uri_macro;
+
   g_return_if_fail (exec != NULL);
-  
+
+  /* On %u and %U, pass POSIX file path pointing to the URI via
+   * the FUSE mount in ~/.gvfs. Note that if the FUSE daemon isn't
+   * running or the URI doesn't have a POSIX file path via FUSE
+   * we'll just pass the URI.
+   */
+  switch (macro)
+    {
+    case 'u':
+      force_file_uri_macro = 'f';
+      force_file_uri = TRUE;
+      break;
+    case 'U':
+      force_file_uri_macro = 'F';
+      force_file_uri = TRUE;
+      break;
+    default:
+      force_file_uri_macro = macro;
+      force_file_uri = FALSE;
+      break;
+    }
+
   switch (macro)
     {
     case 'u':
@@ -541,7 +564,17 @@
     case 'n':
       if (uris)
 	{
-	  expanded = expand_macro_single (macro, uris->data);
+          if (!force_file_uri)
+            {
+              expanded = expand_macro_single (macro, uris->data);
+            }
+          else
+            {
+              expanded = expand_macro_single (force_file_uri_macro, uris->data);
+              if (expanded == NULL)
+                expanded = expand_macro_single (macro, uris->data);
+            }
+
 	  if (expanded)
 	    {
 	      g_string_append (exec, expanded);
@@ -558,7 +591,17 @@
     case 'N':
       while (uris)
 	{
-	  expanded = expand_macro_single (macro, uris->data);
+          if (!force_file_uri)
+            {
+              expanded = expand_macro_single (macro, uris->data);
+            }
+          else
+            {
+              expanded = expand_macro_single (force_file_uri_macro, uris->data);
+              if (expanded == NULL)
+                expanded = expand_macro_single (macro, uris->data);
+            }
+
 	  if (expanded)
 	    {
 	      g_string_append (exec, expanded);


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- glib2.spec	18 Sep 2008 01:09:53 -0000	1.183
+++ glib2.spec	1 Oct 2008 18:08:45 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -20,7 +20,8 @@
 BuildRequires: glibc-devel
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=442835
-Patch2: gio-2.16-only-pass-uri-to-gio-apps.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=528670
+Patch2: gio-2.18-always-pass-fuse-file-uri.patch
 
 # this patch requires autoreconf
 BuildRequires: autoconf automake libtool gettext-devel gtk-doc
@@ -56,7 +57,7 @@
 
 %prep
 %setup -q -n glib-%{version}
-%patch2 -p1 -b .only-pass-uri-to-gio-apps
+%patch2 -p1 -b .always-pass-fuse-file-uri
 
 autoreconf
 
@@ -133,6 +134,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Oct  1 2008 David Zeuthen <davidz at redhat.com> - 2.18.1-2
+- Update the patch to always pass FUSE POSIX URI's
+
 * Wed Sep 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 


--- gio-2.16-only-pass-uri-to-gio-apps.patch DELETED ---