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

Removed the testing-only restart messages -- daemon now silently relaunches servers

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19608 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2006-12-22 19:07:37 +00:00
parent eaeb7fd4f5
commit d2980e876d
1 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/services_daemon/ServicesDaemon.cpp
+10 -52
View File
@@ -22,8 +22,8 @@ enum {
M_RELAUNCH_MIDI M_RELAUNCH_MIDI
}; };
// Time delay in microseconds - 2 seconds // Time delay in microseconds - 1 seconds
const bigtime_t kRelaunchDelay = 2000000; const bigtime_t kRelaunchDelay = 1000000;
const char *gSignatures[] = { const char *gSignatures[] = {
"application/x-vnd.Be-TSKB", "application/x-vnd.Be-TSKB",
@@ -113,75 +113,33 @@ App::MessageReceived(BMessage *msg)
break; break;
} }
case M_RELAUNCH_DESKBAR: { case M_RELAUNCH_DESKBAR: {
BAlert *alert = new BAlert("Services Daemon", be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
"The Deskbar is no longer running. Restart it?",
"No","Yes");
if (alert->Go() == 1) {
be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
break;
}
break; break;
} }
case M_RELAUNCH_TRACKER: { case M_RELAUNCH_TRACKER: {
BAlert *alert = new BAlert("Services Daemon", be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
"Tracker is no longer running. Restart it?",
"No","Yes");
if (alert->Go() == 1) {
be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
break;
}
break; break;
} }
case M_RELAUNCH_MAIL: { case M_RELAUNCH_MAIL: {
BAlert *alert = new BAlert("Services Daemon", be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
"Mail services are no longer running. Restart them?",
"No","Yes");
if (alert->Go() == 1) {
be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
break;
}
break; break;
} }
case M_RELAUNCH_PRINT: { case M_RELAUNCH_PRINT: {
BAlert *alert = new BAlert("Services Daemon", be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
"Print services are no longer running. Restart them?",
"No","Yes");
if (alert->Go() == 1) {
be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
break;
}
break; break;
} }
case M_RELAUNCH_AUDIO: { case M_RELAUNCH_AUDIO: {
BAlert *alert = new BAlert("Services Daemon", be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
"The audio server is no longer running. Restart them?",
"No","Yes");
if (alert->Go() == 1) {
be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
break;
}
break; break;
} }
case M_RELAUNCH_MEDIA_ADDONS: case M_RELAUNCH_MEDIA_ADDONS:
case M_RELAUNCH_MEDIA: { case M_RELAUNCH_MEDIA: {
BAlert *alert = new BAlert("Services Daemon", shutdown_media_server();
"Media services are no longer running. Restart them?", launch_media_server();
"No","Yes");
if (alert->Go() == 1) {
shutdown_media_server();
launch_media_server();
break;
}
break; break;
} }
case M_RELAUNCH_MIDI: { case M_RELAUNCH_MIDI: {
BAlert *alert = new BAlert("Services Daemon", be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
"The MIDI server is no longer running. Restart them?",
"No","Yes");
if (alert->Go() == 1) {
be_roster->Launch(gSignatures[msg->what - M_RELAUNCH_DESKBAR]);
break;
}
break; break;
} }
default: default: