Skip to content

Commit

Permalink
Whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
AeroNotix committed Nov 20, 2012
1 parent 17bc8d8 commit 5250c47
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ int conv(int num_msg, const struct pam_message **msg,
extern App* LoginApp;

int xioerror(Display *disp) {
LoginApp->RestartServer();
LoginApp->RestartServer();
return 0;
}

Expand Down Expand Up @@ -179,7 +179,7 @@ App::App(int argc, char** argv)
break;
}
}
#ifndef XNEST_DEBUG
#ifndef XNEST_DEBUG
if (getuid() != 0 && !testing) {
logStream << APPNAME << ": only root can run this program" << endl;
exit(ERR_EXIT);
Expand Down Expand Up @@ -321,12 +321,12 @@ void App::Run() {
bool firstloop = true; // 1st time panel is shown (for automatic username)
bool focuspass = cfg->getOption("focus_password")=="yes";
bool autologin = cfg->getOption("auto_login")=="yes";

if (firstlogin && cfg->getOption("default_user") != "") {
LoginPanel->SetName(cfg->getOption("default_user") );
#ifdef USE_PAM
pam.set_item(PAM::Authenticator::User, cfg->getOption("default_user").c_str());
#endif
pam.set_item(PAM::Authenticator::User, cfg->getOption("default_user").c_str());
#endif
firstlogin = false;
if (autologin) {
Login();
Expand All @@ -340,7 +340,7 @@ void App::Run() {
} else if (numlock == "off") {
NumLock::setOff(Dpy);
}

// Start looping
int panelclosed = 1;
Panel::ActionType Action;
Expand All @@ -361,8 +361,8 @@ void App::Run() {
}

LoginPanel->Reset();


if (firstloop && cfg->getOption("default_user") != "") {
LoginPanel->SetName(cfg->getOption("default_user") );
}
Expand All @@ -375,8 +375,8 @@ void App::Run() {
XBell(Dpy, 100);
continue;
}
firstloop = false;

firstloop = false;

Action = LoginPanel->getAction();
// for themes test we just quit
Expand Down Expand Up @@ -414,7 +414,7 @@ bool App::AuthenticateUser(bool focuspass){
// Reset the username
try{
if (!focuspass)
pam.set_item(PAM::Authenticator::User, 0);
pam.set_item(PAM::Authenticator::User, 0);
pam.authenticate();
}
catch(PAM::Auth_Exception& e){
Expand Down Expand Up @@ -448,7 +448,7 @@ bool App::AuthenticateUser(bool focuspass){
}
}
LoginPanel->EventHandler(Panel::Get_Passwd);

char *encrypted, *correct;
struct passwd *pw;

Expand All @@ -469,7 +469,7 @@ bool App::AuthenticateUser(bool focuspass){
return false;

#ifdef HAVE_SHADOW
struct spwd *sp = getspnam(pw->pw_name);
struct spwd *sp = getspnam(pw->pw_name);
endspent();
if(sp)
correct = sp->sp_pwdp;
Expand Down Expand Up @@ -544,7 +544,7 @@ void App::Login() {
maildir.append(pw->pw_name);
string xauthority = pw->pw_dir;
xauthority.append("/.Xauthority");

#ifdef USE_PAM
// Setup the PAM environment
try{
Expand Down Expand Up @@ -650,8 +650,8 @@ void App::Login() {
int status;
while (wpid != pid) {
wpid = wait(&status);
if (wpid == ServerPID)
xioerror(Dpy); // Server died, simulate IO error
if (wpid == ServerPID)
xioerror(Dpy); // Server died, simulate IO error
}
if (WIFEXITED(status) && WEXITSTATUS(status)) {
LoginPanel->Message("Failed to execute login command");
Expand Down Expand Up @@ -811,11 +811,11 @@ void App::RestartServer() {
};
#endif

StopServer();
StopServer();
RemoveLock();
while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
Run();
}
}

void App::KillAllClients(Bool top) {
Window dummywindow;
Expand Down Expand Up @@ -1093,7 +1093,7 @@ void App::setBackground(const string& themedir) {
XSetWindowBackgroundPixmap(Dpy, Root, p);
}
XClearWindow(Dpy, Root);

XFlush(Dpy);
delete image;
}
Expand Down Expand Up @@ -1162,8 +1162,8 @@ void App::OpenLog() {

// Relases stdout/err
void App::CloseLog(){
// Simply closing the log
logStream.closeLog();
// Simply closing the log
logStream.closeLog();
}

string App::findValidRandomTheme(const string& set)
Expand Down

0 comments on commit 5250c47

Please sign in to comment.