diff options
Diffstat (limited to 'pidgin/gtkconvwin.h')
| -rw-r--r-- | pidgin/gtkconvwin.h | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/pidgin/gtkconvwin.h b/pidgin/gtkconvwin.h index 986b1ca28f..c2a5268704 100644 --- a/pidgin/gtkconvwin.h +++ b/pidgin/gtkconvwin.h @@ -46,29 +46,33 @@ struct _PidginWindow struct { + GtkUIManager *ui; GtkWidget *menubar; - GtkWidget *view_log; + GtkAction *view_log; - GtkWidget *send_file; - GtkWidget *add_pounce; - GtkWidget *get_info; - GtkWidget *invite; + GtkAction *audio_call; + GtkAction *video_call; + GtkAction *audio_video_call; - GtkWidget *alias; - GtkWidget *block; - GtkWidget *unblock; - GtkWidget *add; - GtkWidget *remove; + GtkAction *send_file; + GtkAction *get_attention; + GtkAction *add_pounce; + GtkAction *get_info; + GtkAction *invite; - GtkWidget *insert_link; - GtkWidget *insert_image; + GtkAction *alias; + GtkAction *block; + GtkAction *unblock; + GtkAction *add; + GtkAction *remove; - GtkWidget *logging; - GtkWidget *sounds; - GtkWidget *show_formatting_toolbar; - GtkWidget *show_timestamps; - GtkWidget *show_icon; + GtkAction *insert_link; + GtkAction *insert_image; + + GtkAction *logging; + GtkAction *sounds; + GtkAction *show_formatting_toolbar; GtkWidget *send_to; @@ -76,16 +80,8 @@ struct _PidginWindow GtkWidget *typing_icon; - GtkItemFactory *item_factory; - } menu; - struct - { - GtkWidget *search; - - } dialogs; - /* Tab dragging stuff. */ gboolean in_drag; gboolean in_predrag; @@ -96,15 +92,12 @@ struct _PidginWindow gint drag_motion_signal; gint drag_leave_signal; - - /* Media menu options. */ - GtkWidget *audio_call; - GtkWidget *video_call; - GtkWidget *audio_video_call; }; /*@}*/ +G_BEGIN_DECLS + /************************************************************************** * @name GTK+ Conversation Window API **************************************************************************/ @@ -151,4 +144,6 @@ void pidgin_conv_placement_place(PidginConversation *gtkconv); /*@}*/ +G_END_DECLS + #endif /* _PIDGIN_CONVERSATION_WINDOW_H_ */ |