Mercurial > pidgin
diff pidgin/gtkconvwin.h @ 32593:bb7d8b9d8846
Use GtkActions instead of GtkWidgets for the shortcuts to items in the menu
on the conversation window for GTK+ 2.6+. I don't think it works properly
for 2.4<x<2.6 though.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Tue, 28 Jul 2009 05:28:46 +0000 |
parents | d446530cb831 |
children | b4f15d6d5b7e |
line wrap: on
line diff
--- a/pidgin/gtkconvwin.h Tue Jul 28 04:30:58 2009 +0000 +++ b/pidgin/gtkconvwin.h Tue Jul 28 05:28:46 2009 +0000 @@ -46,8 +46,31 @@ struct { +/* Some necessary functions were only added in 2.6.0 */ GtkWidget *menubar; +#if GTK_CHECK_VERSION(2,6,0) + GtkAction *view_log; + + GtkAction *send_file; + GtkAction *add_pounce; + GtkAction *get_info; + GtkAction *invite; + + GtkAction *alias; + GtkAction *block; + GtkAction *unblock; + GtkAction *add; + GtkAction *remove; + + GtkAction *insert_link; + GtkAction *insert_image; + + GtkAction *logging; + GtkAction *sounds; + GtkAction *show_formatting_toolbar; + GtkAction *show_timestamps; +#else GtkWidget *view_log; GtkWidget *send_file; @@ -68,6 +91,7 @@ GtkWidget *sounds; GtkWidget *show_formatting_toolbar; GtkWidget *show_timestamps; +#endif GtkWidget *show_icon; GtkWidget *send_to; @@ -102,9 +126,15 @@ gint drag_leave_signal; /* Media menu options. */ +#if GTK_CHECK_VERSION(2,4,0) + GtkAction *audio_call; + GtkAction *video_call; + GtkAction *audio_video_call; +#else GtkWidget *audio_call; GtkWidget *video_call; GtkWidget *audio_video_call; +#endif }; /*@}*/