Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
make one daemon running only. remove defaultRoute handling for now.
  • Loading branch information
Lorn Potter committed Apr 12, 2013
1 parent 8b34e42 commit 037f4cc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 4 additions & 0 deletions connd/main.cpp
Expand Up @@ -89,6 +89,10 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationVersion("1.0");

QCoreApplication a(argc, argv);
if (QDBusConnection::sessionBus().interface()->isServiceRegistered("com.jolla.Connectiond")) {
qDebug() << "Connectionagent service is already running. Exiting now";
return 1;
}

QConnectionManager::instance();

Expand Down
7 changes: 1 addition & 6 deletions connd/qconnectionmanager.cpp
Expand Up @@ -299,12 +299,7 @@ void QConnectionManager::onScanFinished()
void QConnectionManager::defaultRouteChanged(NetworkService* defaultRoute)
{
//not really default route, more of default/first service in list

if (defaultRoute) //this apparently can be null
Q_EMIT connectionState(defaultRoute->state(), defaultRoute->type());
else
Q_EMIT connectionState(QString(), QString());

Q_UNUSED(defaultRoute)
}

void QConnectionManager::updateServicesMap()
Expand Down
3 changes: 3 additions & 0 deletions rpm/connectionagent.changes
@@ -1,3 +1,6 @@
* Sat Apr 13 2013 Lorn Potter <lorn.potter@jollamobile.com> - 0.5.6
- make one daemon running only. remove defaultRoute handling for now.

* Fri Apr 12 2013 Lorn Potter <lorn.potter@jollamobile.com> - 0.5.5
- add changes file and move service files to proper place

0 comments on commit 037f4cc

Please sign in to comment.