Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M webclient/build-tests.xml

Browse Source 
- re-activate some tests

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java

- Make null an acceptable argument for prefValue.  Make it mean, remove
  the pref.

M webclient/src_moz/PreferencesImpl.cpp

- make a null prefValue argument to nativeSetUnicharPref mean, ClearPref().


git-svn-id: svn://10.0.0.236/trunk@154682 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2004-04-11 01:09:03 +00:00
parent c1b61dc264
commit af25831c2e
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/java/webclient/src_moz/PreferencesImpl.cpp
View File

@@ -111,22 +111,28 @@ Java_org_mozilla_webclient_impl_wrapper_1native_PreferencesImpl_nativeSetUnichar
const char * prefNameChars = (char *)::util_GetStringUTFChars(env,
prefName);
const jchar * prefValueChars = (jchar *)::util_GetStringChars(env,
prefValue);
if (nsnull == prefNameChars) {
::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref name");
rv = NS_ERROR_NULL_POINTER;
goto OMWIWNPINSUP_CLEANUP;
const jchar * prefValueChars = nsnull;
if (nsnull != prefValue) {
prefValueChars =
(jchar *)::util_GetStringChars(env, prefValue);
if (nsnull == prefNameChars) {
::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref name");
rv = NS_ERROR_NULL_POINTER;
goto OMWIWNPINSUP_CLEANUP;
}
if (nsnull == prefValueChars) {
::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref value");
rv = NS_ERROR_NULL_POINTER;
goto OMWIWNPINSUP_CLEANUP;
}
rv = prefs->SetUnicharPref(prefNameChars,
(const PRUnichar *) prefValueChars);
}
if (nsnull == prefValueChars) {
::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref value");
rv = NS_ERROR_NULL_POINTER;
goto OMWIWNPINSUP_CLEANUP;
else {
rv = prefs->ClearUserPref(prefNameChars);
}
rv = prefs->SetUnicharPref(prefNameChars,
(const PRUnichar *) prefValueChars);
OMWIWNPINSUP_CLEANUP:
::util_ReleaseStringUTFChars(env, prefName, prefNameChars);