X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fb44b59ebf9398f9b0759e2e760542c73c2d29c3..4aa8a0a41a06b6cfdcd86f5bebf71d590d5ad142:/disobedience/disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index d6b346d..2cab9aa 100644
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 #include "disobedience.h"
 #include "mixer.h"
+#include "version.h"
 
 #include <getopt.h>
 #include <locale.h>
@@ -407,13 +408,6 @@ static void help(void) {
   exit(0);
 }
 
-/* display version number and terminate */
-static void version(void) {
-  xprintf("disorder version %s\n", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-
 /* reset state */
 void reset(void) {
   struct reset_callback_node *r;
@@ -439,6 +433,7 @@ void register_reset(reset_callback *callback) {
 
 int main(int argc, char **argv) {
   int n;
+  gboolean gtkok;
 
   mem_init();
   /* garbage-collect PCRE's memory */
@@ -449,17 +444,19 @@ int main(int argc, char **argv) {
   g_mem_set_vtable((GMemVTable *)&glib_memvtable);
 #endif
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
-  gtk_init(&argc, &argv);
+  gtkok = gtk_init_check(&argc, &argv);
   while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
-    case 'V': version();
+    case 'V': version("disobedience");
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 't': goesupto = 11; break;
     default: fatal(0, "invalid option");
     }
   }
+  if(!gtkok)
+    fatal(0, "failed to initialize GTK+");
   signal(SIGPIPE, SIG_IGN);
   init_styles();
   load_settings();
@@ -492,6 +489,9 @@ int main(int argc, char **argv) {
   /* See if RTP play supported */
   check_rtp_address();
   suppress_actions = 0;
+  /* If no password is set yet pop up a login box */
+  if(!config->password)
+    login_box();
   D(("enter main loop"));
   MTAG("misc");
   g_main_loop_run(mainloop);