diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-09-04 22:40:53 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2012-09-04 22:40:53 +0200 |
| commit | c4b897371ba6772bfed962e7ac067fac5e8a2df8 (patch) | |
| tree | 0b0a6581aee0dcbe854d2c1b00f0cf966900faac /src/colloquium.c | |
| parent | 66ba736f5e448ebb5bf64fe88048b930e3b0e821 (diff) | |
Plug mainwindow back in
Diffstat (limited to 'src/colloquium.c')
| -rw-r--r-- | src/colloquium.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/colloquium.c b/src/colloquium.c index 93d2c4e..5af188b 100644 --- a/src/colloquium.c +++ b/src/colloquium.c @@ -3,7 +3,7 @@ * * Colloquium - A tiny presentation program * - * Copyright (c) 2011 Thomas White <taw@bitwiz.org.uk> + * Copyright (c) 2012 Thomas White <taw@bitwiz.org.uk> * * 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 @@ -28,6 +28,9 @@ #include <gtk/gtk.h> #include <getopt.h> +#include "presentation.h" +#include "mainwindow.h" + static void show_help(const char *s) { @@ -43,7 +46,7 @@ static void show_help(const char *s) int main(int argc, char *argv[]) { int c; -// struct presentation *p; + struct presentation *p; /* Long options */ const struct option longopts[] = { @@ -71,13 +74,13 @@ int main(int argc, char *argv[]) } -// p = new_presentation(); -// p->cur_edit_slide = add_slide(p, 0); -// p->completely_empty = 1; -// if ( open_mainwindow(p) ) { -// fprintf(stderr, "Couldn't open main window.\n"); -// return 1; -// } + p = new_presentation(); + p->cur_edit_slide = add_slide(p, 0); + p->completely_empty = 1; + if ( open_mainwindow(p) ) { + fprintf(stderr, "Couldn't open main window.\n"); + return 1; + } gtk_main(); |