Fixed build with --enable-debug=full thanks to Evgeni Golov.

Added declaration of hdaps_reset_timeout in xfce4-hdaps.h.
Rearranged some header #includes.

diff --git a/panel-plugin/hdaps.c b/panel-plugin/hdaps.c
index cb5e459c7f20b672e8dabac9d63329bf2454ad27..3fd30a60af9b16c428afdd2138bbe3e0bee7f653 100644 (file)
--- a/panel-plugin/hdaps.c
+++ b/panel-plugin/hdaps.c
@@ -26,8 +26,9 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include "hdaps.h"
 
 /* The most space we expect to need when reading in

diff --git a/panel-plugin/hdaps.h b/panel-plugin/hdaps.h
index 7672b2488a1d2a7a54d8722fb2f85e2e94d48f2f..70965befd30510d29c0029f431fee926797a22fc 100644 (file)
--- a/panel-plugin/hdaps.h
+++ b/panel-plugin/hdaps.h
@@ -21,6 +21,8 @@
 #ifndef __HDAPS_H__
 #define __HDAPS_H__
 
+#include <stdio.h>
+
 #define HDAPS_ERROR     -1
 #define HDAPS_OFF        0
 #define HDAPS_ON         1

diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c
index 046beac60daeaa2857a77d4a611ba0cc8a256c73..f716aa8b4d6c2c86835c48df2e4996c7fc760801 100644 (file)
--- a/panel-plugin/xfce4-hdaps-dialogs.c
+++ b/panel-plugin/xfce4-hdaps-dialogs.c
@@ -22,10 +22,12 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtk.h>
 #include <libxfcegui4/libxfcegui4.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include "xfce4-hdaps-dialogs.h"
+#include "hdaps.h"
 
 /* Wild guess. Actually borrowed from some code
    I copy-and-pasted. Doesn't seem too ugly. */

diff --git a/panel-plugin/xfce4-hdaps-dialogs.h b/panel-plugin/xfce4-hdaps-dialogs.h
index f4e85d2f383c98f65b3fc62a83438a361adba1b3..e800c30b7dd0557393fe7624d9264b0bbcda1c9c 100644 (file)
--- a/panel-plugin/xfce4-hdaps-dialogs.h
+++ b/panel-plugin/xfce4-hdaps-dialogs.h
@@ -21,7 +21,6 @@
 #ifndef __XFCE4_HDAPS_DIALOGS_H__
 #define __XFCE4_HDAPS_DIALOGS_H__
 
-#include "hdaps.h"
 #include "xfce4-hdaps.h"
 
 G_BEGIN_DECLS

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index e54532602c4eb1a8ded2ec4e540e23bfd18e7e32..29ee3b28b5019b9b1c52bf57b94f9fd845e54e35 100644 (file)
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -22,6 +22,7 @@
 #include <config.h>
 #endif
 
+#include "hdaps.h"
 #include "xfce4-hdaps.h"
 #include "xfce4-hdaps-dialogs.h"
 

diff --git a/panel-plugin/xfce4-hdaps.h b/panel-plugin/xfce4-hdaps.h
index cd4aa44ef618d3088ab89cc1919b1aabf4557805..65e545e719037956a91c5e68e273022374f43db4 100644 (file)
--- a/panel-plugin/xfce4-hdaps.h
+++ b/panel-plugin/xfce4-hdaps.h
@@ -25,7 +25,6 @@
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include <libxfce4panel/xfce-hvbox.h>
 #include <libxfce4util/libxfce4util.h>
-#include "hdaps.h"
 
 G_BEGIN_DECLS
 
@@ -64,6 +63,8 @@ typedef struct {
 void hdaps_save(XfcePanelPlugin *plugin,
                HdapsPlugin     *hdaps);
 
+void hdaps_reset_timeout(HdapsPlugin *hdaps);
+
 G_END_DECLS
 
 #endif