autostart beryl

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main.c b/src/main.c
index b418882..0727bbf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -990,8 +990,8 @@ int main(int argc, char ** argv)
     gchar *buffer;
     gboolean daemon_mode = TRUE;
     Display * d;
-    gboolean force_window_manager = FALSE;
-    gboolean force_decorator = FALSE;
+    gboolean force_window_manager = TRUE;
+    gboolean force_decorator = TRUE;
     Window running_window;
 
     //Intialise error handler
@@ -1018,10 +1018,10 @@ int main(int argc, char ** argv)
             return 0;
         } else if (strcmp(argv[i],"-d")==0) {
 	    daemon_mode = FALSE;
-        } else if (strcmp(argv[i],"--force-window-manager")==0) {
-	    force_window_manager = TRUE;
-        } else if (strcmp(argv[i],"--force-decorator")==0) {
-	    force_decorator = TRUE;
+        } else if (strcmp(argv[i],"--no-force-window-manager")==0) {
+	    force_window_manager = FALSE;
+        } else if (strcmp(argv[i],"--no-force-decorator")==0) {
+	    force_decorator = FALSE;
         } else {
  	    usage(argv[0]);
 	    return 1;
@@ -1076,12 +1076,15 @@ int main(int argc, char ** argv)
     XCloseDisplay(d);
 
     // Some warning about changed behaviour for the unaware user
+    /*
     if (!force_window_manager && !force_decorator) {
         if (!strcmp (PACKAGE_VERSION, "0.1.1")) {
 	  fprintf(stderr, "beryl-manager doesn't autostart window-manager/decorator\n"
 		  "any more. Please consult: man beryl-manager\n\n");
         }
     } 
+    */
+    //taken out because starting beryl is -the- reason for beryl-manager's existence.
 
     gtk_init(&argc,&argv);
     d = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());