Merge branch 'reload-config' Conflicts: Makefile

1 files changed, 6 insertions, 5 deletions

diff --git a/tray.h b/tray.h
index 223ac26..b528ad6 100644
--- a/tray.h
+++ b/tray.h
@@ -22,11 +22,11 @@
 #include <glib.h>
 
 #include "widget_manager.h"
-#include "freq_tray/getfreq.h"
-#include "freq_tray/getcore.h"
-#include "freq_tray/getgov.h"
-#include "trayfreq_set/trayfreq_set_interface.h"
-#include "bat_tray/bat_tray.h"
+#include "getfreq.h"
+#include "getcore.h"
+#include "getgov.h"
+#include "trayfreq_set_interface.h"
+#include "bat_tray.h"
 #include "defaults.h"
 
 #include <gtk/gtk.h>
@@ -36,6 +36,7 @@
 #include <libintl.h>
 
 
+void     tray_set_defaults();
 void     tray_init();
 void     tray_set_tooltip(const gchar* msg);
 void     tray_update_icon_percent();