firefox-shellservice.patch
changeset 229 298263f797be
parent 223 4555a5d0d661
equal deleted inserted replaced
228:9ba8fb8909c4 229:298263f797be
     1 # HG changeset patch
     1 # HG changeset patch
     2 # Parent e46704258210bc68bc65773f60a0d32cb2ce767d
     2 # Parent 948830682920db68e4b039f5babc34dea0040415
     3 Bug 611953 - GNOME 3.0 readiness (based on patch 3)
     3 Bug 611953 - GNOME 3.0 readiness (based on patch 3)
     4 
     4 
     5 diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
     5 diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
     6 --- a/browser/components/shell/src/nsGNOMEShellService.cpp
     6 --- a/browser/components/shell/src/nsGNOMEShellService.cpp
     7 +++ b/browser/components/shell/src/nsGNOMEShellService.cpp
     7 +++ b/browser/components/shell/src/nsGNOMEShellService.cpp
   215 -  if (aClaimAllTypes) {
   215 -  if (aClaimAllTypes) {
   216 +  if (giovfs) {
   216 +  if (giovfs) {
   217      nsresult rv;
   217      nsresult rv;
   218 -    nsCOMPtr<nsIGIOService> giovfs =
   218 -    nsCOMPtr<nsIGIOService> giovfs =
   219 -      do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
   219 -      do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
   220 -    NS_ENSURE_SUCCESS(rv, rv);
   220 -    NS_ENSURE_SUCCESS(rv, NS_OK);
   221 +    unsigned int i;
   221 +    unsigned int i;
   222  
   222  
   223      nsCOMPtr<nsIStringBundleService> bundleService =
   223      nsCOMPtr<nsIStringBundleService> bundleService =
   224        do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   224        do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   225      NS_ENSURE_SUCCESS(rv, rv);
   225      NS_ENSURE_SUCCESS(rv, rv);