Merge branch 'master' into gregoa

[gregoa/zavai.git] / src / devkit-power-gobject.vapi

diff --git a/src/devkit-power-gobject.vapi b/src/devkit-power-gobject.vapi
index 80a7a75f84ba43778853db65ea83082ebf83a65a..139abc2ac6b21e33ac43cf59e240d5176c2face4 100644 (file)
--- a/src/devkit-power-gobject.vapi
+++ b/src/devkit-power-gobject.vapi
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "Dkp", lower_case_cprefix = "dkp_")]
 namespace Dkp {
 
 [CCode (cprefix = "Dkp", lower_case_cprefix = "dkp_")]
 namespace Dkp {

-       [CCode (cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public class Client : GLib.Object {
                [CCode (has_construct_function = false)]
                public Client ();
        public class Client : GLib.Object {
                [CCode (has_construct_function = false)]
                public Client ();


@@ -38,7 +38,7 @@ namespace Dkp {
                public virtual signal void device_changed (void* device);
                public virtual signal void device_removed (void* device);
        }
                public virtual signal void device_changed (void* device);
                public virtual signal void device_removed (void* device);
        }

-       [CCode (cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public class Device : GLib.Object {
                [CCode (has_construct_function = false)]
                public Device ();
        public class Device : GLib.Object {
                [CCode (has_construct_function = false)]
                public Device ();


@@ -111,7 +111,7 @@ namespace Dkp {
                public virtual signal void changed (void* obj);
        }
        [Compact]
                public virtual signal void changed (void* obj);
        }
        [Compact]

-       [CCode (copy_function = "dkp_history_obj_copy", cheader_filename = "devkit-power-gobject.h")]
+       [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 class HistoryObj {
                public Dkp.DeviceState state;
                public uint time;


@@ -127,7 +127,7 @@ namespace Dkp {
                public unowned string to_string ();
        }
        [Compact]
                public unowned string to_string ();
        }
        [Compact]

-       [CCode (copy_function = "dkp_qos_obj_copy", cheader_filename = "devkit-power-gobject.h")]
+       [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 class QosObj {
                public weak string cmdline;
                public uint cookie;


@@ -145,7 +145,7 @@ namespace Dkp {
                public bool print ();
        }
        [Compact]
                public bool print ();
        }
        [Compact]

-       [CCode (copy_function = "dkp_stats_obj_copy", cheader_filename = "devkit-power-gobject.h")]
+       [CCode (copy_function = "dkp_stats_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public class StatsObj {
                public double accuracy;
                public double value;
        public class StatsObj {
                public double accuracy;
                public double value;


@@ -156,7 +156,7 @@ namespace Dkp {
                public static unowned Dkp.StatsObj from_string (string text);
                public unowned string to_string ();
        }
                public static unowned Dkp.StatsObj from_string (string text);
                public unowned string to_string ();
        }

-       [CCode (cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public class Wakeups : GLib.Object {
                [CCode (has_construct_function = false)]
                public Wakeups ();
        public class Wakeups : GLib.Object {
                [CCode (has_construct_function = false)]
                public Wakeups ();


@@ -167,7 +167,7 @@ namespace Dkp {
                public virtual signal void total_changed (uint value);
        }
        [Compact]
                public virtual signal void total_changed (uint value);
        }
        [Compact]

-       [CCode (copy_function = "dkp_wakeups_obj_copy", cheader_filename = "devkit-power-gobject.h")]
+       [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 class WakeupsObj {
                public weak string cmdline;
                public weak string details;


@@ -181,7 +181,7 @@ namespace Dkp {
                public bool equal (Dkp.WakeupsObj obj2);
                public bool print ();
        }
                public bool equal (Dkp.WakeupsObj obj2);
                public bool print ();
        }

-       [CCode (cprefix = "DKP_DEVICE_STATE_", has_type_id = "0", cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cprefix = "DKP_DEVICE_STATE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public enum DeviceState {
                UNKNOWN,
                CHARGING,
        public enum DeviceState {
                UNKNOWN,
                CHARGING,


@@ -192,7 +192,7 @@ namespace Dkp {
                PENDING_DISCHARGE,
                LAST
        }
                PENDING_DISCHARGE,
                LAST
        }

-       [CCode (cprefix = "DKP_DEVICE_TECHNOLOGY_", has_type_id = "0", cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cprefix = "DKP_DEVICE_TECHNOLOGY_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public enum DeviceTechnology {
                UNKNOWN,
                LITHIUM_ION,
        public enum DeviceTechnology {
                UNKNOWN,
                LITHIUM_ION,


@@ -203,7 +203,7 @@ namespace Dkp {
                NICKEL_METAL_HYDRIDE,
                LAST
        }
                NICKEL_METAL_HYDRIDE,
                LAST
        }

-       [CCode (cprefix = "DKP_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cprefix = "DKP_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public enum DeviceType {
                UNKNOWN,
                LINE_POWER,
        public enum DeviceType {
                UNKNOWN,
                LINE_POWER,


@@ -216,17 +216,17 @@ namespace Dkp {
                PHONE,
                LAST
        }
                PHONE,
                LAST
        }

-       [CCode (cprefix = "DKP_QOS_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject.h")]
+       [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
        }
        public enum QosType {
                UNKNOWN,
                NETWORK,
                CPU_DMA,
                LAST
        }

-       [CCode (cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public const int COMPILE_VERSION;
        public const int COMPILE_VERSION;

-       [CCode (cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public static Dkp.QosType qos_type_from_text (string type);
        public static Dkp.QosType qos_type_from_text (string type);

-       [CCode (cheader_filename = "devkit-power-gobject.h")]
+       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]

        public static unowned string qos_type_to_text (Dkp.QosType type);
 }
        public static unowned string qos_type_to_text (Dkp.QosType type);
 }