#include "disobedience.h"
#include "mixer.h"
+#include "version.h"
#include <getopt.h>
#include <locale.h>
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("%s", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
/* reset state */
void reset(void) {
struct reset_callback_node *r;
int main(int argc, char **argv) {
int n;
+ gboolean gtkok;
mem_init();
/* garbage-collect PCRE's memory */
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();