diff options
| author | Ted Gould <ted@gould.cx> | 2014-09-08 22:58:48 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-09-08 22:58:48 -0500 |
| commit | 334e3b3130cbde5a96e6da5323d40418db80f8ef (patch) | |
| tree | 299d5e2a5cdaab892fe7c92b9405f721635124e3 /src/device-provider-upower.c | |
| parent | cc51d0fc02f2980cc08fcd6cfc929ea61ff9d93a (diff) | |
| parent | 059246d136ed8c24c5e78e6a966bf2dfc945fe4e (diff) | |
| download | ayatana-indicator-power-334e3b3130cbde5a96e6da5323d40418db80f8ef.tar.gz ayatana-indicator-power-334e3b3130cbde5a96e6da5323d40418db80f8ef.tar.bz2 ayatana-indicator-power-334e3b3130cbde5a96e6da5323d40418db80f8ef.zip | |
Merge trunk
Diffstat (limited to 'src/device-provider-upower.c')
| -rw-r--r-- | src/device-provider-upower.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/device-provider-upower.c b/src/device-provider-upower.c index 7c12beb..400a060 100644 --- a/src/device-provider-upower.c +++ b/src/device-provider-upower.c @@ -17,8 +17,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include "dbus-upower.h" #include "device.h" #include "device-provider.h" @@ -60,7 +58,7 @@ G_DEFINE_TYPE_WITH_CODE ( indicator_power_device_provider_upower, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_DEVICE_PROVIDER, - indicator_power_device_provider_interface_init)); + indicator_power_device_provider_interface_init)) /*** **** UPOWER DBUS @@ -102,7 +100,7 @@ on_device_properties_ready (GObject * o, GAsyncResult * res, gpointer gdata) gdouble percentage = 0; gint64 time_to_empty = 0; gint64 time_to_full = 0; - time_t time; + gint64 time; IndicatorPowerDevice * device; IndicatorPowerDeviceProviderUPowerPriv * p = data->self->priv; GVariant * dict = g_variant_get_child_value (response, 0); @@ -120,7 +118,7 @@ on_device_properties_ready (GObject * o, GAsyncResult * res, gpointer gdata) INDICATOR_POWER_DEVICE_STATE, (gint)state, INDICATOR_POWER_DEVICE_OBJECT_PATH, data->path, INDICATOR_POWER_DEVICE_PERCENTAGE, percentage, - INDICATOR_POWER_DEVICE_TIME, (guint64)time, + INDICATOR_POWER_DEVICE_TIME, time, NULL); } else @@ -129,7 +127,7 @@ on_device_properties_ready (GObject * o, GAsyncResult * res, gpointer gdata) kind, percentage, state, - time); + (time_t)time); g_hash_table_insert (p->devices, g_strdup (data->path), |