Changeset 8fdfc63

Timestamp:

06/23/11 22:19:24 (12 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

9f97eaf

Parents:

e903c8e

Message:

Rename DBus service. Hopefully successful.

Location:

src

Files:

• alarm/alarm.cpp (modified) (3 diffs)
• app/alarmdbus.h (modified) (1 diff)
• app/alarmdbusadaptorp.h (modified) (1 diff)
• app/main.cpp (modified) (1 diff)

src/alarm/alarm.cpp

@@ -55 +55 @@
     /* Add exec command action */
     act = alarm_event_add_actions(eve, 1);
-    alarm_action_set_label(act, "FOSDEM'10");
+    alarm_action_set_label(act, "ConfClerk");
 
     QString command = QFileInfo(*qApp->argv()).absoluteFilePath() + QString(" %1").arg(QString::number(aEventId));
@@ -69 +69 @@
 //
 //    // DBus params for this action
-//    alarm_action_set_dbus_interface(act, "org.fosdem.schedule.AlarmInterface");
-//    alarm_action_set_dbus_service(act, "org.fosdem.schedule");
-//    alarm_action_set_dbus_path(act, "/Fosdem");
+//    alarm_action_set_dbus_interface(act, "at.priv.toastfreeware.confclerk.AlarmInterface");
+//    alarm_action_set_dbus_service(act, "at.priv.toastfreeware.confclerk");
+//    alarm_action_set_dbus_path(act, "/ConfClerk");
 //    alarm_action_set_dbus_name(act, "Alarm");
 //
@@ -80 +80 @@
     //     alarm_action_set_exec_command(act, command.toLocal8Bit().data());
     //    alarm_event_set_icon(eve, "fosdem");
-    //    alarm_event_set_title(eve, "FOSDEM'10");
+    //    alarm_event_set_title(eve, "ConfClerk");
     // adds assigned cookie at the end of command string
     //    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE;

src/app/alarmdbus.h

@@ -27 +27 @@
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule")
+    Q_CLASSINFO("D-Bus Interface", "at.priv.toastfreeware.confclerk")
 
 public:

src/app/alarmdbusadaptorp.h

@@ -37 +37 @@
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule.AlarmInterface")
+    Q_CLASSINFO("D-Bus Interface", "at.priv.toastfreeware.confclerk.AlarmInterface")
     Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"org.fosdem.schedule.AlarmInterface\" >\n"
+"  <interface name=\"at.priv.toastfreeware.confclerk.AlarmInterface\" >\n"
 "  <method name=\"Alarm\">\n"
 "         <arg name=\"aEventId\" type=\"i\" direction=\"in\"/>\n"

src/app/main.cpp

@@ -54 +54 @@
     QDBusConnection connection = QDBusConnection::sessionBus();
 
-    if(connection.registerObject("/Fosdem", alarmDBus) == true)
+    if(connection.registerObject("/ConfClerk", alarmDBus) == true)
     {
-        if( connection.registerService("org.fosdem.schedule") == false)
+        if( connection.registerService("at.priv.toastfreeware.confclerk") == false)
         {
                 if(argc>1)
                 {
-                        QDBusInterface *interface = new QDBusInterface("org.fosdem.schedule",
-                                                                       "/Fosdem",
-                                                                       "org.fosdem.schedule.AlarmInterface",
+                        QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
+                                                                       "/ConfClerk",
+                                                                       "at.priv.toastfreeware.confclerk.AlarmInterface",
                                                                        connection);
                         interface->call("Alarm",atoi(argv[1]));