# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1241405822 0
# Node ID 9cb95f21979d89b1e2139a1bfc8642a5685e8fdf
# Parent  0cc77ced0ae366813bd00124898ace8ca14e27ab# Parent  d97a130da2905b9917d44cf684e7cfccf56a59bf
merge of '7e8d9f694132bc0cdbb6088ca5b557480c71ba45'
     and 'f19814a9bc18cc2b84bdfc83d02569128c4fd66f'

diff -r d97a130da290 -r 9cb95f21979d ChangeLog.API
--- a/ChangeLog.API	Mon May 04 02:54:55 2009 +0000
+++ b/ChangeLog.API	Mon May 04 02:57:02 2009 +0000
@@ -79,6 +79,7 @@
 		  gtk_imhtml_link_activate functions to process GtkIMHtmlLink
 		  objects from GtkIMHtml protocol callbacks.
 		* gtk_imhtml_set_return_inserts_newline
+		* gtk_imhtml_set_populate_primary_clipboard
 		* pidgin_blist_set_theme
 		* pidgin_blist_get_theme
 		* pidgin_prefs_labeled_password
diff -r d97a130da290 -r 9cb95f21979d pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h	Mon May 04 02:54:55 2009 +0000
+++ b/pidgin/gtkimhtml.h	Mon May 04 02:57:02 2009 +0000
@@ -962,7 +962,7 @@
  * text (as you would expect).  For scenarios (e.g. select-on-focus) where this
  * would be problematic, this function can disable the PRIMARY population.
  *
- * @oaram imhtml The GtkIMHtml to enable/disable populating PRIMARY
+ * @param imhtml The GtkIMHtml to enable/disable populating PRIMARY
  * @param populate enable/disable PRIMARY population
  */
 void gtk_imhtml_set_populate_primary_clipboard(GtkIMHtml *imhtml, gboolean populate);