Merge branch 'master' into gregoa

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index da430127856362fa49ef35549cef20fad158814c..d27624c4dff684301a36a2240bc8d462bf389560 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua5.1 libomhacks x1
 add_packages(ZAVAI ${packages})
 
 set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist libzavai)
-set(VFLAGS --vapidir=${zavai_SOURCE_DIR} --vapidir=${gtkfisheyelist_BINARY_DIR})
+set(VFLAGS --vapidir=${gtkfisheyelist_BINARY_DIR} --vapidir=${libzavai_SOURCE_DIR} --vapidir=${libzavai_BINARY_DIR})
 add_definitions(-Wall)
 # -Werror 
 
@@ -20,7 +20,7 @@ else()
   message("-- Not using devkit-power-gobject")
 endif ()
 
-set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR} --vapidir=${libzavai_SOURCE_DIR} --vapidir=${libzavai_BINARY_DIR})
+set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR})
 
 add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR} -I${libzavai_BINARY_DIR})
 set(VALA_PACKAGES ${VALA_PACKAGES} libzavai)

diff --git a/zavai/power.vala b/zavai/power.vala
index 55837089e5995c34ef5a2147897709b3f26d16c8..55711179666fbf4b54287c8070b02f2e18b30b9e 100644 (file)
--- a/zavai/power.vala
+++ b/zavai/power.vala
@@ -23,7 +23,7 @@ using GLib;
 namespace zavai {
 namespace power {
 
-class Power : Service
+public class Power : Service
 {
     public enum State
     {
@@ -181,7 +181,7 @@ class Power : Service
     }
 }
 
-Power power;
+public Power power;
 
 public void init()
 {