Install gobject introspection files in correct dir

[projects/chimara/chimara.git] / libchimara / window.c

diff --git a/libchimara/window.c b/libchimara/window.c
index e302a1eedc06201a79dbf87f40815499db9e169f..c9132939237d5548f9632ff85a903f0e70148088 100644 (file)
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -581,6 +581,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
                        g_signal_handler_block(textview, win->pager_keypress_handler);
                        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
                        win->pager_adjustment_handler = g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
+                       g_signal_connect(pager, "clicked", G_CALLBACK(pager_on_clicked), win);
 
                        /* Char and line input */
                        win->char_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
@@ -978,24 +979,7 @@ glk_window_clear(winid_t win)
             GtkTextIter start, end;
             gtk_text_buffer_get_start_iter(textbuffer, &start);
             gtk_text_buffer_get_end_iter(textbuffer, &end);
-
-                       /* Determine default style */
-                       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(textbuffer);
-                       GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
-                       GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, "normal");
-                       GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, "normal");
-
-                       // Default style
-                       gtk_text_buffer_apply_tag(textbuffer, default_tag, &start, &end);
-
-                       // Player's style overrides
-                       gtk_text_buffer_apply_tag(textbuffer, style_tag, &start, &end);
-
-                       // GLK Program's style overrides
-                       gtk_text_buffer_apply_tag(textbuffer, glk_style_tag, &start, &end);
-
-                       if(win->zcolor != NULL)
-                               gtk_text_buffer_apply_tag(textbuffer, win->zcolor, &start, &end);
+                       style_apply(win, &start, &end);
 
             gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start);