# HG changeset patch # User Mark Doliner # Date 1233131507 0 # Node ID 7942287364c29e7a23cd1ab13908bd1750b9f3a3 # Parent 3461bf74cbf1cf7cf364c809d9ad5a1ab7231474 The first thing gtk_text_buffer_delete_selection does is call gtk_text_buffer_get_selection_bounds and check if anything is selected, so we don't need to do it ourselves. Side note: gtk_text_buffer_delete_selection is exactly the same in gtk HEAD as it was in 2.0.0 diff -r 3461bf74cbf1 -r 7942287364c2 pidgin/gtkimhtml.c --- a/pidgin/gtkimhtml.c Wed Jan 28 07:12:43 2009 +0000 +++ b/pidgin/gtkimhtml.c Wed Jan 28 08:31:47 2009 +0000 @@ -1125,8 +1125,8 @@ GtkTextIter iter; GtkIMHtmlOptions flags = plaintext ? GTK_IMHTML_NO_SMILEY : (GTK_IMHTML_NO_NEWLINE | GTK_IMHTML_NO_COMMENTS); - if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, NULL, NULL)) - gtk_text_buffer_delete_selection(imhtml->text_buffer, TRUE, TRUE); + /* Delete any currently selected text */ + gtk_text_buffer_delete_selection(imhtml->text_buffer, TRUE, TRUE); gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, gtk_text_buffer_get_insert(imhtml->text_buffer)); if (!imhtml->wbfo && !plaintext) @@ -4902,8 +4902,8 @@ { GtkTextIter iter; - if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, NULL, NULL)) - gtk_text_buffer_delete_selection(imhtml->text_buffer, TRUE, TRUE); + /* Delete any currently selected text */ + gtk_text_buffer_delete_selection(imhtml->text_buffer, TRUE, TRUE); gtk_imhtml_toggle_link(imhtml, url); gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, mark); @@ -4916,8 +4916,8 @@ GtkTextMark *mark; GtkTextIter iter; - if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, NULL, NULL)) - gtk_text_buffer_delete_selection(imhtml->text_buffer, TRUE, TRUE); + /* Delete any currently selected text */ + gtk_text_buffer_delete_selection(imhtml->text_buffer, TRUE, TRUE); mark = gtk_text_buffer_get_insert(imhtml->text_buffer);