Merge pull request #1 from yixinshark/fix-dbusStaticInterface

fix: inline staticInterfaceName function return correct value

Author: yixinshark

src/app/lightdm-deepin-greeter.cpp

@@ -97,6 +97,7 @@ int main(int argc, char* argv[])
 
     DLogManager::setLogFormat("%{time}{yyyy-MM-dd, HH:mm:ss.zzz} [%{type:-7}] [ %{function:-35} %{line}] %{message}\n");
     DLogManager::registerConsoleAppender();
+    DLogManager::registerJournalAppender();
 
     QDBusConnectionInterface *interface = QDBusConnection::systemBus().interface();
     if (!interface->isServiceRegistered(DSS_DBUS::accountsService)) {

src/global_util/dbus/dbuslockfront.h

@@ -40,7 +40,11 @@ class DBusLockFront: public QDBusAbstractInterface
    }
 public:
     static inline const char *staticInterfaceName()
-    { return DSS_DBUS::lockFrontService.toStdString().c_str(); }
+#ifndef ENABLE_DSS_SNIPE
+    { return "com.deepin.dde.lockFront"; }
+#else
+    { return "org.deepin.dde.LockFront1"; }
+#endif
 
 public:
     explicit DBusLockFront(QObject *parent = 0);

src/global_util/dbus/dbuslockservice.h

@@ -30,7 +30,11 @@ class DBusLockService: public QDBusAbstractInterface
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return DSS_DBUS::lockService.toStdString().c_str(); }
+#ifndef ENABLE_DSS_SNIPE
+    { return "com.deepin.dde.LockService"; }
+#else
+    { return "org.deepin.dde.LockService1"; }
+#endif
 
     enum EventType {
         PromptQuestion = 1,