# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1134436182 0
# Node ID 24beec3e42ad5477ede6c028469d6bbdfacb87e9
# Parent  d180bb2953e766c6a78b07e054f1249e4c19f74b
[gaim-migrate @ 14785]
(20:03:10) sadrul: http://sadrul.no-ip.org:1337/~sadrul/gaim/patch.patch
<-- this fixes the format-shortcuts work in the statusbox for gtk+ < 2.4
-- it'd be great if i didn't have to submit it in the tracker

committer: Tailor Script <tailor@pidgin.im>

diff -r d180bb2953e7 -r 24beec3e42ad src/gtkblist.c
--- a/src/gtkblist.c	Tue Dec 13 00:49:56 2005 +0000
+++ b/src/gtkblist.c	Tue Dec 13 01:09:42 2005 +0000
@@ -3439,7 +3439,6 @@
 	return FALSE;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static gboolean
 gtk_blist_window_key_press_cb(GtkWidget *w, GdkEventKey *event, GaimGtkBuddyList *gtkblist)
 {
@@ -3450,11 +3449,10 @@
 
 	imhtml = gtk_window_get_focus(GTK_WINDOW(gtkblist->window));
 
-	if (GTK_IS_IMHTML(imhtml) && gtk_bindings_activate_event(GTK_OBJECT(imhtml), event))
+	if (GTK_IS_IMHTML(imhtml) && gtk_bindings_activate(GTK_OBJECT(imhtml), event->keyval, event->state))
 		return TRUE;
 	return FALSE;
 }
-#endif
 
 static void gaim_gtk_blist_show(GaimBuddyList *list)
 {
@@ -3494,9 +3492,7 @@
 	g_signal_connect(G_OBJECT(gtkblist->window), "configure_event", G_CALLBACK(gtk_blist_configure_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkblist->window), "visibility_notify_event", G_CALLBACK(gtk_blist_visibility_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkblist->window), "window_state_event", G_CALLBACK(gtk_blist_window_state_cb), NULL);
-#if GTK_CHECK_VERSION(2,4,0)
 	g_signal_connect(G_OBJECT(gtkblist->window), "key_press_event", G_CALLBACK(gtk_blist_window_key_press_cb), gtkblist);
-#endif
 	gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK);
 
 	/******************************* Menu bar *************************************/