comparison 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
comparison
equal deleted inserted replaced
32592:d446530cb831 32593:bb7d8b9d8846
44 GtkWidget *notebook; /**< The notebook of conversations. */ 44 GtkWidget *notebook; /**< The notebook of conversations. */
45 GList *gtkconvs; 45 GList *gtkconvs;
46 46
47 struct 47 struct
48 { 48 {
49 /* Some necessary functions were only added in 2.6.0 */
49 GtkWidget *menubar; 50 GtkWidget *menubar;
50 51
52 #if GTK_CHECK_VERSION(2,6,0)
53 GtkAction *view_log;
54
55 GtkAction *send_file;
56 GtkAction *add_pounce;
57 GtkAction *get_info;
58 GtkAction *invite;
59
60 GtkAction *alias;
61 GtkAction *block;
62 GtkAction *unblock;
63 GtkAction *add;
64 GtkAction *remove;
65
66 GtkAction *insert_link;
67 GtkAction *insert_image;
68
69 GtkAction *logging;
70 GtkAction *sounds;
71 GtkAction *show_formatting_toolbar;
72 GtkAction *show_timestamps;
73 #else
51 GtkWidget *view_log; 74 GtkWidget *view_log;
52 75
53 GtkWidget *send_file; 76 GtkWidget *send_file;
54 GtkWidget *add_pounce; 77 GtkWidget *add_pounce;
55 GtkWidget *get_info; 78 GtkWidget *get_info;
66 89
67 GtkWidget *logging; 90 GtkWidget *logging;
68 GtkWidget *sounds; 91 GtkWidget *sounds;
69 GtkWidget *show_formatting_toolbar; 92 GtkWidget *show_formatting_toolbar;
70 GtkWidget *show_timestamps; 93 GtkWidget *show_timestamps;
94 #endif
71 GtkWidget *show_icon; 95 GtkWidget *show_icon;
72 96
73 GtkWidget *send_to; 97 GtkWidget *send_to;
74 98
75 GtkWidget *tray; 99 GtkWidget *tray;
100 124
101 gint drag_motion_signal; 125 gint drag_motion_signal;
102 gint drag_leave_signal; 126 gint drag_leave_signal;
103 127
104 /* Media menu options. */ 128 /* Media menu options. */
129 #if GTK_CHECK_VERSION(2,4,0)
130 GtkAction *audio_call;
131 GtkAction *video_call;
132 GtkAction *audio_video_call;
133 #else
105 GtkWidget *audio_call; 134 GtkWidget *audio_call;
106 GtkWidget *video_call; 135 GtkWidget *video_call;
107 GtkWidget *audio_video_call; 136 GtkWidget *audio_video_call;
137 #endif
108 }; 138 };
109 139
110 /*@}*/ 140 /*@}*/
111 141
112 /************************************************************************** 142 /**************************************************************************