Merge branch 'master' into windows

2013-08-25 23:27:42 +01:00
parent 3c39befa5e e21bf8a18d
commit d3cfeb9d5c
29 changed files with 861 additions and 279 deletions
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -179,6 +179,7 @@ void cons_show_software_version(const char * const jid,
    const char * const version, const char * const os);
 void cons_show_account_list(gchar **accounts);
 void cons_show_room_list(GSList *room, const char * const conference_node);
+void cons_show_bookmarks(const GList *list);
 void cons_show_disco_items(GSList *items, const char * const jid);
 void cons_show_disco_info(const char *from, GSList *identities, GSList *features);
 void cons_show_room_invite(const char * const invitor, const char * const room,