1
=== modified file 'plugins/battery/battery.cpp'
2
--- plugins/battery/battery.cpp	2014-08-28 07:22:28 +0000
3
+++ plugins/battery/battery.cpp	2014-10-30 16:41:15 +0000
4
@@ -63,15 +63,18 @@
5
63
63
6
64
void Battery::buildDeviceString() {
64
void Battery::buildDeviceString() {
7
65
    UpClient *client;
65
    UpClient *client;
8
66
    gboolean returnIsOk;
9
67
    GPtrArray *devices;
66
    GPtrArray *devices;
10
68
    UpDeviceKind kind;
67
    UpDeviceKind kind;
11
69
68
12
69
#if !UP_CHECK_VERSION(0, 99, 0)
13
70
    gboolean returnIsOk;
14
71
15
70
    client = up_client_new();
72
    client = up_client_new();
16
71
    returnIsOk = up_client_enumerate_devices_sync(client, nullptr, nullptr);
73
    returnIsOk = up_client_enumerate_devices_sync(client, nullptr, nullptr);
17
72
74
18
73
    if(!returnIsOk)
75
    if(!returnIsOk)
19
74
        return;
76
        return;
20
77
#endif
21
75
78
22
76
    devices = up_client_get_devices(client);
79
    devices = up_client_get_devices(client);
23
77
80
24
78
81
25
=== modified file 'plugins/battery/plugin/battery-plugin.cpp'
26
--- plugins/battery/plugin/battery-plugin.cpp	2014-07-23 13:37:06 +0000
27
+++ plugins/battery/plugin/battery-plugin.cpp	2014-10-30 16:41:15 +0000
28
@@ -49,10 +49,13 @@
29
49
{
49
{
30
50
    BatteryItem *item (static_cast<BatteryItem *> (user_data));
50
    BatteryItem *item (static_cast<BatteryItem *> (user_data));
31
51
51
32
52
#if !UP_CHECK_VERSION(0, 99, 0)
33
52
    gboolean ret = up_client_enumerate_devices_sync (client, nullptr, nullptr);
53
    gboolean ret = up_client_enumerate_devices_sync (client, nullptr, nullptr);
34
53
    if (!ret) {
54
    if (!ret) {
35
54
        item->setVisibility (false);
55
        item->setVisibility (false);
37
55
    } else {
56
    } else
38
57
#endif
39
58
    {
40
56
        GPtrArray *devices = up_client_get_devices (client);
59
        GPtrArray *devices = up_client_get_devices (client);
41
57
        item->setVisibility (devices->len > 0);
60
        item->setVisibility (devices->len > 0);
42
58
        g_ptr_array_unref (devices);
61
        g_ptr_array_unref (devices);
Reviewer	Review Type	Date Requested	Status
Ken VanDine		2014-08-15	Approve on 2014-10-31
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-30
Review via email: mp+230988@code.launchpad.net