2006-03-07 [paul] 2.0.0cvs117

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index 722fcb53e635ffd519d62a984796ffcae21539df..5355eb47aa87a8535e124506af598cfe79c50eab 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -100,16 +100,6 @@ static GdkColor emphasis_color = {
        (gushort)0xcfff
 };
 
-#if 0
-static GdkColor error_color = {
-       (gulong)0,
-       (gushort)0xefff,
-       (gushort)0,
-       (gushort)0
-};
-#endif
-
-
 static GdkCursor *hand_cursor = NULL;
 static GdkCursor *text_cursor = NULL;
 
@@ -1232,12 +1222,8 @@ enum
 void textview_set_position(TextView *textview, gint pos)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
-       GtkTextIter iter;
 
-       gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
-       gtk_text_buffer_place_cursor(buffer, &iter);
-       gtk_text_view_scroll_to_iter(text, &iter, 0.0, FALSE, 0.0, 0.0);
+       gtkut_text_view_set_position(text, pos);
 }
 
 static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
@@ -1315,6 +1301,7 @@ static void textview_show_face(TextView *textview)
                gtk_widget_destroy(textview->image);
        
        textview->image = face_get_from_header(msginfo->face);
+       g_return_if_fail(textview->image != NULL);
 
        gtk_widget_show(textview->image);
        
@@ -1360,6 +1347,7 @@ static void textview_show_xface(TextView *textview)
        textview->image = xface_get_from_header(msginfo->xface,
                                &textview->text->style->white,
                                textview->text->window);
+       g_return_if_fail(textview->image != NULL);
 
        gtk_widget_show(textview->image);
        
@@ -1441,65 +1429,16 @@ gboolean textview_search_string(TextView *textview, const gchar *str,
                                gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer;
-       GtkTextIter iter, match_pos;
-       GtkTextMark *mark;
-       gint len;
-
-       g_return_val_if_fail(str != NULL, FALSE);
-
-       buffer = gtk_text_view_get_buffer(text);
-
-       len = g_utf8_strlen(str, -1);
-       g_return_val_if_fail(len >= 0, FALSE);
-
-       mark = gtk_text_buffer_get_insert(buffer);
-       gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-
-       if (gtkut_text_buffer_find(buffer, &iter, str, case_sens,
-                                  &match_pos)) {
-               GtkTextIter end = match_pos;
 
-               gtk_text_iter_forward_chars(&end, len);
-               /* place "insert" at the last character */
-               gtk_text_buffer_select_range(buffer, &end, &match_pos);
-               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
-               return TRUE;
-       }
-
-       return FALSE;
+       return gtkut_text_view_search_string(text, str, case_sens);
 }
 
 gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                                         gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer;
-       GtkTextIter iter, match_pos;
-       GtkTextMark *mark;
-       gint len;
-
-       g_return_val_if_fail(str != NULL, FALSE);
-
-       buffer = gtk_text_view_get_buffer(text);
 
-       len = g_utf8_strlen(str, -1);
-       g_return_val_if_fail(len >= 0, FALSE);
-
-       mark = gtk_text_buffer_get_insert(buffer);
-       gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-
-       if (gtkut_text_buffer_find_backward(buffer, &iter, str, case_sens,
-                                           &match_pos)) {
-               GtkTextIter end = match_pos;
-
-               gtk_text_iter_forward_chars(&end, len);
-               gtk_text_buffer_select_range(buffer, &match_pos, &end);
-               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
-               return TRUE;
-       }
-
-       return FALSE;
+       return gtkut_text_view_search_string_backward(text, str, case_sens);
 }
 
 void textview_scroll_one_line(TextView *textview, gboolean up)
@@ -2037,7 +1976,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
 
                uri_path = get_uri_path(uri->uri);
                visible_uri_path = get_uri_path(visible_str);
-               if (strcmp(uri_path, visible_uri_path) != 0)
+               if (path_cmp(uri_path, visible_uri_path) != 0)
                        retval = FALSE;
        }