# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1298969756 -3600
# Node ID bb385ce8c77395168a7dd85ab760f2df0f537c4b
# Parent  e4846f1b81c539f43365a4c6dd0e12461e573350
slightly improve mozilla-gio-launch-uri.patch as committed for upstream

diff -r e4846f1b81c5 -r bb385ce8c773 mozilla-gio-launch-uri.patch
--- a/mozilla-gio-launch-uri.patch	Sun Feb 27 13:25:09 2011 +0100
+++ b/mozilla-gio-launch-uri.patch	Tue Mar 01 09:55:56 2011 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 7d47a19639db505e19282ac69c305c636d0fec18
+# Parent 689e53e965fdd8c76354a69fa936a3fd4f07a220
 
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -23,7 +23,7 @@
  #include "nsKDEUtils.h"
  #endif
  
-@@ -172,38 +174,47 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -172,38 +174,50 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      }
      if (!mDefaultApplication)
        return NS_ERROR_FILE_NOT_FOUND;
@@ -35,9 +35,12 @@
 +  nsCAutoString uriSpec;
 +  if (giovfs) {
 +    // nsGIOMimeApp->Launch wants a URI string instead of local file
-+    nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID);
++    nsresult rv;
++    nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
++    NS_ENSURE_SUCCESS(rv, rv);
 +    nsCOMPtr<nsIURI> uri;
-+    ioservice->NewFileURI(aFile, getter_AddRefs(uri));
++    rv = ioservice->NewFileURI(aFile, getter_AddRefs(uri));
++    NS_ENSURE_SUCCESS(rv, rv);
 +    uri->GetSpec(uriSpec);
 +  }
 +