i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Merged weak-symbols branch.

Browse Source 
* Fixed trivial merge conflict in src/system/libroot/posix/locale/nl_langinfo.cpp
* Fixed gcc 2 compilation of src/system/glue/init_term_dyn.c.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39571 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-11-22 13:06:36 +00:00
parent 921e955104
commit 25dc253d6a
174 changed files with 1622 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/aboutsystem/AboutSystem.cpp
+7 -7
View File
@@ -180,23 +180,23 @@ TranslationComparator(const void* left, const void* right)
BLanguage* language;
BString leftName;
if (be_locale_roster->GetLanguage(leftTranslation->languageCode, &language)
== B_OK) {
if (BLocaleRoster::Default()->GetLanguage(leftTranslation->languageCode,
&language) == B_OK) {
language->GetName(leftName);
delete language;
} else
leftName = leftTranslation->languageCode;
BString rightName;
if (be_locale_roster->GetLanguage(rightTranslation->languageCode, &language)
== B_OK) {
if (BLocaleRoster::Default()->GetLanguage(rightTranslation->languageCode,
&language) == B_OK) {
language->GetName(rightName);
delete language;
} else
rightName = rightTranslation->languageCode;
BCollator collator;
be_locale->GetCollator(&collator);
BLocale::Default()->GetCollator(&collator);
return collator.Compare(leftName.String(), rightName.String());
}
@@ -1105,8 +1105,8 @@ AboutView::_CreateCreditsView()
= *(const Translation*)sortedTranslations.ItemAt(i);
langName.Truncate(0);
if (be_locale_roster->GetLanguage(translation.languageCode, &lang)
== B_OK) {
if (BLocaleRoster::Default()->GetLanguage(translation.languageCode,
&lang) == B_OK) {
lang->GetName(langName);
delete lang;
} else {