Mercurial > pidgin.yaz
changeset 12474:24beec3e42ad
[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>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 13 Dec 2005 01:09:42 +0000 |
| parents | d180bb2953e7 |
| children | 572d6d5da418 |
| files | src/gtkblist.c |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 *************************************/