From: Luke S. <lsc...@us...> - 2004-03-17 20:33:27
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32543/src Modified Files: gtkimhtml.c Log Message: " if the user has the pref set to false, we're still handling the key.. This is bad if for instance.. the user wants to do something like ctrl-shift-b-3 to display a superscripted 3. This patch makes the callback function return FALSE so that it will propergate down to the GtkTextView and give the user the desired behavior. i realized this will conflict when i finish 9, 10, and 11 on simguys list, and since i already had 11 done.. I'll just throw it in with this.. so here's the updated update patch ;) simguy's imhtml bug 11 is that the italic and underline buttons don't get toggled when you press ctrl-i ctrl-u this fixes that as well as my initial comment ;)" --Gary Kramlich Index: gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.287 retrieving revision 1.288 diff -u -d -p -r1.287 -r1.288 --- gtkimhtml.c 16 Mar 2004 19:43:58 -0000 1.287 +++ gtkimhtml.c 17 Mar 2004 20:23:44 -0000 1.288 @@ -393,9 +393,10 @@ gboolean gtk_key_pressed_cb(GtkIMHtml *i object = g_object_ref(G_OBJECT(imhtml)); g_signal_emit(object, signals[TOGGLE_FORMAT], 0, GTK_IMHTML_BOLD); g_object_unref(object); + return TRUE; } } - return TRUE; + return FALSE; break; case 'f': @@ -410,17 +411,27 @@ gboolean gtk_key_pressed_cb(GtkIMHtml *i case 'i': case 'I': if (imhtml->format_functions & GTK_IMHTML_ITALIC) - if(imhtml->html_shortcuts) + if(imhtml->html_shortcuts) { gtk_imhtml_toggle_italic(imhtml); - return TRUE; + object = g_object_ref(G_OBJECT(imhtml)); + g_signal_emit(object, signals[TOGGLE_FORMAT], 0, GTK_IMHTML_ITALIC); + g_object_unref(object); + return TRUE; + } + return FALSE; break; case 'u': /* ctrl-u is GDK_Clear, which clears the line. */ case 'U': if (imhtml->format_functions & GTK_IMHTML_UNDERLINE) - if(imhtml->html_shortcuts) + if(imhtml->html_shortcuts) { gtk_imhtml_toggle_underline(imhtml); - return TRUE; + object = g_object_ref(G_OBJECT(imhtml)); + g_signal_emit(object, signals[TOGGLE_FORMAT], 0, GTK_IMHTML_UNDERLINE); + g_object_unref(object); + return TRUE; + } + return FALSE; break; case '-': |