Drop DevKit stuff, since that is deprecated and removed

diff --git a/README b/README
index 1c727fbc24b38de214042fee8588e2121e99d33f..45bf69e1ab52112744e4fb9bcb9181e8e3f2e82e 100644 (file)
--- a/README
+++ b/README
@@ -13,12 +13,9 @@ Getting it to work:
 
    # Build time
    apt-get install valac libglib2.0-dev libdbus-glib-1-dev libgee-dev libgtk2.0-dev \
 
    # Build time
    apt-get install valac libglib2.0-dev libdbus-glib-1-dev libgee-dev libgtk2.0-dev \

-                   libwnck-dev libdevkit-power-gobject-dev \
+                   libwnck-dev \

                    libomhacks-dev liblua5.1-dev
 
                    libomhacks-dev liblua5.1-dev
 

-   # Runtime
-   apt-get install devicekit-power
-

    # Optional runtime
    apt-get install polygen polygen-data
 
    # Optional runtime
    apt-get install polygen polygen-data
 


@@ -240,7 +237,7 @@ using vala-dbus-binding-tool:
    (-> learn/test libalsamixer something)
    /usr/share/vala/vapi/alsa.vapi
  - space buttons from sliders, to avoid shutting down instead of lowering the volume
    (-> learn/test libalsamixer something)
    /usr/share/vala/vapi/alsa.vapi
  - space buttons from sliders, to avoid shutting down instead of lowering the volume

- - battery without devkit: do the parsing via lua
+ - battery: do the parsing via lua

  - contacts: show as a fancy focus+context list (see prefuse)
     - vcard on e-vcard.{h,c}
     - ical on libical-dev
  - contacts: show as a fancy focus+context list (see prefuse)
     - vcard on e-vcard.{h,c}
     - ical on libical-dev

diff --git a/debian/zavai.1 b/debian/zavai.1
index 32ef4de2549944404980a6821cd663de60f9af08..b046b50370fd0baf6ccfe92abcbb497f4c0e60bb 100644 (file)
--- a/debian/zavai.1
+++ b/debian/zavai.1
@@ -196,7 +196,7 @@ fisheye list music player
     - save playlist to file to reload later
     - pause with headset button
 .IP \(bu
     - save playlist to file to reload later
     - pause with headset button
 .IP \(bu

-battery without devkit: do the parsing via lua
+battery: do the parsing via lua

 .IP \(bu
 contacts: show as a fancy focus+context list (see prefuse)
     - vcard on e-vcard.{h,c}
 .IP \(bu
 contacts: show as a fancy focus+context list (see prefuse)
     - vcard on e-vcard.{h,c}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 882e2f331c203d3347fa68713e94c08f77c96459..f22863ec6f005a7f2f696b8b524750ad63777d3c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ add_definitions(-Wall)
 #  message("-- Not using upower-glib")
 #endif ()
 
 #  message("-- Not using upower-glib")
 #endif ()
 

-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})
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})

 link_libraries(gtkfisheyelist-static)
 
 file(GLOB zavala *.vala)
 link_libraries(gtkfisheyelist-static)
 
 file(GLOB zavala *.vala)

diff --git a/src/devkit-power-gobject.vapi b/src/devkit-power-gobject.vapi
deleted file mode 100644 (file)
index 139abc2..0000000
--- a/src/devkit-power-gobject.vapi
+++ /dev/null
@@ -1,232 +0,0 @@
-/* devkit-power-gobject.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Dkp", lower_case_cprefix = "dkp_")]
-namespace Dkp {
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class Client : GLib.Object {
-               [CCode (has_construct_function = false)]
-               public Client ();
-               public unowned GLib.PtrArray enumerate_devices () throws GLib.Error;
-               [CCode (cname = "dkp_client_can_hibernate")]
-               public bool get_can_hibernate ();
-               [CCode (cname = "dkp_client_can_suspend")]
-               public bool get_can_suspend ();
-               public unowned string get_daemon_version ();
-               [CCode (cname = "dkp_client_lid_is_closed")]
-               public bool get_lid_is_closed ();
-               [CCode (cname = "dkp_client_on_battery")]
-               public bool get_on_battery ();
-               [CCode (cname = "dkp_client_on_low_battery")]
-               public bool get_on_low_battery ();
-               public bool hibernate () throws GLib.Error;
-               public bool suspend () throws GLib.Error;
-               [NoAccessorMethod]
-               public bool can_hibernate { get; }
-               [NoAccessorMethod]
-               public bool can_suspend { get; }
-               public string daemon_version { get; }
-               [NoAccessorMethod]
-               public bool lid_is_closed { get; }
-               [NoAccessorMethod]
-               public bool lid_is_present { get; }
-               [NoAccessorMethod]
-               public bool on_battery { get; }
-               [NoAccessorMethod]
-               public bool on_low_battery { get; }
-               public virtual signal void changed ();
-               public virtual signal void device_added (void* device);
-               public virtual signal void device_changed (void* device);
-               public virtual signal void device_removed (void* device);
-       }
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class Device : GLib.Object {
-               [CCode (has_construct_function = false)]
-               public Device ();
-               public unowned GLib.PtrArray get_history (string type, uint timespec, uint resolution) throws GLib.Error;
-               public unowned string get_object_path ();
-               public unowned GLib.PtrArray get_statistics (string type) throws GLib.Error;
-               public bool print ();
-               public bool refresh () throws GLib.Error;
-               public bool set_object_path (string object_path) throws GLib.Error;
-               public static Dkp.DeviceState state_from_text (string state);
-               public static unowned string state_to_text (Dkp.DeviceState state_enum);
-               public static Dkp.DeviceTechnology technology_from_text (string technology);
-               public static unowned string technology_to_text (Dkp.DeviceTechnology technology_enum);
-               public static Dkp.DeviceType type_from_text (string type);
-               public static unowned string type_to_text (Dkp.DeviceType type_enum);
-               [NoAccessorMethod]
-               public double capacity { get; set; }
-               [NoAccessorMethod]
-               public double energy { get; set; }
-               [NoAccessorMethod]
-               public double energy_empty { get; set; }
-               [NoAccessorMethod]
-               public double energy_full { get; set; }
-               [NoAccessorMethod]
-               public double energy_full_design { get; set; }
-               [NoAccessorMethod]
-               public double energy_rate { get; set; }
-               [NoAccessorMethod]
-               public bool has_history { get; set; }
-               [NoAccessorMethod]
-               public bool has_statistics { get; set; }
-               [NoAccessorMethod]
-               public bool is_present { get; set; }
-               [NoAccessorMethod]
-               public bool is_rechargeable { get; set; }
-               [NoAccessorMethod]
-               public string model { owned get; set; }
-               [NoAccessorMethod]
-               public string native_path { owned get; set; }
-               [NoAccessorMethod]
-               public bool online { get; set; }
-               [NoAccessorMethod]
-               public double percentage { get; set; }
-               [NoAccessorMethod]
-               public bool power_supply { get; set; }
-               [NoAccessorMethod]
-               public bool recall_notice { get; set; }
-               [NoAccessorMethod]
-               public string recall_url { owned get; set; }
-               [NoAccessorMethod]
-               public string recall_vendor { owned get; set; }
-               [NoAccessorMethod]
-               public string serial { owned get; set; }
-               [NoAccessorMethod]
-               public uint state { get; set; }
-               [NoAccessorMethod]
-               public uint technology { get; set; }
-               [NoAccessorMethod]
-               public int64 time_to_empty { get; set; }
-               [NoAccessorMethod]
-               public int64 time_to_full { get; set; }
-               [NoAccessorMethod]
-               public uint type { get; set; }
-               [NoAccessorMethod]
-               public uint64 update_time { get; set; }
-               [NoAccessorMethod]
-               public string vendor { owned get; set; }
-               [NoAccessorMethod]
-               public double voltage { get; set; }
-               public virtual signal void changed (void* obj);
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_history_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class HistoryObj {
-               public Dkp.DeviceState state;
-               public uint time;
-               public double value;
-               [CCode (has_construct_function = false)]
-               public HistoryObj ();
-               public bool clear ();
-               public unowned Dkp.HistoryObj copy ();
-               public static unowned Dkp.HistoryObj create (double value, Dkp.DeviceState state);
-               public bool equal (Dkp.HistoryObj obj2);
-               public static unowned Dkp.HistoryObj from_string (string text);
-               public bool print ();
-               public unowned string to_string ();
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_qos_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class QosObj {
-               public weak string cmdline;
-               public uint cookie;
-               public bool persistent;
-               public uint pid;
-               public weak string sender;
-               public uint64 timespec;
-               public Dkp.QosType type;
-               public uint uid;
-               public int value;
-               [CCode (has_construct_function = false)]
-               public QosObj ();
-               public unowned Dkp.QosObj copy ();
-               public bool equal (Dkp.QosObj obj2);
-               public bool print ();
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_stats_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class StatsObj {
-               public double accuracy;
-               public double value;
-               [CCode (has_construct_function = false)]
-               public StatsObj ();
-               public unowned Dkp.StatsObj copy ();
-               public static unowned Dkp.StatsObj create (double value, double accuracy);
-               public static unowned Dkp.StatsObj from_string (string text);
-               public unowned string to_string ();
-       }
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class Wakeups : GLib.Object {
-               [CCode (has_construct_function = false)]
-               public Wakeups ();
-               public unowned GLib.PtrArray get_data () throws GLib.Error;
-               public uint get_total () throws GLib.Error;
-               public bool has_capability ();
-               public virtual signal void data_changed ();
-               public virtual signal void total_changed (uint value);
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_wakeups_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class WakeupsObj {
-               public weak string cmdline;
-               public weak string details;
-               public uint id;
-               public bool is_userspace;
-               public uint old;
-               public float value;
-               [CCode (has_construct_function = false)]
-               public WakeupsObj ();
-               public unowned Dkp.WakeupsObj copy ();
-               public bool equal (Dkp.WakeupsObj obj2);
-               public bool print ();
-       }
-       [CCode (cprefix = "DKP_DEVICE_STATE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum DeviceState {
-               UNKNOWN,
-               CHARGING,
-               DISCHARGING,
-               EMPTY,
-               FULLY_CHARGED,
-               PENDING_CHARGE,
-               PENDING_DISCHARGE,
-               LAST
-       }
-       [CCode (cprefix = "DKP_DEVICE_TECHNOLOGY_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum DeviceTechnology {
-               UNKNOWN,
-               LITHIUM_ION,
-               LITHIUM_POLYMER,
-               LITHIUM_IRON_PHOSPHATE,
-               LEAD_ACID,
-               NICKEL_CADMIUM,
-               NICKEL_METAL_HYDRIDE,
-               LAST
-       }
-       [CCode (cprefix = "DKP_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum DeviceType {
-               UNKNOWN,
-               LINE_POWER,
-               BATTERY,
-               UPS,
-               MONITOR,
-               MOUSE,
-               KEYBOARD,
-               PDA,
-               PHONE,
-               LAST
-       }
-       [CCode (cprefix = "DKP_QOS_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum QosType {
-               UNKNOWN,
-               NETWORK,
-               CPU_DMA,
-               LAST
-       }
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public const int COMPILE_VERSION;
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public static Dkp.QosType qos_type_from_text (string type);
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public static unowned string qos_type_to_text (Dkp.QosType type);
-}

diff --git a/src/power.vala b/src/power.vala
index 55711179666fbf4b54287c8070b02f2e18b30b9e..9f467a4b6c5549b08dc1a9b2b247f98c9e67bf80 100644 (file)
--- a/src/power.vala
+++ b/src/power.vala
@@ -66,7 +66,7 @@ public class Power : Service
         } else {
             if (battery_device == null)
             {
         } else {
             if (battery_device == null)
             {

-                zavai.log.warning("No battery device found that I know how to read: try building with devkit-power");
+                zavai.log.warning("No battery device found that I know how to read");

                 poll_time = 0;
             } else {
                 zavai.log.info("Polling battery device only");
                 poll_time = 0;
             } else {
                 zavai.log.info("Polling battery device only");

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 64e95e89c66f91ae7140631a8977adfd80ee9641..3c204ee20fe56a46efd6c6c50442e5aea50340e1 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,18 +9,7 @@ set(VFLAGS --vapidir=${gtkfisheyelist_BINARY_DIR} --vapidir=${zavai_SOURCE_DIR}
 add_definitions(-Wall)
 # -Werror 
 
 add_definitions(-Wall)
 # -Werror 
 

-pkg_check_modules(DKP devkit-power-gobject>=010)
-if (DKP_VERSION)
-  message("-- Using devkit-power-gobject version ${DKP_VERSION}")
-  set(VFLAGS ${VFLAGS} --define=USE_DKP)
-  set(VALA_PACKAGES ${VALA_PACKAGES} devkit-power-gobject)
-  add_definitions(-DUSE_DKP ${DKP_CFLAGS})
-  link_libraries(${DKP_LDFLAGS})
-else()
-  message("-- Not using devkit-power-gobject")
-endif ()
-
-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})
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})

 
 file(GLOB gsm-receive test-gsm-receive.vala)
 add_vala_program(test-gsm-receive ${gsm-receive})
 
 file(GLOB gsm-receive test-gsm-receive.vala)
 add_vala_program(test-gsm-receive ${gsm-receive})