mozilla-kde.patch
changeset 1021 1307721d2345
parent 1020 d2c159cb9bf2
child 1032 8220ea23b47d
equal deleted inserted replaced
1020:d2c159cb9bf2 1021:1307721d2345
    70        continue;
    70        continue;
    71      }
    71      }
    72  
    72  
    73      // Do we care if a file provided by this process fails to load?
    73      // Do we care if a file provided by this process fails to load?
    74 -    pref_LoadPrefsInDir(path, nullptr, 0);
    74 -    pref_LoadPrefsInDir(path, nullptr, 0);
    75 +    pref_LoadPrefsInDir(path, specialFiles, nullptr, 0);
    75 +    pref_LoadPrefsInDir(path, specialFiles, ArrayLength(specialFiles));
    76    }
    76    }
    77  
    77  
    78    return NS_OK;
    78    return NS_OK;
    79  }
    79  }
    80  
    80  
  2547 +        {
  2547 +        {
  2548 +        nsCOMPtr<nsISupportsCString> rstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
  2548 +        nsCOMPtr<nsISupportsCString> rstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
  2549 +        if ( !rstr ) return false;
  2549 +        if ( !rstr ) return false;
  2550 +
  2550 +
  2551 +        rstr->SetData( out[i] );
  2551 +        rstr->SetData( out[i] );
  2552 +        result->AppendElement( rstr, false );
  2552 +        result->AppendElement( rstr );
  2553 +        }
  2553 +        }
  2554 +
  2554 +
  2555 +    NS_ADDREF( *output = result);
  2555 +    NS_ADDREF( *output = result);
  2556 +    return ret;
  2556 +    return ret;
  2557 +    }
  2557 +    }