comparison pidgin/gtkconvwin.h @ 32711:dc44bb639e8e

propagate from branch 'im.pidgin.pidgin' (head 069350831810b6f4bd534a26fed03260a9b4adcd) to branch 'im.pidgin.cpw.qulogic.gtk3' (head cf49f6cfd58e227b28dc1822e5ab543bbabd80b7)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 04 Jan 2012 02:37:25 +0000
parents 34f778db624f 763d65f3f758
children c631931c3794
comparison
equal deleted inserted replaced
32444:8436fb68930e 32711:dc44bb639e8e
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 *get_attention; 54 GtkAction *get_attention;
55 GtkWidget *add_pounce; 55 GtkAction *add_pounce;
56 GtkWidget *get_info; 56 GtkAction *get_info;
57 GtkWidget *invite; 57 GtkAction *invite;
58 58
59 GtkWidget *alias; 59 GtkAction *alias;
60 GtkWidget *block; 60 GtkAction *block;
61 GtkWidget *unblock; 61 GtkAction *unblock;
62 GtkWidget *add; 62 GtkAction *add;
63 GtkWidget *remove; 63 GtkAction *remove;
64 64
65 GtkWidget *insert_link; 65 GtkAction *insert_link;
66 GtkWidget *insert_image; 66 GtkAction *insert_image;
67 67
68 GtkWidget *logging; 68 GtkAction *logging;
69 GtkWidget *sounds; 69 GtkAction *sounds;
70 GtkWidget *show_formatting_toolbar; 70 GtkAction *show_formatting_toolbar;
71 GtkWidget *show_timestamps; 71 GtkAction *show_timestamps;
72
72 GtkWidget *show_icon; 73 GtkWidget *show_icon;
73 74
74 GtkWidget *send_to; 75 GtkWidget *send_to;
75 76
76 GtkWidget *tray; 77 GtkWidget *tray;
77 78
78 GtkWidget *typing_icon; 79 GtkWidget *typing_icon;
79 80
80 GtkItemFactory *item_factory; 81 GtkUIManager *ui;
81 82
82 } menu; 83 } menu;
83 84
84 struct 85 struct
85 { 86 {
97 98
98 gint drag_motion_signal; 99 gint drag_motion_signal;
99 gint drag_leave_signal; 100 gint drag_leave_signal;
100 101
101 /* Media menu options. */ 102 /* Media menu options. */
102 GtkWidget *audio_call; 103 GtkAction *audio_call;
103 GtkWidget *video_call; 104 GtkAction *video_call;
104 GtkWidget *audio_video_call; 105 GtkAction *audio_video_call;
105 }; 106 };
106 107
107 /*@}*/ 108 /*@}*/
108 109
109 G_BEGIN_DECLS 110 G_BEGIN_DECLS