diff -r 5778e65626ca -r 389cabbfe56a pidgin/gtkconvwin.h --- a/pidgin/gtkconvwin.h Tue Sep 24 17:53:15 2013 +0530 +++ b/pidgin/gtkconvwin.h Wed Sep 25 19:25:42 2013 +0530 @@ -26,6 +26,7 @@ #ifndef _PIDGIN_CONVERSATION_WINDOW_H_ #define _PIDGIN_CONVERSATION_WINDOW_H_ +typedef struct _PidginWindowMenu PidginWindowMenu; typedef struct _PidginWindow PidginWindow; @@ -34,6 +35,43 @@ **************************************************************************/ /*@{*/ +struct _PidginWindowMenu +{ + GtkUIManager *ui; + GtkWidget *menubar; + + GtkAction *view_log; + + GtkAction *audio_call; + GtkAction *video_call; + GtkAction *audio_video_call; + + GtkAction *send_file; + GtkAction *get_attention; + 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; + + GtkWidget *send_to; + + GtkWidget *tray; + + GtkWidget *typing_icon; +}; + /** * A GTK+ representation of a graphical window containing one or more * conversations. @@ -46,43 +84,7 @@ PidginConversation *clicked_tab; /**< The menu currently clicked. */ GList *gtkconvs; - struct - { - GtkUIManager *ui; - GtkWidget *menubar; - - GtkAction *view_log; - - GtkAction *audio_call; - GtkAction *video_call; - GtkAction *audio_video_call; - - GtkAction *send_file; - GtkAction *get_attention; - 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; - - GtkWidget *send_to; - - GtkWidget *tray; - - GtkWidget *typing_icon; - - } menu; + PidginWindowMenu *menu; /* Tab dragging stuff. */ gboolean in_drag;