RSS was not really disabled when it was supposed to be. Experimental wireless support.

[monky] / src / conky.h

diff --git a/src/conky.h b/src/conky.h
index 8512c4a..d941121 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -47,7 +47,7 @@
 #endif
 
 #ifdef RSS
-#include <glib.h>
+#include "prss.h"
 #endif
 
 #include "mboxscan.h"
@@ -101,6 +101,13 @@ struct net_stat {
        struct sockaddr addr;
        int linkstatus;
        double net_rec[15], net_trans[15];
+       // wireless extensions
+       char essid[32];
+       char bitrate[16];
+       char mode[16];
+       char ap[18];
+       int link_qual;
+       int link_qual_max;
 };
 
 unsigned int diskio_value;
@@ -155,6 +162,7 @@ struct mpd_s {
        int bitrate;
        int length;
        int elapsed;
+       int max_title_len;              /* e.g. ${mpd_title 50} */
 };
 #endif
 
@@ -462,12 +470,15 @@ extern int no_buffers;
 
 /* system dependant (in linux.c) */
 
+int check_mount(char *s);
 void update_diskio(void);
 void prepare_update(void);
 void update_uptime(void);
 void update_meminfo(void);
 void update_net_stats(void);
+#if 0
 void update_wifi_stats(void);
+#endif
 void update_cpu_usage(void);
 void update_total_processes(void);
 void update_running_processes(void);
@@ -598,9 +609,15 @@ char *get_hddtemp_info(char *dev, char *addr, int port, char *unit);
 
 /* in rss.c */
 #ifdef RSS
-GList* get_rss_info(char *uri, int count);
+PRSS* get_rss_info(char *uri, int delay);
+void init_rss_info();
+void free_rss_info();
 #endif /* RSS */
 
+#if defined(__linux__)
+extern int post_21_kernel;
+#endif /* __linux__ */
+
 /* in linux.c */
 
 #endif