[ABRT PATCH] trac#682: emit Crash DBus signal on org.freedesktop.problems bus - Crash-catcher - Fedora mailing-lists

24 Sep 2012

Signed-off-by: Jakub Filak jfilak@redhat.com
---
 doc/design                             |  4 ++--
 src/applet/applet.c                    | 10 +++-------
 src/daemon/com.redhat.abrt.service     |  7 -------
 src/dbus/dbus_event.conf               |  8 ++++----
 tests/runtests/dbus-message/runtest.sh |  2 +-
 5 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 src/daemon/com.redhat.abrt.service

diff --git a/doc/design b/doc/design
index 05a96cd..9044529 100644
--- a/doc/design
+++ b/doc/design
@@ -79,9 +79,9 @@ or to query list of possible events for a directory.
When user (admin) wants to see the list of dumped crashes and
 process them, he runs abrt-gui or abrt-cli. These programs
-perform a dbus call to "com.redhat.abrt" on a system dbus.
+perform a dbus call to "org.freedesktop.problems" on a system dbus.
 If there is no program with this name on it, dbus autostart
-will invoke abrtd, which registers "com.redhat.abrt"
+will invoke abrtd, which registers "org.freedesktop.problems"
 and processes the call(s).
The key dbus calls served by abrtd are:
diff --git a/src/applet/applet.c b/src/applet/applet.c
index 752ba8c..c34e4c6 100644
--- a/src/applet/applet.c
+++ b/src/applet/applet.c
@@ -28,10 +28,6 @@
 #include <libreport/internal_abrt_dbus.h>
 #include "libabrt.h"
-#define ABRTD_DBUS_NAME  "com.redhat.abrt"
-#define ABRTD_DBUS_PATH  "/com/redhat/abrt"
-#define ABRTD_DBUS_IFACE "com.redhat.abrt"
-
static gboolean persistent_notification;
 static GtkStatusIcon *ap_status_icon;
@@ -680,10 +676,10 @@ int main(int argc, char** argv)
     attach_dbus_conn_to_glib_main_loop(system_conn, NULL, NULL);
     if (!dbus_connection_add_filter(system_conn, handle_message, NULL, NULL))
         error_msg_and_die("Can't add dbus filter");
-    //signal sender=:1.73 -> path=/com/redhat/abrt; interface=com.redhat.abrt; member=Crash
+    //signal sender=:1.73 -> path=/org/freedesktop/problems; interface=org.freedesktop.problems; member=Crash
     //   string "coreutils-7.2-3.fc11"
     //   string "0"
-    dbus_bus_add_match(system_conn, "type='signal',path='/com/redhat/abrt'", &err);
+    dbus_bus_add_match(system_conn, "type='signal',path='"ABRT_DBUS_OBJECT"'", &err);
     die_if_dbus_error(false, &err, "Can't add dbus match");
/* dbus_abrt cannot handle more than one bus, and we don't really need to.
@@ -691,7 +687,7 @@ int main(int argc, char** argv)
     DBusConnection* session_conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
     die_if_dbus_error(session_conn == NULL, &err, "Can't connect to session dbus");
     int r = dbus_bus_request_name(session_conn,
-        "com.redhat.abrt.applet",
+        ABRT_DBUS_NAME".applet",
         /* flags */ DBUS_NAME_FLAG_DO_NOT_QUEUE, &err);
     die_if_dbus_error(r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER, &err,
         "Problem connecting to dbus, or applet is already running");
diff --git a/src/daemon/com.redhat.abrt.service b/src/daemon/com.redhat.abrt.service
deleted file mode 100644
index ca25960..0000000
--- a/src/daemon/com.redhat.abrt.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[D-BUS Service]
-Name=com.redhat.abrt
-# For testing, you may use -t5 to use small timeout of 5 seconds.
-# This will make "abrtd exited while clients existed but were idle"
-# situations easier to trigger
-Exec=/usr/sbin/abrt-dbus -t133
-User=root
diff --git a/src/dbus/dbus_event.conf b/src/dbus/dbus_event.conf
index f943147..4d24fef 100644
--- a/src/dbus/dbus_event.conf
+++ b/src/dbus/dbus_event.conf
@@ -1,16 +1,16 @@
 EVENT=notify package!= uid!=
-	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+	dbus-send --system --type=signal /org/freedesktop/problems org.freedesktop.problems.Crash \
    string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
EVENT=notify package!= uid=
-	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+	dbus-send --system --type=signal /org/freedesktop/problems org.freedesktop.problems.Crash \
    string:"`cat package`" string:"$DUMP_DIR"
EVENT=notify-dup package!= uid!=
-	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+	dbus-send --system --type=signal /org/freedesktop/problems org.freedesktop.problems.Crash \
    string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
EVENT=notify-dup package!= uid=
-	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+	dbus-send --system --type=signal /org/freedesktop/problems org.freedesktop.problems.Crash \
    string:"`cat package`" string:"$DUMP_DIR"
diff --git a/tests/runtests/dbus-message/runtest.sh b/tests/runtests/dbus-message/runtest.sh
index 1a6d007..01caea2 100755
--- a/tests/runtests/dbus-message/runtest.sh
+++ b/tests/runtests/dbus-message/runtest.sh
@@ -40,7 +40,7 @@ rlJournalStart
         TmpDir=$(mktemp -d)
         pushd $TmpDir
         rlRun "dbus-monitor --system \
-            "type='signal',interface='com.redhat.abrt',path='/com/redhat/abrt'" \
+            "type='signal',interface='org.freedesktop.problems',path='/org/freedesktop/problems'" \
             > dbus.log &" 0 "Running dbus-monitor"
     rlPhaseEnd
-- 
1.7.11.4


    