← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Francois Marier, Francois Marier, Mark Purcell
  • Date: 2014-10-18 15:08:50 UTC
  • mfrom: (1.1.12)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20141018150850-2exfk34ckb15pcwi
Tags: 1.4.1-0.1
http://bugs.debian.org/759576
http://bugs.debian.org/741130
[ Francois Marier ]
* Non-maintainer upload
* New upstream release (closes: #759576, #741130)
  - debian/rules +PJPROJECT_VERSION := 2.2.1
  - add upstream patch to fix broken TLS support
  - add patch to fix pjproject regression

[ Mark Purcell ]
* Build-Depends:
  - sflphone-daemon + libavformat-dev, libavcodec-dev, libswscale-dev,
  libavdevice-dev, libavutil-dev
  - sflphone-gnome + libclutter-gtk-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/client/dbus/networkmanager.cpp
33
33
#include "array_size.h"
34
34
#include "logger.h"
35
35
 
36
 
namespace {
37
 
    const char *stateAsString(uint32_t state)
38
 
    {
39
 
        static const char * STATES[] = {"unknown", "asleep", "connecting",
40
 
            "connected", "disconnected"};
 
36
static const
 
37
char *stateAsString(uint32_t state)
 
38
{
 
39
    static const char * STATES[] = {"unknown", "asleep", "connecting",
 
40
                                    "connected", "disconnected"};
41
41
 
42
 
        const size_t idx = state < ARRAYSIZE(STATES) ? state : 0;
43
 
        return STATES[idx];
44
 
    }
 
42
    const size_t idx = state < ARRAYSIZE(STATES) ? state : 0;
 
43
    return STATES[idx];
45
44
}
46
45
 
47
46
void NetworkManager::StateChanged(const uint32_t &state)