Mercurial > pidgin
comparison pidgin/gtklog.c @ 29347:dcd52d2b1b97
propagate from branch 'im.pidgin.pidgin' (head d5a2e2287440ac7134c201e66921754bd4187ba9)
to branch 'im.pidgin.pidgin.next.minor' (head 8be858d2b980ae4cf363247290bb782ab4362bec)
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Sat, 09 Jan 2010 04:03:53 +0000 |
parents | 48ea900ee72a ee1ed5d16235 |
children | 917c597beb97 a3bd979c9ce4 |
comparison
equal
deleted
inserted
replaced
29346:ba8577b87d2e | 29347:dcd52d2b1b97 |
---|---|
418 | 418 |
419 static gboolean search_find_cb(gpointer data) | 419 static gboolean search_find_cb(gpointer data) |
420 { | 420 { |
421 PidginLogViewer *viewer = data; | 421 PidginLogViewer *viewer = data; |
422 gtk_imhtml_search_find(GTK_IMHTML(viewer->imhtml), viewer->search); | 422 gtk_imhtml_search_find(GTK_IMHTML(viewer->imhtml), viewer->search); |
423 g_object_steal_data(G_OBJECT(viewer->entry), "search-find-cb"); | |
423 return FALSE; | 424 return FALSE; |
424 } | 425 } |
425 | 426 |
426 static void log_select_cb(GtkTreeSelection *sel, PidginLogViewer *viewer) { | 427 static void log_select_cb(GtkTreeSelection *sel, PidginLogViewer *viewer) { |
427 GtkTreeIter iter; | 428 GtkTreeIter iter; |
470 GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL | | 471 GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL | |
471 ((flags & PURPLE_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0)); | 472 ((flags & PURPLE_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0)); |
472 g_free(read); | 473 g_free(read); |
473 | 474 |
474 if (viewer->search != NULL) { | 475 if (viewer->search != NULL) { |
476 guint source; | |
475 gtk_imhtml_search_clear(GTK_IMHTML(viewer->imhtml)); | 477 gtk_imhtml_search_clear(GTK_IMHTML(viewer->imhtml)); |
476 g_idle_add(search_find_cb, viewer); | 478 source = g_idle_add(search_find_cb, viewer); |
479 g_object_set_data_full(G_OBJECT(viewer->entry), "search-find-cb", | |
480 GINT_TO_POINTER(source), (GDestroyNotify)g_source_remove); | |
477 } | 481 } |
478 | 482 |
479 pidgin_clear_cursor(viewer->window); | 483 pidgin_clear_cursor(viewer->window); |
480 } | 484 } |
481 | 485 |