← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to daemon/src/dbus/networkmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-19 21:46:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519214637-la8rbrford5kj6m3
Tags: 1.1.0-1
http://bugs.debian.org/663282
http://bugs.debian.org/665789
* New upstream release 
  - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
* NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
  - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
* Added Build-Depends: libdbus-c++-bin
* Add gcc47-fixes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/dbus/networkmanager.cpp
29
29
 */
30
30
 
31
31
#include "networkmanager.h"
32
 
 
33
 
#include <iostream>
34
 
 
35
 
#include "global.h"
36
 
#include "instance.h"
37
32
#include "../manager.h"
38
 
 
39
 
const std::string NetworkManager::statesString[5] = {"unknown", "asleep", "connecting", "connected", "disconnected"};
40
 
 
41
 
std::string NetworkManager::stateAsString(const uint32_t& state)
42
 
{
43
 
    return statesString[state];
44
 
}
45
 
 
46
 
void NetworkManager::StateChanged(const uint32_t& state)
47
 
{
48
 
    WARN("Network state changed: %s", stateAsString(state).c_str());
49
 
}
50
 
 
51
 
void NetworkManager::PropertiesChanged(const std::map< std::string, ::DBus::Variant >& argin0)
52
 
{
53
 
    const std::map< std::string, ::DBus::Variant >::const_iterator iter = argin0.begin();
54
 
 
55
 
    WARN("Properties changed: %s", iter->first.c_str());
56
 
 
 
33
#include "array_size.h"
 
34
#include "logger.h"
 
35
 
 
36
namespace {
 
37
    const char *stateAsString(uint32_t state)
 
38
    {
 
39
        static const char * STATES[] = {"unknown", "asleep", "connecting",
 
40
            "connected", "disconnected"};
 
41
 
 
42
        const size_t idx = state < ARRAYSIZE(STATES) ? state : 0;
 
43
        return STATES[idx];
 
44
    }
 
45
}
 
46
 
 
47
void NetworkManager::StateChanged(const uint32_t &state)
 
48
{
 
49
    WARN("Network state changed: %s", stateAsString(state));
 
50
}
 
51
 
 
52
void NetworkManager::PropertiesChanged(const std::map<std::string, ::DBus::Variant> &argin0)
 
53
{
 
54
    WARN("Properties changed: ");
 
55
    for (std::map<std::string, ::DBus::Variant>::const_iterator iter = argin0.begin();
 
56
            iter != argin0.end(); ++iter)
 
57
        WARN("%s", iter->first.c_str());
57
58
    Manager::instance().registerAccounts();
58
59
}
59
60
 
60
 
NetworkManager::NetworkManager(DBus::Connection& connection, const DBus::Path& dbus_path, const char* destination) : DBus::ObjectProxy(connection, dbus_path, destination)
61
 
{
62
 
}
 
61
NetworkManager::NetworkManager(DBus::Connection &connection,
 
62
                               const DBus::Path &dbus_path,
 
63
                               const char *destination) :
 
64
    DBus::ObjectProxy(connection, dbus_path, destination)
 
65
{}