aboutsummaryrefslogtreecommitdiff
path: root/src/device.c
blob: b1636824a88c2411e4220745fe0357e18102db41 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
/*

A simple Device structure used internally by indicator-power

Copyright 2012 Canonical Ltd.

Authors:
    Charles Kerr <charles.kerr@canonical.com>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
version 3.0 as published by the Free Software Foundation.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License version 3.0 for more details.

You should have received a copy of the GNU General Public
License along with this library. If not, see
<http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
 #include "config.h"
#endif

#include <glib/gi18n.h>

#include "device.h"

struct _IndicatorPowerDevicePrivate
{
	UpDeviceKind kind;
	UpDeviceState state;
	gchar * object_path;
	gdouble percentage;
	time_t time;
};

#define INDICATOR_POWER_DEVICE_GET_PRIVATE(o) (INDICATOR_POWER_DEVICE(o)->priv)

/* Properties */
/* Enum for the properties so that they can be quickly found and looked up. */
enum {
	PROP_0,
	PROP_KIND,
	PROP_STATE,
	PROP_OBJECT_PATH,
	PROP_ICON,
	PROP_PERCENTAGE,
	PROP_TIME
};

/* GObject stuff */
static void indicator_power_device_class_init (IndicatorPowerDeviceClass *klass);
static void indicator_power_device_init       (IndicatorPowerDevice *self);
static void indicator_power_device_dispose    (GObject *object);
static void indicator_power_device_finalize   (GObject *object);
static void set_property (GObject*, guint prop_id, const GValue*, GParamSpec* );
static void get_property (GObject*, guint prop_id,       GValue*, GParamSpec* );

/* LCOV_EXCL_START */
G_DEFINE_TYPE (IndicatorPowerDevice, indicator_power_device, G_TYPE_OBJECT);
/* LCOV_EXCL_STOP */

static void
indicator_power_device_class_init (IndicatorPowerDeviceClass *klass)
{
	GParamSpec * pspec;
	GObjectClass *object_class = G_OBJECT_CLASS (klass);

	g_type_class_add_private (klass, sizeof (IndicatorPowerDevicePrivate));

	object_class->dispose = indicator_power_device_dispose;
	object_class->finalize = indicator_power_device_finalize;
	object_class->set_property = set_property;
	object_class->get_property = get_property;

	pspec = g_param_spec_int (INDICATOR_POWER_DEVICE_KIND, "kind", "The device's UpDeviceKind",
                                  UP_DEVICE_KIND_UNKNOWN, UP_DEVICE_KIND_LAST, UP_DEVICE_KIND_UNKNOWN,
			          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
	g_object_class_install_property (object_class, PROP_KIND, pspec);

	pspec = g_param_spec_int (INDICATOR_POWER_DEVICE_STATE, "state", "The device's UpDeviceState",
                                  UP_DEVICE_STATE_UNKNOWN, UP_DEVICE_STATE_LAST, UP_DEVICE_STATE_UNKNOWN,
			          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
	g_object_class_install_property (object_class, PROP_STATE, pspec);

	pspec = g_param_spec_string (INDICATOR_POWER_DEVICE_OBJECT_PATH, "object path", "The device's DBus object path", NULL,
			             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
	g_object_class_install_property (object_class, PROP_OBJECT_PATH, pspec);

	pspec = g_param_spec_double (INDICATOR_POWER_DEVICE_PERCENTAGE, "percentage", "percent charged",
                                     0.0, 100.0, 0.0,
			             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
	g_object_class_install_property (object_class, PROP_PERCENTAGE, pspec);

	pspec = g_param_spec_uint64 (INDICATOR_POWER_DEVICE_TIME, "time", "time left",
                                     0, G_MAXUINT64, 0,
			             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
	g_object_class_install_property (object_class, PROP_TIME, pspec);
}

/* Initialize an instance */
static void
indicator_power_device_init (IndicatorPowerDevice *self)
{
	IndicatorPowerDevicePrivate * priv;

        priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
                                            INDICATOR_POWER_DEVICE_TYPE,
                                            IndicatorPowerDevicePrivate);
        priv->kind = UP_DEVICE_KIND_UNKNOWN;
        priv->state = UP_DEVICE_STATE_UNKNOWN;
        priv->object_path = NULL;
        priv->percentage = 0.0;
        priv->time = 0;

	self->priv = priv;
}

static void
indicator_power_device_dispose (GObject *object)
{
	G_OBJECT_CLASS (indicator_power_device_parent_class)->dispose (object);
}

static void
indicator_power_device_finalize (GObject *object)
{
	IndicatorPowerDevice * self = INDICATOR_POWER_DEVICE(object);
	IndicatorPowerDevicePrivate * priv = self->priv;

	g_clear_pointer (&priv->object_path, g_free);
}

/***
****
***/

static void
get_property (GObject * o, guint  prop_id, GValue * value, GParamSpec * pspec)
{
        IndicatorPowerDevice * self = INDICATOR_POWER_DEVICE(o);
        IndicatorPowerDevicePrivate * priv = self->priv;

        switch (prop_id)
	{
		case PROP_KIND:
			g_value_set_int (value, priv->kind);
			break;

		case PROP_STATE:
			g_value_set_int (value, priv->state);
			break;

		case PROP_OBJECT_PATH:
			g_value_set_string (value, priv->object_path);
			break;

		case PROP_PERCENTAGE:
			g_value_set_double (value, priv->percentage);
			break;

		case PROP_TIME:
			g_value_set_uint64 (value, priv->time);
			break;
	}
}

static void
set_property (GObject * o, guint prop_id, const GValue * value, GParamSpec * pspec)
{
        IndicatorPowerDevice * self = INDICATOR_POWER_DEVICE(o);
        IndicatorPowerDevicePrivate * priv = self->priv;

        switch (prop_id)
	{
		case PROP_KIND:
			priv->kind = g_value_get_int (value);
			break;

		case PROP_STATE:
			priv->state = g_value_get_int (value);
			break;

		case PROP_OBJECT_PATH:
			g_free (priv->object_path);
			priv->object_path = g_value_dup_string (value);
			break;

		case PROP_PERCENTAGE:
			priv->percentage = g_value_get_double (value);
			break;

		case PROP_TIME:
			priv->time = g_value_get_uint64(value);
			break;
	}
}

/***
****  Accessors
***/

UpDeviceKind
indicator_power_device_get_kind  (const IndicatorPowerDevice * device)
{
	/* LCOV_EXCL_START */
	g_return_val_if_fail (INDICATOR_IS_POWER_DEVICE(device), UP_DEVICE_KIND_UNKNOWN);
	/* LCOV_EXCL_STOP */

        return device->priv->kind;
}

UpDeviceState
indicator_power_device_get_state (const IndicatorPowerDevice * device)
{
	/* LCOV_EXCL_START */
	g_return_val_if_fail (INDICATOR_IS_POWER_DEVICE(device), UP_DEVICE_STATE_UNKNOWN);
	/* LCOV_EXCL_STOP */

        return device->priv->state;
}

const gchar *
indicator_power_device_get_object_path (const IndicatorPowerDevice * device)
{
	/* LCOV_EXCL_START */
	g_return_val_if_fail (INDICATOR_IS_POWER_DEVICE(device), NULL);
	/* LCOV_EXCL_STOP */

        return device->priv->object_path;
}

gdouble
indicator_power_device_get_percentage (const IndicatorPowerDevice * device)
{
	/* LCOV_EXCL_START */
	g_return_val_if_fail (INDICATOR_IS_POWER_DEVICE(device), 0.0);
	/* LCOV_EXCL_STOP */

        return device->priv->percentage;
}

time_t
indicator_power_device_get_time (const IndicatorPowerDevice * device)
{
	/* LCOV_EXCL_START */
	g_return_val_if_fail (INDICATOR_IS_POWER_DEVICE(device), (time_t)0);
	/* LCOV_EXCL_STOP */

        return device->priv->time;
}

/***
****
****
***/

/* taken from GSD's power plugin, (c) Richard Hughes and licensed GPL >=2 */
static const gchar *
gpm_upower_get_device_icon_suffix (gdouble percentage)
{
        if (percentage < 10) return "caution";
        if (percentage < 30) return "low";
        if (percentage < 60) return "good";
        return "full";
}

/* taken from GSD's power plugin, (c) Richard Hughes and licensed GPL >=2 */
static const gchar *
gpm_upower_get_device_icon_index (gdouble percentage)
{
        if (percentage < 10) return "000";
        if (percentage < 30) return "020";
        if (percentage < 50) return "040";
        if (percentage < 70) return "060";
        if (percentage < 90) return "080";
        return "100";
}

/**
  indicator_power_device_get_icon_names:
  @device: #IndicatorPowerDevice to generate the icon names from

  Based on GSD's power plugin, (c) Richard Hughes and licensed GPL >= 2.
  It differs in these ways:

  (1) all charging batteries use the same icon regardless of progress:
  <https://bugs.launchpad.net/indicator-power/+bug/824629/comments/7>

  (2) discharging batteries are keyed off of time left, rather than
  percentage left, s.t. <= 30 minutes remaining gives the 'caution' icon.
  <https://bugs.launchpad.net/indicator-power/+bug/743823>

  Return value: (array zero-terminated=1) (transfer full):
  a GStrv of icon names suitable for passing to g_themed_icon_new_from_names().
  Free with g_strfreev() when done.
*/
GStrv
indicator_power_device_get_icon_names (const IndicatorPowerDevice * device)
{
  char ** ret = NULL;
  const gchar *suffix_str;
  const gchar *index_str;

  /* LCOV_EXCL_START */
  g_return_val_if_fail (INDICATOR_IS_POWER_DEVICE(device), NULL);
  /* LCOV_EXCL_STOP */

  gdouble percentage = indicator_power_device_get_percentage (device);
  const UpDeviceKind kind = indicator_power_device_get_kind (device);
  const UpDeviceState state = indicator_power_device_get_state (device);
  const char * kind_str = kind_str = up_device_kind_to_string (kind);

  /* get correct icon prefix */
  GString * filename = g_string_new (NULL);

  /* get the icon from some simple rules */
  if (kind == UP_DEVICE_KIND_LINE_POWER) {
    g_string_append (filename, "ac-adapter-symbolic;");
    g_string_append (filename, "ac-adapter;");
  } else if (kind == UP_DEVICE_KIND_MONITOR) {
    g_string_append (filename, "gpm-monitor-symbolic;");
    g_string_append (filename, "gpm-monitor;");
  } else switch (state) {
    case UP_DEVICE_STATE_EMPTY:
      g_string_append (filename, "battery-empty-symbolic;");
      g_string_append_printf (filename, "gpm-%s-empty;", kind_str);
      g_string_append_printf (filename, "gpm-%s-000;", kind_str);
      g_string_append (filename, "battery-empty;");
      break;
    case UP_DEVICE_STATE_FULLY_CHARGED:
      g_string_append (filename, "battery-full-charged-symbolic;");
      g_string_append (filename, "battery-full-charging-symbolic;");
      g_string_append_printf (filename, "gpm-%s-full;", kind_str);
      g_string_append_printf (filename, "gpm-%s-100;", kind_str);
      g_string_append (filename, "battery-full-charged;");
      g_string_append (filename, "battery-full-charging;");
      break;
    case UP_DEVICE_STATE_CHARGING:
    case UP_DEVICE_STATE_PENDING_CHARGE:
      /* When charging, always use the same icon regardless of percentage.
         <http://bugs.launchpad.net/indicator-power/+bug/824629> */
      percentage = 0;

      suffix_str = gpm_upower_get_device_icon_suffix (percentage);
      index_str = gpm_upower_get_device_icon_index (percentage);
      g_string_append_printf (filename, "battery-%s-charging-symbolic;", suffix_str);
      g_string_append_printf (filename, "gpm-%s-%s-charging;", kind_str, index_str);
      g_string_append_printf (filename, "battery-%s-charging;", suffix_str);
      break;
    case UP_DEVICE_STATE_DISCHARGING:
    case UP_DEVICE_STATE_PENDING_DISCHARGE: {
      /* Don't show the caution/red icons unless we have <=30 min left.
         <https://bugs.launchpad.net/indicator-power/+bug/743823>
         Themes use the caution color when the percentage is 0% or 20%,
         so if we have >30 min left, use 30% as the icon's percentage floor */
      if (indicator_power_device_get_time (device) > (30*60))
        percentage = MAX(percentage, 30);

      suffix_str = gpm_upower_get_device_icon_suffix (percentage);
      index_str = gpm_upower_get_device_icon_index (percentage);
      g_string_append_printf (filename, "battery-%s-symbolic;", suffix_str);
      g_string_append_printf (filename, "gpm-%s-%s;", kind_str, index_str);
      g_string_append_printf (filename, "battery-%s;", suffix_str);
      break;
    }
    default:
      g_string_append (filename, "battery-missing-symbolic;");
      g_string_append (filename, "gpm-battery-missing;");
      g_string_append (filename, "battery-missing;");
    }

    ret = g_strsplit (filename->str, ";", -1);
    g_string_free (filename, TRUE);
    return ret;
}

/**
  indicator_power_device_get_gicon:
  @device: #IndicatorPowerDevice to generate the icon names from

  A convenience function to call g_themed_icon_new_from_names()
  with the names returned by indicator_power_device_get_icon_names()

  Return value: (transfer full): A themed GIcon
*/
GIcon *
indicator_power_device_get_gicon (const IndicatorPowerDevice * device)
{
  GStrv names = indicator_power_device_get_icon_names (device);
  GIcon * icon = g_themed_icon_new_from_names (names, -1);
  g_strfreev (names);
  return icon;
}

/***
****
***/

static void
get_timestring (guint64   time_secs,
                gchar   **short_timestring,
                gchar   **detailed_timestring)
{
  gint  hours;
  gint  minutes;

  /* Add 0.5 to do rounding */
  minutes = (int) ( ( time_secs / 60.0 ) + 0.5 );

  if (minutes == 0)
    {
      *short_timestring = g_strdup (_("Unknown time"));
      *detailed_timestring = g_strdup (_("Unknown time"));

      return;
    }

  if (minutes < 60)
    {
      *short_timestring = g_strdup_printf ("0:%.2i", minutes);
      *detailed_timestring = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%i minute",
                                              "%i minutes",
                                              minutes), minutes);
      return;
    }

  hours = minutes / 60;
  minutes = minutes % 60;

  *short_timestring = g_strdup_printf ("%i:%.2i", hours, minutes);

  if (minutes == 0)
    {
      *detailed_timestring = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, 
                                              "%i hour",
                                              "%i hours",
                                              hours), hours);
    }
  else
    {
      /* TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
       * Swap order with "%2$s %2$i %1$s %1$i if needed */
      *detailed_timestring = g_strdup_printf (_("%i %s %i %s"),
                                              hours, g_dngettext (GETTEXT_PACKAGE, "hour", "hours", hours),
                                              minutes, g_dngettext (GETTEXT_PACKAGE, "minute", "minutes", minutes));
    }
}

static const gchar *
device_kind_to_localised_string (UpDeviceKind kind)
{
  const gchar *text = NULL;

  switch (kind) {
    case UP_DEVICE_KIND_LINE_POWER:
      /* TRANSLATORS: system power cord */
      text = _("AC Adapter");
      break;
    case UP_DEVICE_KIND_BATTERY:
      /* TRANSLATORS: laptop primary battery */
      text = _("Battery");
      break;
    case UP_DEVICE_KIND_UPS:
      /* TRANSLATORS: battery-backed AC power source */
      text = _("UPS");
      break;
    case UP_DEVICE_KIND_MONITOR:
      /* TRANSLATORS: a monitor is a device to measure voltage and current */
      text = _("Monitor");
      break;
    case UP_DEVICE_KIND_MOUSE:
      /* TRANSLATORS: wireless mice with internal batteries */
      text = _("Mouse");
      break;
    case UP_DEVICE_KIND_KEYBOARD:
      /* TRANSLATORS: wireless keyboard with internal battery */
      text = _("Keyboard");
      break;
    case UP_DEVICE_KIND_PDA:
      /* TRANSLATORS: portable device */
      text = _("PDA");
      break;
    case UP_DEVICE_KIND_PHONE:
      /* TRANSLATORS: cell phone (mobile...) */
      text = _("Cell phone");
      break;
    case UP_DEVICE_KIND_MEDIA_PLAYER:
      /* TRANSLATORS: media player, mp3 etc */
      text = _("Media player");
      break;
    case UP_DEVICE_KIND_TABLET:
      /* TRANSLATORS: tablet device */
      text = _("Tablet");
      break;
    case UP_DEVICE_KIND_COMPUTER:
      /* TRANSLATORS: tablet device */
      text = _("Computer");
      break;
    default:
      g_warning ("enum unrecognised: %i", kind);
      text = up_device_kind_to_string (kind);
    }

  return text;
}

void
indicator_power_device_get_time_details (const IndicatorPowerDevice * device,
                                         gchar ** short_details,
                                         gchar ** details,
                                         gchar ** accessible_name)
{
  const time_t time = indicator_power_device_get_time (device);
  const UpDeviceState state = indicator_power_device_get_state (device);
  const gdouble percentage = indicator_power_device_get_percentage (device);
  const UpDeviceKind kind = indicator_power_device_get_kind (device);
  const gchar * device_name = device_kind_to_localised_string (kind);

  if (time > 0)
    {
      gchar *short_timestring = NULL;
      gchar *detailed_timestring = NULL;

      get_timestring (time,
                      &short_timestring,
                      &detailed_timestring);

      if (state == UP_DEVICE_STATE_CHARGING)
        {
          /* TRANSLATORS: %2 is a time string, e.g. "1 hour 5 minutes" */
          *accessible_name = g_strdup_printf (_("%s (%s to charge (%.0lf%%))"), device_name, detailed_timestring, percentage);
          *details = g_strdup_printf (_("%s (%s to charge)"), device_name, short_timestring);
          *short_details = g_strdup_printf ("(%s)", short_timestring);
        }
      else if ((state == UP_DEVICE_STATE_DISCHARGING) && (time > (60*60*12)))
        {
          *accessible_name = g_strdup_printf (_("%s"), device_name);
          *details = g_strdup_printf (_("%s"), device_name);
          *short_details = g_strdup (short_timestring);
        }
      else
        {
          /* TRANSLATORS: %2 is a time string, e.g. "1 hour 5 minutes" */
          *accessible_name = g_strdup_printf (_("%s (%s left (%.0lf%%))"), device_name, detailed_timestring, percentage);
          *details = g_strdup_printf (_("%s (%s left)"), device_name, short_timestring);
          *short_details = g_strdup (short_timestring);
        }

      g_free (short_timestring);
      g_free (detailed_timestring);
    }
  else if (state == UP_DEVICE_STATE_FULLY_CHARGED)
    {
      *details = g_strdup_printf (_("%s (charged)"), device_name);
      *accessible_name = g_strdup (*details);
      *short_details = g_strdup ("");
    }
  else if (percentage > 0)
    {
      /* TRANSLATORS: %2 is a percentage value. Note: this string is only
       * used when we don't have a time value */
      *details = g_strdup_printf (_("%s (%.0lf%%)"), device_name, percentage);
      *accessible_name = g_strdup (*details);
      *short_details = g_strdup_printf (_("(%.0lf%%)"), percentage);
    }
  else if (kind == UP_DEVICE_KIND_LINE_POWER)
    {
      *details         = g_strdup (device_name);
      *accessible_name = g_strdup (device_name);
      *short_details   = g_strdup (device_name);
    }
  else
    {
      *details = g_strdup_printf (_("%s (not present)"), device_name);
      *accessible_name = g_strdup (*details);
      *short_details = g_strdup (_("(not present)"));
    }
}

/***
****  Instantiation
***/

IndicatorPowerDevice *
indicator_power_device_new (const gchar * object_path,
                            UpDeviceKind  kind,
                            gdouble percentage,
                            UpDeviceState state,
                            time_t timestamp)
{
	GObject * o = g_object_new (INDICATOR_POWER_DEVICE_TYPE,
	                            INDICATOR_POWER_DEVICE_KIND, kind,
	                            INDICATOR_POWER_DEVICE_STATE, state,
	                            INDICATOR_POWER_DEVICE_OBJECT_PATH, object_path,
	                            INDICATOR_POWER_DEVICE_PERCENTAGE, percentage,
	                            INDICATOR_POWER_DEVICE_TIME, (guint64)timestamp,
	                            NULL);
	return INDICATOR_POWER_DEVICE(o);
}

IndicatorPowerDevice *
indicator_power_device_new_from_variant (GVariant * v)
{
	UpDeviceKind kind = UP_DEVICE_KIND_UNKNOWN;
	UpDeviceState state = UP_DEVICE_STATE_UNKNOWN;
	const gchar * icon = NULL;
	const gchar * object_path = NULL;
	gdouble percentage = 0;
	guint64 time = 0;

	g_variant_get (v, "(&su&sdut)",
	               &object_path,
	               &kind,
	               &icon,
	               &percentage,
	               &state,
	               &time);

	return indicator_power_device_new (object_path,
	                                   kind,
	                                   percentage,
	                                   state,
	                                   time);
}