fixes #10

Makefile.am

@@ -28,4 +28,7 @@ test-empty:
 	echo 0 > 'test/BAT0/capacity'
 	echo 0 > 'test/BAT0/capacity'
 
+test-nosup:
+	rm -rf 'test/'
+
 SUBDIRS = src img

img/LICENSE

@@ -21,7 +21,7 @@ To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/
 17. "./empty.png"
 18. "./full.png"
 19. "./bork.png"
-
+20. "./nobat.png"
 
 --
 Alexej Magura

img/Makefile.am

@@ -7,7 +7,7 @@ pngdir = $(iconsdir)/16x16/apps
 
 if GTK2
 #dist_scale_DATA = full.svg empty.svg qempty.svg qfull.svg half.svg bork.svg
-dist_png_DATA = full.png empty.png qempty.png qfull.png half.png bork.png
+dist_png_DATA = full.png empty.png qempty.png qfull.png half.png bork.png nobat.png
 endif
 
 all-local: #local-license

src/Makefile.am

@@ -121,3 +121,6 @@ test-lowbat:
 
 test-empty:
 	cd "$(top_srcdir)"; make $@
+
+test-nosup:
+	cd "$(top_srcdir)"; make $@

src/main.h

@@ -35,7 +35,7 @@ limitations under the License.
 
 /** ^^ Macros ^^ **/
 # ifndef ZB_DEBUG
-#  define ZB_DEBUG 1 // XXX change this to turn debug messages on/off
+#  define ZB_DEBUG 0 // XXX change this to turn debug messages on/off
 # endif
 
 # ifndef ZB_USE_KCAT

src/main_gui.pyx

@@ -70,13 +70,14 @@ def getPixbuf(charge):
 
 def sync_icon(tcon):
     pwr = py_getpwr()
-    print pwr.err
     tcon.set_from_pixbuf(getPixbuf(pwr.tr if pwr.err is 0 else pwr.err))
     ttip = 'A/C: %s\n' % 'online' if pwr.acline is 1 else 'offline'
     if pwr.err is 0:
         ttip += 'Battery: %s' % str(pwr.raw)
     elif pwr.err is -2:
         ttip += 'No battery!'
+    elif pwr.err is -5:
+        ttip = 'No power supply!'
     tcon.set_tooltip(ttip);
     return True
 

src/power.c

@@ -116,7 +116,7 @@ struct py_power py_getpwr()
      ZB_DBG("pwr.charge.raw: %d\n", pwr.charge.raw);
      zb_ping;
      ZB_DBG("*pwr.err.last: %d\n", *pwr.err.last);
-     pyp.err = *pwr.err.vp;
+     pyp.err = *pwr.err.last;
      pyp.tr = pwr.charge.tr;
      pyp.raw = pwr.charge.raw;
      zb_pong;