From c4b897371ba6772bfed962e7ac067fac5e8a2df8 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 4 Sep 2012 22:40:53 +0200 Subject: Plug mainwindow back in --- src/colloquium.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/colloquium.c') 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 + * Copyright (c) 2012 Thomas White * * 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 #include +#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(); -- cgit v1.2.3