Merge remote-tracking branch 'asdil12/tray_config'

2016-04-17 23:17:43 +01:00
parent 6cc04bc3ba 4cb1d73a83
commit 2daa02cb60
9 changed files with 60 additions and 5 deletions
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -444,6 +444,7 @@ void cons_reconnect_setting(void) {}
 void cons_autoping_setting(void) {}
 void cons_autoconnect_setting(void) {}
 void cons_inpblock_setting(void) {}
+void cons_tray_setting(void) {}

 void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity)
 {