[Gaim-commits] SF.net SVN: gaim: [17566] trunk/gtk/gtkimhtml.c

[<dat...@us...>]

Revision: 17566
          http://svn.sourceforge.net/gaim/?rev=17566&view=rev
Author:   datallah
Date:     2006-10-23 11:10:51 -0700 (Mon, 23 Oct 2006)

Log Message:
-----------
fix searching in an empty conversation (SF bug #1582852)

Modified Paths:
--------------
    trunk/gtk/gtkimhtml.c

Modified: trunk/gtk/gtkimhtml.c
===================================================================
--- trunk/gtk/gtkimhtml.c	2006-10-23 17:53:55 UTC (rev 17565)
+++ trunk/gtk/gtkimhtml.c	2006-10-23 18:10:51 UTC (rev 17566)
@@ -3531,22 +3531,25 @@
 {
 	GtkTextIter iter, start, end;
 	gboolean new_search = TRUE;
+	GtkTextMark *start_mark;
 
 	g_return_val_if_fail(imhtml != NULL, FALSE);
 	g_return_val_if_fail(text != NULL, FALSE);
 
-	if (imhtml->search_string && !strcmp(text, imhtml->search_string))
+	start_mark = gtk_text_buffer_get_mark(imhtml->text_buffer, "search");
+
+	if (start_mark && imhtml->search_string && !strcmp(text, imhtml->search_string))
 		new_search = FALSE;
 
 	if (new_search) {
 		gtk_imhtml_search_clear(imhtml);
+		g_free(imhtml->search_string);
+		imhtml->search_string = g_strdup(text);
 		gtk_text_buffer_get_start_iter(imhtml->text_buffer, &iter);
 	} else {
 		gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter,
-						 gtk_text_buffer_get_mark(imhtml->text_buffer, "search"));
+						 start_mark);
 	}
-	g_free(imhtml->search_string);
-	imhtml->search_string = g_strdup(text);
 
 	if (gtk_source_iter_forward_search(&iter, imhtml->search_string,
 	                                   GTK_SOURCE_SEARCH_VISIBLE_ONLY | GTK_SOURCE_SEARCH_CASE_INSENSITIVE,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.