Merge branch 'jb51772_messages_bus_name' into 'master'

[commhistoryd] Adjust to new Messages bus names. Contributes to JB#51772 See merge request mer-core/commhistory-daemon!51
sailfishos · Nov 17, 2020 · 8e9cdc9 · 8e9cdc9
2 parents 4633f2f + d73295c
commit 8e9cdc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/constants.h b/src/constants.h
@@ -35,8 +35,8 @@
 #define ACCOUNT_PRESENCE_OBJECT_PATH     QLatin1String("/org/nemomobile/AccountPresence")
 #define ACCOUNT_PRESENCE_INTERFACE       QLatin1String("org.nemomobile.AccountPresenceIf")
 
-#define MESSAGING_SERVICE_NAME    QLatin1String("org.nemomobile.qmlmessages")
-#define MESSAGING_INTERFACE       QLatin1String("org.nemomobile.qmlmessages")
+#define MESSAGING_SERVICE_NAME    QLatin1String("org.sailfishos.Messages")
+#define MESSAGING_INTERFACE       QLatin1String("org.sailfishos.Messages")
 #define SHOW_INBOX_METHOD         QLatin1String("showGroupsWindow")
 #define START_CONVERSATION_METHOD QLatin1String("startConversation")
 

diff --git a/src/notificationmanager.cpp b/src/notificationmanager.cpp
@@ -356,9 +356,9 @@ void NotificationManager::playClass0SMSAlert()
 
 void NotificationManager::requestClass0Notification(const CommHistory::Event &event)
 {
-    QDBusMessage msg = QDBusMessage::createMethodCall(QLatin1String("org.nemomobile.ClassZeroSmsNotification"),
-                                                      QLatin1String("/org/nemomobile/ClassZeroSmsNotification"),
-                                                      QLatin1String("org.nemomobile.ClassZeroSmsNotification"),
+    QDBusMessage msg = QDBusMessage::createMethodCall(QLatin1String("org.sailfishos.Messages.ClassZeroSmsNotification"),
+                                                      QLatin1String("/org/sailfishos/messages/ClassZeroSmsNotification"),
+                                                      QLatin1String("org.sailfishos.Messages.ClassZeroSmsNotification"),
                                                       QLatin1String("showNotification"));
     QList<QVariant> arguments;
     arguments << event.freeText();