Mercurial > pidgin.yaz
comparison pidgin/gtkconvwin.h @ 29695:b1284d63b969
propagate from branch 'im.pidgin.pidgin' (head 29f6b9d81574bfa9235dbd438a8934f06552e368)
to branch 'im.pidgin.cpw.attention_ui' (head 382194d06f05cbf5030ec6471a719e32bf6ef9d7)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 20 Sep 2009 19:57:21 +0000 |
| parents | ae24e54a5014 |
| children | 28880022598c |
comparison
equal
deleted
inserted
replaced
| 28646:5f97830906bc | 29695:b1284d63b969 |
|---|---|
| 49 GtkWidget *menubar; | 49 GtkWidget *menubar; |
| 50 | 50 |
| 51 GtkWidget *view_log; | 51 GtkWidget *view_log; |
| 52 | 52 |
| 53 GtkWidget *send_file; | 53 GtkWidget *send_file; |
| 54 GtkWidget *get_attention; | |
| 54 GtkWidget *add_pounce; | 55 GtkWidget *add_pounce; |
| 55 GtkWidget *get_info; | 56 GtkWidget *get_info; |
| 56 GtkWidget *invite; | 57 GtkWidget *invite; |
| 57 | 58 |
| 58 GtkWidget *alias; | 59 GtkWidget *alias; |