Beginning work on graphic windows. Hopelessly broken still....

[rodin/chimara.git] / libchimara / hyperlink.c

diff --git a/libchimara/hyperlink.c b/libchimara/hyperlink.c
index a2795bdc83fb0861e598a3adaa626d1fcb04c884..aa9f426e353b7ed0039367a5451da5fee909a578 100644 (file)
--- a/libchimara/hyperlink.c
+++ b/libchimara/hyperlink.c
@@ -56,7 +56,7 @@ glk_set_hyperlink_stream(strid_t str, glui32 linkval)
        g_return_if_fail(str != NULL);
        g_return_if_fail(str->type == STREAM_TYPE_WINDOW);
        g_return_if_fail(str->window != NULL);
-       g_return_if_fail(str->window->type == wintype_TextBuffer);
+       g_return_if_fail(str->window->type == wintype_TextBuffer || str->window->type == wintype_TextGrid);
 
        flush_window_buffer(str->window);
 
@@ -83,8 +83,6 @@ glk_set_hyperlink_stream(strid_t str, glui32 linkval)
                GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(textbuffer);
                gtk_text_tag_table_add(tags, new_hyperlink->tag);
 
-               printf("inserting link %d\n", linkval);
-
                gint *linkval_pointer = g_new0(gint, 1);
                *linkval_pointer = linkval;
                g_hash_table_insert(str->window->hyperlinks, linkval_pointer, new_hyperlink);
@@ -100,7 +98,6 @@ hyperlink_unblock_event_handler(gpointer key, gpointer value, gpointer user_data
 {
        hyperlink_t *link = (hyperlink_t *) value;
        g_signal_handler_unblock(link->tag, link->event_handler);
-       printf("unblocking link %d\n", link->value);
 }
 
 /* Internal function used to iterate over all the hyperlinks, blocking the event handler */
@@ -138,7 +135,7 @@ glk_request_hyperlink_event(winid_t win)
 {
        VALID_WINDOW(win, return);
        g_return_if_fail(win != NULL);
-       g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
+       g_return_if_fail(win->type == wintype_TextBuffer || win->type == wintype_TextGrid);
 
        g_hash_table_foreach(win->hyperlinks, hyperlink_unblock_event_handler, NULL);
 
@@ -156,7 +153,7 @@ glk_cancel_hyperlink_event(winid_t win)
 {
        VALID_WINDOW(win, return);
        g_return_if_fail(win != NULL);
-       g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
+       g_return_if_fail(win->type == wintype_TextBuffer || win->type == wintype_TextGrid);
 
        g_hash_table_foreach(win->hyperlinks, hyperlink_block_event_handler, NULL);
 }