1
=== modified file 'plugins/battery/plugin/battery-plugin.cpp'
2
--- plugins/battery/plugin/battery-plugin.cpp	2014-09-12 15:42:58 +0000
3
+++ plugins/battery/plugin/battery-plugin.cpp	2014-11-14 02:59:39 +0000
4
@@ -20,6 +20,7 @@
5
20
20
6
21
#include "battery-plugin.h"
21
#include "battery-plugin.h"
7
22
22
8
23
#include <QCoreApplication>
9
23
#include <QDebug>
24
#include <QDebug>
10
24
#include <QStringList>
25
#include <QStringList>
11
25
#include <SystemSettings/ItemBase>
26
#include <SystemSettings/ItemBase>
12
@@ -39,8 +40,14 @@
13
39
    ~BatteryItem();
40
    ~BatteryItem();
14
40
41
15
41
private:
42
private:
16
43
    void up_connect();
17
44
    void up_disconnect();
18
42
    UpClient *m_client;
45
    UpClient *m_client;
19
46
    QCoreApplication *m_app;
20
43
    gulong m_addedHandler, m_removedHandler;
47
    gulong m_addedHandler, m_removedHandler;
21
48
22
49
private Q_SLOTS:
23
50
    void onApplicationStateChanged(Qt::ApplicationState st);
24
44
};
51
};
25
45
52
26
46
void deviceChanged(UpClient *client,
53
void deviceChanged(UpClient *client,
27
@@ -48,44 +55,56 @@
28
48
                   gpointer user_data)
55
                   gpointer user_data)
29
49
{
56
{
30
50
    BatteryItem *item (static_cast<BatteryItem *> (user_data));
57
    BatteryItem *item (static_cast<BatteryItem *> (user_data));
44
51
58
    GPtrArray *devices = up_client_get_devices (client);
45
52
#if !UP_CHECK_VERSION(0, 99, 0)
59
    item->setVisibility (devices->len > 0);
46
53
    gboolean ret = up_client_enumerate_devices_sync (client, nullptr, nullptr);
60
    g_ptr_array_unref (devices);
34
54
    if (!ret) {
35
55
        item->setVisibility (false);
36
56
    } else
37
57
#endif
38
58
    {
39
59
        GPtrArray *devices = up_client_get_devices (client);
40
60
        item->setVisibility (devices->len > 0);
41
61
        g_ptr_array_unref (devices);
42
62
    }
43
63
47
64
}
61
}
48
65
62
49
66
BatteryItem::BatteryItem(const QVariantMap &staticData, QObject *parent):
63
BatteryItem::BatteryItem(const QVariantMap &staticData, QObject *parent):
50
67
    ItemBase(staticData, parent),
64
    ItemBase(staticData, parent),
51
68
    m_client(up_client_new()),
65
    m_client(up_client_new()),
52
66
    m_app(QCoreApplication::instance()),
53
69
    m_addedHandler(0),
67
    m_addedHandler(0),
54
70
    m_removedHandler(0)
68
    m_removedHandler(0)
55
71
{
69
{
56
70
#if !UP_CHECK_VERSION(0, 99, 0)
57
71
    gboolean ret = up_client_enumerate_devices_sync (m_client, nullptr, nullptr);
58
72
    if (!ret) {
59
73
        setVisibility (false);
60
74
    }
61
75
#endif
62
76
63
72
    deviceChanged(m_client, nullptr, this);
77
    deviceChanged(m_client, nullptr, this);
80
73
    m_addedHandler = g_signal_connect (m_client,
78
    connect(m_app, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onApplicationStateChanged(Qt::ApplicationState)));
81
74
                                      "device-added",
79
    up_connect();
82
75
                                      G_CALLBACK (::deviceChanged),
80
}
83
76
                                      this /* user_data */);
81
84
77
    m_removedHandler = g_signal_connect (m_client,
82
void BatteryItem::onApplicationStateChanged(Qt::ApplicationState st)
85
78
                                        "device-removed",
83
{
86
79
                                        G_CALLBACK (::deviceChanged),
84
    if (st == Qt::ApplicationActive)
87
80
                                        this /* user_data */);
85
        up_connect();
88
81
}
86
    else
89
82
87
        up_disconnect();
90
83
void BatteryItem::setVisibility(bool visible)
88
}
91
84
{
89
92
85
    setVisible(visible);
90
void BatteryItem::up_connect()
93
86
}
91
{
94
87
92
    if (!m_addedHandler) {
95
88
BatteryItem::~BatteryItem()
93
        m_addedHandler = g_signal_connect (m_client,
96
94
                                          "device-added",
97
95
                                          G_CALLBACK (::deviceChanged),
98
96
                                          this /* user_data */);
99
97
    }
100
98
101
99
    if (!m_removedHandler) {
102
100
        m_removedHandler = g_signal_connect (m_client,
103
101
                                            "device-removed",
104
102
                                            G_CALLBACK (::deviceChanged),
105
103
                                            this /* user_data */);
106
104
    }
107
105
}
108
106
109
107
void BatteryItem::up_disconnect()
110
89
{
108
{
111
90
    if (m_addedHandler) {
109
    if (m_addedHandler) {
112
91
        g_signal_handler_disconnect (m_client, m_addedHandler);
110
        g_signal_handler_disconnect (m_client, m_addedHandler);
113
@@ -96,7 +115,16 @@
114
96
        g_signal_handler_disconnect (m_client, m_removedHandler);
115
        g_signal_handler_disconnect (m_client, m_removedHandler);
115
97
        m_removedHandler = 0;
116
        m_removedHandler = 0;
116
98
    }
117
    }
118
99
118
}
119
119
120
120
void BatteryItem::setVisibility(bool visible)
121
121
{
122
122
    setVisible(visible);
123
123
}
124
124
125
125
BatteryItem::~BatteryItem()
126
126
{
127
127
    up_disconnect();
128
100
    g_object_unref (m_client);
128
    g_object_unref (m_client);
129
101
}
129
}
130
102
130
131
@@ -105,7 +133,6 @@
132
105
{
133
{
133
106
}
134
}
134
107
135
135
108
136
109
ItemBase *BatteryPlugin::createItem(const QVariantMap &staticData,
136
ItemBase *BatteryPlugin::createItem(const QVariantMap &staticData,
137
110
                                 QObject *parent)
137
                                 QObject *parent)
138
111
{
138
{
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)			Disapprove on 2014-11-17
Iain Lane		2014-11-13	Needs Information on 2014-11-14
PS Jenkins bot	continuous-integration		Approve on 2014-11-14
Review via email: mp+241747@code.launchpad.net