summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorquinn <quinn>2006-10-11 04:50:35 +0000
committerquinn <quinn>2006-10-11 04:50:35 +0000
commite401d691364123da1e1fc413b5b763b1f84c443e (patch)
tree714223c2accaff1d019246c18a9651dc7613a5f3 /src
parentd76cb9cdbb79344a00134d8ccd92bde65de67b4e (diff)
downloadberyl-manager-e401d691364123da1e1fc413b5b763b1f84c443e.tar.gz
beryl-manager-e401d691364123da1e1fc413b5b763b1f84c443e.tar.bz2
remove unnecessary restart code
Diffstat (limited to 'src')
-rw-r--r--src/main.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/main.c b/src/main.c
index 92fe917..2676033 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,7 +35,6 @@ gboolean reloadingDecorator=FALSE;
gboolean XGL=FALSE;
gboolean NV9XXX=FALSE;
gboolean useFB=TRUE;
-gboolean firstStart=TRUE;
gint WM=0;
gint fallBackWM=0;
gint DM=0;
@@ -426,7 +425,6 @@ void startWM()
{
gchar * wm_command=g_strjoin(" ",WMs[WM].Prog,WMs[WM].Opts,NULL);
berylLaunched=FALSE;
- firstStart=FALSE;
killWM();
g_spawn_command_line_async(wm_command,NULL);
g_free(wm_command);
@@ -459,10 +457,6 @@ gpointer berylThread(gpointer d)
reloadingBeryl=FALSE;
return NULL;
}
- else if (firstStart)
- {
- firstStart=FALSE;
- }
else if (WIFEXITED(ex)) // returned something
{
if (WEXITSTATUS(ex)) // returned something other than 0
@@ -501,27 +495,14 @@ gpointer berylThread(gpointer d)
}
void reloadBeryl()
{
- firstStart=FALSE;
if (berylLaunched)
reloadingBeryl=TRUE;
g_thread_create(berylThread,NULL,FALSE,NULL); // launch beryl
if (!decoratorLaunched && !is_decor_running())
g_thread_create(decorThread,NULL,FALSE,NULL); // launch decorator
}
-gboolean killB(gpointer p)
-{
- if (firstStart && WM==0)
- {
- reloadBeryl();
- }
- return FALSE;
-}
void startBeryl()
{
- if (firstStart)
- {
- g_timeout_add(4000,(GSourceFunc) killB,NULL);
- }
if (!berylLaunched)
g_thread_create(berylThread,NULL,FALSE,NULL); // launch beryl
if (!decoratorLaunched && !is_decor_running())
@@ -543,7 +524,6 @@ void launchWM()
}
void reloadWM(GtkWidget * w, gpointer p)
{
- firstStart=FALSE;
if (WM==0)
reloadBeryl();
else