Mercurial > pidgin

comparison pidgin/gtkconvwin.h @ 32819:2c6510167895 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents 997570b274d1
children
comparison
equal deleted inserted replaced
32818:01ff09d4a463 32819:2c6510167895
46 46
47 struct 47 struct
48 { 48 {
49 GtkWidget *menubar; 49 GtkWidget *menubar;
50 50
51 GtkWidget *view_log; 51 GtkAction *view_log;
52 52
53 GtkWidget *send_file; 53 GtkAction *send_file;
54 GtkWidget *add_pounce; 54 GtkAction *get_attention;
55 GtkWidget *get_info; 55 GtkAction *add_pounce;
56 GtkWidget *invite; 56 GtkAction *get_info;
57 GtkAction *invite;
57 58
58 GtkWidget *alias; 59 GtkAction *alias;
59 GtkWidget *block; 60 GtkAction *block;
60 GtkWidget *unblock; 61 GtkAction *unblock;
61 GtkWidget *add; 62 GtkAction *add;
62 GtkWidget *remove; 63 GtkAction *remove;
63 64
64 GtkWidget *insert_link; 65 GtkAction *insert_link;
65 GtkWidget *insert_image; 66 GtkAction *insert_image;
66 67
67 GtkWidget *logging; 68 GtkAction *logging;
68 GtkWidget *sounds; 69 GtkAction *sounds;
69 GtkWidget *show_formatting_toolbar; 70 GtkAction *show_formatting_toolbar;
70 GtkWidget *show_timestamps;
71 GtkWidget *show_icon;
72 71
73 GtkWidget *send_to; 72 GtkWidget *send_to;
74 73
75 GtkWidget *tray; 74 GtkWidget *tray;
76 75
77 GtkWidget *typing_icon; 76 GtkWidget *typing_icon;
78 77
79 GtkItemFactory *item_factory; 78 GtkUIManager *ui;
80 79
81 } menu; 80 } menu;
82 81
83 struct 82 struct
84 { 83 {
96 95
97 gint drag_motion_signal; 96 gint drag_motion_signal;
98 gint drag_leave_signal; 97 gint drag_leave_signal;
99 98
100 /* Media menu options. */ 99 /* Media menu options. */
101 GtkWidget *audio_call; 100 GtkAction *audio_call;
102 GtkWidget *video_call; 101 GtkAction *video_call;
103 GtkWidget *audio_video_call; 102 GtkAction *audio_video_call;
104 }; 103 };
105 104
106 /*@}*/ 105 /*@}*/
106
107 G_BEGIN_DECLS
107 108
108 /************************************************************************** 109 /**************************************************************************
109 * @name GTK+ Conversation Window API 110 * @name GTK+ Conversation Window API
110 **************************************************************************/ 111 **************************************************************************/
111 /*@{*/ 112 /*@{*/
149 PidginConvPlacementFunc pidgin_conv_placement_get_current_func(void); 150 PidginConvPlacementFunc pidgin_conv_placement_get_current_func(void);
150 void pidgin_conv_placement_place(PidginConversation *gtkconv); 151 void pidgin_conv_placement_place(PidginConversation *gtkconv);
151 152
152 /*@}*/ 153 /*@}*/
153 154
155 G_END_DECLS
156
154 #endif /* _PIDGIN_CONVERSATION_WINDOW_H_ */ 157 #endif /* _PIDGIN_CONVERSATION_WINDOW_H_ */