comparison pidgin/gtkconvwin.h @ 22277:be419fb6eb20

merge of '4c2c343355f23e33c5b251b3d61f07af3fd8ac8b' and '8bec06d2cd0a64ece46cb3cd73db9b085b91e161'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Sat, 09 Feb 2008 07:35:21 +0000
parents bd25f8c9d94e
children c0ad0943cd6e
comparison
equal deleted inserted replaced
22274:4fced932324a 22277:be419fb6eb20
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 *send_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;