From fd5c97267cda4cfbc23e367fc1338aa0988a8b44 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 3 Mar 2011 13:35:15 +0100 Subject: remove FILENAME_REPRODUCE field. FILENAME_COMMENT should be used instead Signed-off-by: Denys Vlasenko --- src/daemon/CommLayerServerDBus.cpp | 6 ------ src/daemon/MiddleWare.cpp | 10 ++-------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/CommLayerServerDBus.cpp b/src/daemon/CommLayerServerDBus.cpp index 133feb7b..386b5872 100644 --- a/src/daemon/CommLayerServerDBus.cpp +++ b/src/daemon/CommLayerServerDBus.cpp @@ -219,7 +219,6 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) map_map_string_t user_conf_data; vector_string_t events; const char* comment = NULL; - const char* reproduce = NULL; const char* errmsg = NULL; DBusMessageIter in_iter; @@ -235,15 +234,10 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) } //TODO? get_crash_item_content_or_die_or_empty? comment = get_crash_item_content_or_NULL(crash_data, FILENAME_COMMENT) ? : ""; - reproduce = get_crash_item_content_or_NULL(crash_data, FILENAME_REPRODUCE) ? : ""; if (strlen(comment) > LIMIT_MESSAGE) { errmsg = _("Comment is too long"); } - else if (strlen(reproduce) > LIMIT_MESSAGE) - { - errmsg = _("'How to reproduce' is too long"); - } if (errmsg) { dbus_message_unref(reply); diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 2757d84f..809716aa 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -238,13 +238,12 @@ report_status_t Report(crash_data_t *client_report, } } - // Save comment, "how to reproduce", backtrace + // Save comment, backtrace //TODO: we should iterate through stored_report and modify all //modifiable fields which have new data in client_report const char *comment = get_crash_item_content_or_NULL(client_report, FILENAME_COMMENT); - const char *reproduce = get_crash_item_content_or_NULL(client_report, FILENAME_REPRODUCE); const char *backtrace = get_crash_item_content_or_NULL(client_report, FILENAME_BACKTRACE); - if (comment || reproduce || backtrace) + if (comment || backtrace) { struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0); if (dd) @@ -254,11 +253,6 @@ report_status_t Report(crash_data_t *client_report, dd_save_text(dd, FILENAME_COMMENT, comment); add_to_crash_data_ext(stored_report, FILENAME_COMMENT, comment, CD_FLAG_TXT + CD_FLAG_ISEDITABLE); } - if (reproduce) - { - dd_save_text(dd, FILENAME_REPRODUCE, reproduce); - add_to_crash_data_ext(stored_report, FILENAME_REPRODUCE, reproduce, CD_FLAG_TXT + CD_FLAG_ISEDITABLE); - } if (backtrace) { dd_save_text(dd, FILENAME_BACKTRACE, backtrace); -- cgit