use FILENAME_BACKTRACE for oops text too

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 4 insertions, 19 deletions

diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp
index 68df2d7d..2d79d38d 100644
--- a/src/CLI/report.cpp
+++ b/src/CLI/report.cpp
@@ -197,9 +197,7 @@ static void write_crash_report(const map_crash_data_t &report, FILE *fp)
   write_crash_report_field(fp, report, FILENAME_REPRODUCE,
 			   _("# How to reproduce the crash?"));
   write_crash_report_field(fp, report, FILENAME_BACKTRACE,
-			   _("# Stack trace: a list of active stack frames at the time the crash occurred\n# Check that it does not contain any sensitive data such as passwords."));
-  write_crash_report_field(fp, report, FILENAME_KERNELOOPS,
-			   _("# Kernel oops: kernel log snippet\n# Check that it does not contain any sensitive data such as passwords."));
+			   _("# Backtrace\n# Check that it does not contain any sensitive data such as passwords."));
   write_crash_report_field(fp, report, CD_DUPHASH, "# DUPHASH");
   write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture"));
   write_crash_report_field(fp, report, FILENAME_CMDLINE, _("# Command line"));
@@ -287,7 +285,6 @@ static int read_crash_report(map_crash_data_t &report, const char *text)
   result |= read_crash_report_field(text, report, FILENAME_COMMENT);
   result |= read_crash_report_field(text, report, FILENAME_REPRODUCE);
   result |= read_crash_report_field(text, report, FILENAME_BACKTRACE);
-  result |= read_crash_report_field(text, report, FILENAME_KERNELOOPS);
   result |= read_crash_report_field(text, report, CD_DUPHASH);
   result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE);
   result |= read_crash_report_field(text, report, FILENAME_CMDLINE);
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 770ed927..4a8c7cf5 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -411,8 +411,7 @@ report_status_t Report(const map_crash_data_t& client_report,
     const char *comment = get_crash_data_item_content_or_NULL(client_report, FILENAME_COMMENT);
     const char *reproduce = get_crash_data_item_content_or_NULL(client_report, FILENAME_REPRODUCE);
     const char *backtrace = get_crash_data_item_content_or_NULL(client_report, FILENAME_BACKTRACE);
-    const char *kerneloops = get_crash_data_item_content_or_NULL(client_report, FILENAME_KERNELOOPS);
-    if (comment || reproduce || backtrace || kerneloops)
+    if (comment || reproduce || backtrace)
     {
         CDebugDump dd;
         dd.Open(pDumpDir.c_str());
@@ -431,11 +430,6 @@ report_status_t Report(const map_crash_data_t& client_report,
             dd.SaveText(FILENAME_BACKTRACE, backtrace);
             add_to_crash_data_ext(stored_report, FILENAME_BACKTRACE, CD_TXT, CD_ISEDITABLE, backtrace);
         }
-        if (kerneloops)
-        {
-            dd.SaveText(FILENAME_KERNELOOPS, kerneloops);
-            add_to_crash_data_ext(stored_report, FILENAME_KERNELOOPS, CD_TXT, CD_ISEDITABLE, kerneloops);
-        }
     }
 
     /* Remove BIN filenames from stored_report if they are not present in client's data */
diff --git a/src/Gui/CCDump.py b/src/Gui/CCDump.py
index ad7e4d51..1b06caa7 100644
--- a/src/Gui/CCDump.py
+++ b/src/Gui/CCDump.py
@@ -29,7 +29,6 @@ FILENAME_CMDLINE      = "cmdline"
 FILENAME_COREDUMP     = "coredump"
 FILENAME_BACKTRACE    = "backtrace"
 FILENAME_MEMORYMAP    = "memorymap"
-FILENAME_KERNELOOPS   = "kerneloops"
 
 CD_UID          = "uid"
 CD_UUID         = "UUID"
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 123fa2d8..a4c216d2 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -215,15 +215,13 @@ class ReporterDialog():
         self.editable = []
         self.old_comment = COMMENT_HINT_TEXT
         self.old_how_to_reproduce = HOW_TO_HINT_TEXT
-        self.is_oops = False
         for item in self.report:
             try:
                 log2("report[%s]:%s/%s/%s", item, self.report[item][0], self.report[item][1], self.report[item][2][0:20])
             except:
                 pass
 
-            if item == FILENAME_BACKTRACE or item == FILENAME_KERNELOOPS:
-                self.is_oops = item == FILENAME_KERNELOOPS
+            if item == FILENAME_BACKTRACE:
                 buff = gtk.TextBuffer()
                 tvBacktrace = self.builder.get_object("tvBacktrace")
                 buff.set_text(self.report[item][CD_CONTENT])
@@ -312,10 +310,7 @@ class ReporterDialog():
         tev_backtrace = self.builder.get_object("tvBacktrace")
         buff = tev_backtrace.get_buffer()
         text = buff.get_text(buff.get_start_iter(), buff.get_end_iter())
-        if self.is_oops:
-            self.report[FILENAME_KERNELOOPS] = [CD_TXT, 'y', text]
-        else:
-            self.report[FILENAME_BACKTRACE] = [CD_TXT, 'y', text]
+        self.report[FILENAME_BACKTRACE] = [CD_TXT, 'y', text]
 
     def check_report(self):
     # FIXME: check the report for passwords and some other potentially