diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-11-04 13:18:51 +0100 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-11-04 13:18:51 +0100 |
| commit | 32b0d8a480d8427e8dcc00605ff8f146021e0c37 (patch) | |
| tree | 7abcbd0cee56034bd570b80a359c734cced6c75a /src | |
| parent | 6cc77995e9132054d884b970c0b320d5bf68045a (diff) | |
| download | abrt-32b0d8a480d8427e8dcc00605ff8f146021e0c37.tar.gz abrt-32b0d8a480d8427e8dcc00605ff8f146021e0c37.tar.xz abrt-32b0d8a480d8427e8dcc00605ff8f146021e0c37.zip | |
supply CD_EVENTS element in crash dump structures passed to GUI
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/CrashWatcher.cpp | 3 | ||||
| -rw-r--r-- | src/daemon/MiddleWare.cpp | 5 | ||||
| -rw-r--r-- | src/daemon/abrt-handle-crashdump.c | 2 | ||||
| -rw-r--r-- | src/gui/CCDump.py | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/daemon/CrashWatcher.cpp b/src/daemon/CrashWatcher.cpp index 95899265..540949e2 100644 --- a/src/daemon/CrashWatcher.cpp +++ b/src/daemon/CrashWatcher.cpp @@ -50,6 +50,9 @@ vector_map_crash_data_t GetCrashInfos(long caller_uid) try { vector_string_t crash_ids; +//TODO: it looks strange that we select UUIDs +//olny in order to find which directories to read! +//Should we simply retrieve list of *directories*, not *uuids*? GetUUIDsOfCrash(caller_uid, crash_ids); unsigned int ii; diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 3ad2e9d6..bd1c65e4 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -635,8 +635,13 @@ mw_result_t FillCrashInfo(const char *crash_id, } load_crash_data_from_debug_dump(dd, pCrashData); + char *events = list_possible_events(dd, NULL, ""); dd_close(dd); + add_to_crash_data_ext(pCrashData, CD_EVENTS, CD_SYS, CD_ISNOTEDITABLE, events); + free(events); + +//TODO: we _never_ use CD_SYS, perhaps we should use it here? add_to_crash_data(pCrashData, CD_UID , row->db_uid ); add_to_crash_data(pCrashData, CD_UUID , row->db_uuid ); add_to_crash_data(pCrashData, CD_INFORMALL , row->db_inform_all ); diff --git a/src/daemon/abrt-handle-crashdump.c b/src/daemon/abrt-handle-crashdump.c index 031b5d22..c823af51 100644 --- a/src/daemon/abrt-handle-crashdump.c +++ b/src/daemon/abrt-handle-crashdump.c @@ -77,7 +77,7 @@ int main(int argc, char **argv) /* Note that dump_dir_name may be NULL here, it means "show all * possible events regardless of dir" */ - char *events = list_possible_events(dump_dir_name, pfx); + char *events = list_possible_events(NULL, dump_dir_name, pfx); if (!events) return 1; /* error msg is already logged */ fputs(events, stdout); diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py index e02cb7ad..30002434 100644 --- a/src/gui/CCDump.py +++ b/src/gui/CCDump.py @@ -42,6 +42,7 @@ CD_DUMPDIR = "DumpDir" CD_COUNT = "Count" CD_REPORTED = "Reported" CD_MESSAGE = "Message" +CD_EVENTS = "Events" # FIXME - create method or smth that returns type|editable|content |