Differential D12378 Diff 32836 src/solid-networkstatus/kded/networkmanagerstatus.cpp

Changeset View

Standalone View

View Options

src/solid-networkstatus/kded/networkmanagerstatus.cpp

Show All 24 Lines
25*/ 25​*/
26 26​
27#include "networkmanagerstatus.h" 27​#include "networkmanagerstatus.h"
28 28​
29#include <QtDBus/QDBusReply> 29​#include <QtDBus/QDBusReply>
30 30​
31#include <NetworkManager.h> 31​#include <NetworkManager.h>
32 32​
33#if !defined(NM_CHECK_VERSION) ​
34 #define NM_CHECK_VERSION(x,y,z) 0 ​
35#endif ​
36 ​
37NetworkManagerStatus::NetworkManagerStatus( QObject *parent ) 33​NetworkManagerStatus::NetworkManagerStatus( QObject *parent )
38 : SystemStatusInterface( parent ), 34​ : SystemStatusInterface( parent ),
39 m_manager( NM_DBUS_SERVICE, 35​ m_manager( NM_DBUS_SERVICE,
40 NM_DBUS_PATH, 36​ NM_DBUS_PATH,
41 NM_DBUS_INTERFACE, 37​ NM_DBUS_INTERFACE,
42 QDBusConnection::systemBus() ) 38​ QDBusConnection::systemBus() )
43{ 39​{
44 connect( &m_manager, SIGNAL(StateChanged(uint)), 40​ connect( &m_manager, SIGNAL(StateChanged(uint)),
Show All 35 Lines74{
80 76​
81 switch (nmState) { 77​ switch (nmState) {
82 case NM_STATE_UNKNOWN: 78​ case NM_STATE_UNKNOWN:
83 case NM_STATE_ASLEEP: 79​ case NM_STATE_ASLEEP:
84 break; 80​ break;
85 case NM_STATE_CONNECTING: 81​ case NM_STATE_CONNECTING:
86 status = Solid::Networking::Connecting; 82​ status = Solid::Networking::Connecting;
87 break; 83​ break;
88#if NM_CHECK_VERSION(0,8,992) ​
89 case NM_STATE_CONNECTED_LOCAL: 84​ case NM_STATE_CONNECTED_LOCAL:
90 case NM_STATE_CONNECTED_SITE: 85​ case NM_STATE_CONNECTED_SITE:
91 case NM_STATE_CONNECTED_GLOBAL: 86​ case NM_STATE_CONNECTED_GLOBAL:
92#else ​
93 case NM_STATE_CONNECTED: ​
94#endif ​
95 status = Solid::Networking::Connected; 87​ status = Solid::Networking::Connected;
96 break; 88​ break;
97 case NM_STATE_DISCONNECTED: 89​ case NM_STATE_DISCONNECTED:
98 status = Solid::Networking::Unconnected; 90​ status = Solid::Networking::Unconnected;
99 break; 91​ break;
100#if NM_CHECK_VERSION(0,8,992) ​
101 case NM_STATE_DISCONNECTING: 92​ case NM_STATE_DISCONNECTING:
102 status = Solid::Networking::Disconnecting; 93​ status = Solid::Networking::Disconnecting;
103 break; 94​ break;
104#endif ​
105 } 95​ }
106 96​
107 return status; 97​ return status;
108} 98​}
109 99​