Rename DBus service. Hopefully successful.

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index a8d3b5d39f438f79f586701fdc9a834888887107..d5fa7fe27487b9d694c93e9561134214412be877 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -54,7 +54,7 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
 
     /* Add exec command action */
     act = alarm_event_add_actions(eve, 1);
 
     /* 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));
     qDebug() << "Setting alarm: " << command;
 
     QString command = QFileInfo(*qApp->argv()).absoluteFilePath() + QString(" %1").arg(QString::number(aEventId));
     qDebug() << "Setting alarm: " << command;


@@ -68,9 +68,9 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
 //    act->flags |= ALARM_ACTION_TYPE_DBUS;
 //
 //    // DBus params for this action
 //    act->flags |= ALARM_ACTION_TYPE_DBUS;
 //
 //    // 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");
 //
 //    // DBus arguments for the action
 //    alarm_action_set_dbus_name(act, "Alarm");
 //
 //    // DBus arguments for the action


@@ -79,7 +79,7 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
     //    act->flags |= ALARM_ACTION_TYPE_EXEC;
     //     alarm_action_set_exec_command(act, command.toLocal8Bit().data());
     //    alarm_event_set_icon(eve, "fosdem");
     //    act->flags |= ALARM_ACTION_TYPE_EXEC;
     //     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;
 
     // adds assigned cookie at the end of command string
     //    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE;
 

diff --git a/src/app/alarmdbus.h b/src/app/alarmdbus.h
index 043ce4f1f036e7d22743e7732691fdab41466f71..41b0e0043ab062d41f45e1491eb0cfa292d49223 100644 (file)
--- a/src/app/alarmdbus.h
+++ b/src/app/alarmdbus.h
@@ -26,7 +26,7 @@
 class CAlarmDBus: public QObject
 {
     Q_OBJECT
 class CAlarmDBus: public QObject
 {
     Q_OBJECT

-    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule")
+    Q_CLASSINFO("D-Bus Interface", "at.priv.toastfreeware.confclerk")

 
 public:
        CAlarmDBus(QWidget * aParent);
 
 public:
        CAlarmDBus(QWidget * aParent);

diff --git a/src/app/alarmdbusadaptorp.h b/src/app/alarmdbusadaptorp.h
index f134aca337408f3589f7fc4763c4687f1f9c3de3..5d736785e9f0de0b3b3fffb2d392841fd7a20849 100644 (file)
--- a/src/app/alarmdbusadaptorp.h
+++ b/src/app/alarmdbusadaptorp.h
@@ -36,9 +36,9 @@ QT_END_NAMESPACE
 class AlarmDBusAdaptor: public QDBusAbstractAdaptor
 {
     Q_OBJECT
 class AlarmDBusAdaptor: public QDBusAbstractAdaptor
 {
     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", ""
     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"
 "  </method>\n"
 "  <method name=\"Alarm\">\n"
 "        <arg name=\"aEventId\" type=\"i\" direction=\"in\"/>\n"
 "  </method>\n"

diff --git a/src/app/main.cpp b/src/app/main.cpp
index aa296942324f54c78c58af14fd07e554c28a3349..1dc940a796a53409031ef7338ca4f5e434baa4bb 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -53,15 +53,15 @@ int main(int argc, char *argv[])
     new AlarmDBusAdaptor(alarmDBus);
     QDBusConnection connection = QDBusConnection::sessionBus();
 
     new AlarmDBusAdaptor(alarmDBus);
     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)
                {
        {
                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]));
                        return 0;
                                                                       connection);
                        interface->call("Alarm",atoi(argv[1]));
                        return 0;