update these. fixes some bugs, makes better

sailfishos · Apr 4, 2013 · f51c77e · f51c77e
1 parent f81c021
commit f51c77e
Show file tree

Hide file tree

Showing 13 changed files with 297 additions and 185 deletions.
diff --git a/connd/com.jollamobile.Connectiond.xml b/connd/com.jollamobile.Connectiond.xml
@@ -17,6 +17,7 @@
     </signal>
     <signal name="connectionState">
       <arg direction="out" type="s" name="state"/>
+      <arg direction="out" type="s" name="type"/>
     </signal>
     <method name="sendConnectReply">
       <arg direction="in" type="s" name="in0"/>

diff --git a/connd/conn.xml b/connd/conn.xml
diff --git a/connd/connadaptor.h b/connd/connadaptor.h
@@ -46,6 +46,7 @@ class ConnAdaptor: public QDBusAbstractAdaptor
 "    </signal>\n"
 "    <signal name=\"connectionState\">\n"
 "      <arg direction=\"out\" type=\"s\" name=\"state\"/>\n"
+"      <arg direction=\"out\" type=\"s\" name=\"type\"/>\n"
 "    </signal>\n"
 "    <method name=\"sendConnectReply\">\n"
 "      <arg direction=\"in\" type=\"s\" name=\"in0\"/>\n"
@@ -71,7 +72,7 @@ public Q_SLOTS: // METHODS
     void sendUserReply(const QVariantMap &input);
 Q_SIGNALS: // SIGNALS
     void connectionRequest();
-    void connectionState(const QString &state);
+    void connectionState(const QString &state, const QString &type);
     void errorReported(const QString &error);
     void requestBrowser(const QString &url);
     void userInputCanceled();

diff --git a/connd/connd.pro b/connd/connd.pro
@@ -13,7 +13,7 @@ QT -= gui
 
 
 INCLUDEPATH += libconnman-qt
-#INCLUDEPATH += lipstick
+INCLUDEPATH += lipstick
 
 OTHER_FILES += com.jolla.Connectiond.xml
 
@@ -30,7 +30,7 @@ HEADERS+= \
     connadaptor.h
 
 LIBS += -lconnman-qt4
-#LIBS += -llipstick
+LIBS += -llipstick
 
 target.path = /usr/bin
 INSTALLS += target