Skip to content

fix: inline staticInterfaceName function return correct value #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yixinshark merged 1 commit into from
Apr 16, 2025
Merged

fix: inline staticInterfaceName function return correct value #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/lightdm-deepin-greeter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 5 additions & 1 deletion src/global_util/dbus/dbuslockfront.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 5 additions & 1 deletion src/global_util/dbus/dbuslockservice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading