changeset 11385:78cd70f4834c

[gaim-migrate @ 13612] a fairly straightforward patch from Sadrul Habib Chowdhury to make control-r reset the formatting in a conversation (very useful) with control-r (which I do not *think* will offend anyone as a default keystroke), and have it be changable via ~/.gtkrc-2.0. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 31 Aug 2005 15:07:46 +0000
parents 08bf44bcedfe
children 4eaa0f7eb3c9
files src/gtkimhtml.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Wed Aug 31 13:47:38 2005 +0000
+++ b/src/gtkimhtml.c	Wed Aug 31 15:07:46 2005 +0000
@@ -1230,7 +1230,7 @@
 					      G_TYPE_INT);
 	signals[CLEAR_FORMAT] = g_signal_new("format_function_clear",
 					      G_TYPE_FROM_CLASS(gobject_class),
-					      G_SIGNAL_RUN_FIRST,
+					      G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 					      G_STRUCT_OFFSET(GtkIMHtmlClass, clear_format),
 					      NULL,
 					      0,
@@ -1275,6 +1275,7 @@
 	gtk_binding_entry_add_signal (binding_set, GDK_equal, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_GROW);
 	gtk_binding_entry_add_signal (binding_set, GDK_minus, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_SHRINK);
 	binding_set = gtk_binding_set_by_class(klass);
+	gtk_binding_entry_add_signal (binding_set, GDK_r, GDK_CONTROL_MASK, "format_function_clear", 0);
 	gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "message_send", 0);
 	gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "message_send", 0);
 }