Update copyright dates

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index e0fa295bbb0185a9e078bf4adc86cf2cbac2baa5..38fc6eb33ef8708fe690a47d11f9c3cd40ba90fc 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2006, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2006-2009 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
  *
  * 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


@@ -25,6 +25,7 @@
 #include <getopt.h>
 #include <locale.h>
 #include <pcre.h>
 #include <getopt.h>
 #include <locale.h>
 #include <pcre.h>

+#include <gcrypt.h>

 
 /* Apologies for the numerous de-consting casts, but GLib et al do not seem to
  * have heard of const. */
 
 /* Apologies for the numerous de-consting casts, but GLib et al do not seem to
  * have heard of const. */


@@ -448,15 +449,22 @@ int main(int argc, char **argv) {
   }
   if(!gtkok)
     fatal(0, "failed to initialize GTK+");
   }
   if(!gtkok)
     fatal(0, "failed to initialize GTK+");

+  /* gcrypt initialization */
+  if(!gcry_check_version(NULL))
+    disorder_fatal(0, "gcry_check_version failed");
+  gcry_control(GCRYCTL_INIT_SECMEM, 0);
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);

   signal(SIGPIPE, SIG_IGN);
   init_styles();
   load_settings();
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);
   signal(SIGPIPE, SIG_IGN);
   init_styles();
   load_settings();
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");

   /* we'll need mixer support */
   backend = uaudio_apis[0];
   /* we'll need mixer support */
   backend = uaudio_apis[0];

+  if(backend->configure)
+    backend->configure();

   if(backend->open_mixer)
     backend->open_mixer();
   /* create the clients */
   if(backend->open_mixer)
     backend->open_mixer();
   /* create the clients */