Merge branch 'master' of https://github.com/wmvanvliet/Chimara

[projects/chimara/chimara.git] / player / main.c

diff --git a/player/main.c b/player/main.c
index 3586ca1b3654ae1ecd17b6ebe6b8a32f8ae51132..7eef7f740c8228db1fb2a050faa4c542bcc853fb 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -155,6 +155,7 @@ create_window(void)
        const gchar *patterns[] = {
                "*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL
        };
+       
        for(ptr = patterns; *ptr; ptr++)
                gtk_recent_filter_add_pattern(filter, *ptr);
        GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent"));
@@ -180,7 +181,7 @@ create_window(void)
 #ifdef DEBUG
                g_error_free(error);
                error = NULL;
-               if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/macstyle.css", &error) ) {
+               if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/style.css", &error) ) {
 #endif /* DEBUG */
                        error_dialog(NULL, error, "Couldn't open CSS file: ");
                        return;
@@ -214,7 +215,7 @@ create_window(void)
        g_signal_connect(glk, "notify::story-name", G_CALLBACK(change_window_title), window);
        
        /* Create preferences window */
-       preferences_create(CHIMARA_GLK(glk));
+       //preferences_create(CHIMARA_GLK(glk));
 }
 
 int