diff options
author | Nikola Pajkovsky <npajkovs@redhat.com> | 2011-03-11 11:31:11 +0100 |
---|---|---|
committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2011-03-11 11:31:11 +0100 |
commit | 2c1ca7753ca7d11640c14491c3d76124d2cba7d8 (patch) | |
tree | 9c395beebff50d8e59181365db14bffddfd21753 /src/daemon | |
parent | 066ea25800e36c8f4514d487a29ecd1bb926da53 (diff) | |
parent | 2a6a90726044304c2bc3f3f25fd59b2d004b5095 (diff) | |
download | abrt-2c1ca7753ca7d11640c14491c3d76124d2cba7d8.tar.gz abrt-2c1ca7753ca7d11640c14491c3d76124d2cba7d8.tar.xz abrt-2c1ca7753ca7d11640c14491c3d76124d2cba7d8.zip |
Merge branch 'prune-old-gui'
* prune-old-gui:
remove old python gui
override old gui by new one
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/Daemon.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index 2d2c85ed..5555138c 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -382,6 +382,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin crash_data_t *crash_data = NULL; fullname = concat_path_file(DEBUG_DUMPS_DIR, name); mw_result_t res = LoadDebugDump(fullname, &crash_data); + const char *first = get_crash_item_content_or_NULL(crash_data, CD_DUMPDIR); switch (res) { case MW_OK: @@ -392,7 +393,6 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin { if (res != MW_OK) { - const char *first = get_crash_item_content_or_NULL(crash_data, CD_DUMPDIR); log("Deleting crash %s (dup of %s), sending dbus signal", strrchr(fullname, '/') + 1, strrchr(first, '/') + 1); @@ -408,10 +408,12 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin get_crash_item_content_or_NULL(crash_data, FILENAME_UID), get_crash_item_content_or_NULL(crash_data, FILENAME_UUID) ); + /* when dupe occurs we need to return first occure not the one which + * is deleted */ send_dbus_sig_Crash(get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE), - crash_id, //TODO: stop passing this param, it is unused - fullname, - uid_str + crash_id, //TODO: stop passing this param, it is unused + (first)? first: fullname, + uid_str ); free(crash_id); break; |