Mercurial > pidgin.yaz
comparison pidgin/gtklog.h @ 32779:d72f2f13b60f
merge of 'c8c73eea7431e6f940916315ace40a41c8da3faa'
and 'fec428131bde0ae8247941bd6a3d996c984c9189'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Fri, 21 Oct 2011 14:36:18 +0000 |
parents | fe75cd926073 |
children |
comparison
equal
deleted
inserted
replaced
32778:14787acaf9d7 | 32779:d72f2f13b60f |
---|---|
41 GList *logs; /**< The list of logs viewed in this viewer */ | 41 GList *logs; /**< The list of logs viewed in this viewer */ |
42 | 42 |
43 GtkWidget *window; /**< The viewer's window */ | 43 GtkWidget *window; /**< The viewer's window */ |
44 GtkTreeStore *treestore; /**< The treestore containing said logs */ | 44 GtkTreeStore *treestore; /**< The treestore containing said logs */ |
45 GtkWidget *treeview; /**< The treeview representing said treestore */ | 45 GtkWidget *treeview; /**< The treeview representing said treestore */ |
46 GtkWidget *imhtml; /**< The imhtml to display said logs */ | 46 GtkWidget *web_view; /**< The webkit web view to display said logs */ |
47 GtkWidget *entry; /**< The search entry, in which search terms | 47 GtkWidget *entry; /**< The search entry, in which search terms |
48 * are entered */ | 48 * are entered */ |
49 PurpleLogReadFlags flags; /**< The most recently used log flags */ | 49 PurpleLogReadFlags flags; /**< The most recently used log flags */ |
50 char *search; /**< The string currently being searched for */ | 50 char *search; /**< The string currently being searched for */ |
51 GtkWidget *label; /**< The label at the top of the log viewer */ | 51 GtkWidget *label; /**< The label at the top of the log viewer */ |