Changeset View
Changeset View
Standalone View
Standalone View
src/solid-networkstatus/kded/networkmanagerstatus.cpp
Show All 22 Lines | 1 | /* This file is part of the KDE project | |||
---|---|---|---|---|---|
23 | You should have received a copy of the GNU Lesser General Public | 23 | You should have received a copy of the GNU Lesser General Public | ||
24 | License along with this library. If not, see <http://www.gnu.org/licenses/>. | 24 | License along with this library. If not, see <http://www.gnu.org/licenses/>. | ||
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 | #undef signals | ||
32 | 32 | #include <libnm/NetworkManager.h> | |||
33 | #if !defined(NM_CHECK_VERSION) | 33 | #define signals Q_SIGNALS | ||
34 | #define NM_CHECK_VERSION(x,y,z) 0 | | |||
35 | #endif | | |||
36 | 34 | | |||
37 | NetworkManagerStatus::NetworkManagerStatus( QObject *parent ) | 35 | NetworkManagerStatus::NetworkManagerStatus( QObject *parent ) | ||
38 | : SystemStatusInterface( parent ), | 36 | : SystemStatusInterface( parent ), | ||
39 | m_manager( NM_DBUS_SERVICE, | 37 | m_manager( NM_DBUS_SERVICE, | ||
40 | NM_DBUS_PATH, | 38 | NM_DBUS_PATH, | ||
41 | NM_DBUS_INTERFACE, | 39 | NM_DBUS_INTERFACE, | ||
42 | QDBusConnection::systemBus() ) | 40 | QDBusConnection::systemBus() ) | ||
43 | { | 41 | { | ||
Show All 36 Lines | 76 | { | |||
80 | 78 | | |||
81 | switch (nmState) { | 79 | switch (nmState) { | ||
82 | case NM_STATE_UNKNOWN: | 80 | case NM_STATE_UNKNOWN: | ||
83 | case NM_STATE_ASLEEP: | 81 | case NM_STATE_ASLEEP: | ||
84 | break; | 82 | break; | ||
85 | case NM_STATE_CONNECTING: | 83 | case NM_STATE_CONNECTING: | ||
86 | status = Solid::Networking::Connecting; | 84 | status = Solid::Networking::Connecting; | ||
87 | break; | 85 | break; | ||
88 | #if NM_CHECK_VERSION(0,8,992) | | |||
89 | case NM_STATE_CONNECTED_LOCAL: | 86 | case NM_STATE_CONNECTED_LOCAL: | ||
90 | case NM_STATE_CONNECTED_SITE: | 87 | case NM_STATE_CONNECTED_SITE: | ||
91 | case NM_STATE_CONNECTED_GLOBAL: | 88 | case NM_STATE_CONNECTED_GLOBAL: | ||
92 | #else | | |||
93 | case NM_STATE_CONNECTED: | | |||
94 | #endif | | |||
95 | status = Solid::Networking::Connected; | 89 | status = Solid::Networking::Connected; | ||
96 | break; | 90 | break; | ||
97 | case NM_STATE_DISCONNECTED: | 91 | case NM_STATE_DISCONNECTED: | ||
98 | status = Solid::Networking::Unconnected; | 92 | status = Solid::Networking::Unconnected; | ||
99 | break; | 93 | break; | ||
100 | #if NM_CHECK_VERSION(0,8,992) | | |||
101 | case NM_STATE_DISCONNECTING: | 94 | case NM_STATE_DISCONNECTING: | ||
102 | status = Solid::Networking::Disconnecting; | 95 | status = Solid::Networking::Disconnecting; | ||
103 | break; | 96 | break; | ||
104 | #endif | | |||
105 | } | 97 | } | ||
106 | 98 | | |||
107 | return status; | 99 | return status; | ||
108 | } | 100 | } | ||
109 | 101 | |