Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23501 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2008-01-13 22:03:34 +00:00
parent f6742aab04
commit bf86f09912
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/packageinstaller/InstalledPackageInfo.cpp
View File

@ -37,7 +37,7 @@ info_prepare(const char *filename, BFile *file, BMessage *info)
return B_ERROR; return B_ERROR;
status_t ret = info->Unflatten(file); status_t ret = info->Unflatten(file);
if (ret != B_OK || info->what != P_PACKAGE_INFO) if (ret != B_OK || info->what != P_PACKAGE_INFO)
return B_ERROR; return B_ERROR;
return B_OK; return B_OK;

30
src/apps/packageinstaller/PackageView.cpp
View File

@ -114,13 +114,13 @@ PackageView::AttachedToWindow()
fOpenPanel->SetTarget(BMessenger(this)); fOpenPanel->SetTarget(BMessenger(this));
fInstallTypes->SetTargetForItems(this); fInstallTypes->SetTargetForItems(this);
if (fInfo.InitCheck() == B_OK) { if (fInfo.InitCheck() == B_OK) {
// If the package is valid, we can set up the default group and all // If the package is valid, we can set up the default group and all
// other things. If not, then the application will close just after // other things. If not, then the application will close just after
// attaching the view to the window // attaching the view to the window
_GroupChanged(0); _GroupChanged(0);
fStatusWindow = new PackageStatus(T("Installation progress")); fStatusWindow = new PackageStatus(T("Installation progress"));
// Show the splash screen, if present // Show the splash screen, if present
BMallocIO *image = fInfo.GetSplashScreen(); BMallocIO *image = fInfo.GetSplashScreen();
@ -130,18 +130,18 @@ PackageView::AttachedToWindow()
} }
// Show the disclaimer/info text popup, if present // Show the disclaimer/info text popup, if present
BString disclaimer = fInfo.GetDisclaimer(); BString disclaimer = fInfo.GetDisclaimer();
if (disclaimer.Length() != 0) { if (disclaimer.Length() != 0) {
PackageTextViewer *text = new PackageTextViewer(disclaimer.String()); PackageTextViewer *text = new PackageTextViewer(disclaimer.String());
int32 selection = text->Go(); int32 selection = text->Go();
// The user didn't accept our disclaimer, this means we cannot continue. // The user didn't accept our disclaimer, this means we cannot continue.
if (selection == 0) { if (selection == 0) {
BWindow *parent = Window(); BWindow *parent = Window();
if (parent && parent->Lock()) if (parent && parent->Lock())
parent->Quit(); parent->Quit();
} }
} }
} }
} }