Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

3 files changed, 9 insertions, 34 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bad3e63a..e30f38bc 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,8 +1,8 @@
-# libreport - the stuff shared among most of abrt (like xmalloc, logging)
+# libreport2 - the stuff shared among most of abrt (like xmalloc, logging)
 # libabrt_dbus - daemon, cli and applet use this
 # libabrt_web - for abrt-action-foo where foo deals with network/web/ftp/...
 lib_LTLIBRARIES = \
-    libreport.la \
+    libreport2.la \
     libabrt_dbus.la \
     libabrt_web.la
 
@@ -10,7 +10,7 @@ lib_LTLIBRARIES = \
 # time.cpp
 # xconnect.cpp
 
-libreport_la_SOURCES = \
+libreport2_la_SOURCES = \
     xfuncs.c \
     encbase64.c \
     binhex.c \
@@ -44,7 +44,7 @@ libreport_la_SOURCES = \
     parse_release.c \
     parse_options.c parse_options.h \
     steal_directory.c
-libreport_la_CPPFLAGS = \
+libreport2_la_CPPFLAGS = \
     -Wall -Werror \
     -I$(srcdir)/../include/report -I$(srcdir)/../include \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
@@ -55,9 +55,9 @@ libreport_la_CPPFLAGS = \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE
-libreport_la_LDFLAGS = \
+libreport2_la_LDFLAGS = \
     -version-info 0:1:0
-libreport_la_LIBADD = \
+libreport2_la_LIBADD = \
     $(GLIB_LIBS)
 
 libabrt_dbus_la_SOURCES = \
diff --git a/src/lib/crash_data.c b/src/lib/crash_data.c
index 1ae8f4f1..8c948436 100644
--- a/src/lib/crash_data.c
+++ b/src/lib/crash_data.c
@@ -89,7 +89,6 @@ vector_of_crash_data_t *new_vector_of_crash_data(void)
 
 static const char *const editable_files[] = {
 	FILENAME_COMMENT    ,
-	FILENAME_REPRODUCE  ,
 	FILENAME_BACKTRACE  ,
 	NULL
 };
diff --git a/src/lib/make_descr.c b/src/lib/make_descr.c
index 1ba15203..1ebdfc4d 100644
--- a/src/lib/make_descr.c
+++ b/src/lib/make_descr.c
@@ -140,20 +140,13 @@ char* make_description_bz(crash_data_t *crash_data)
             }
             if (*bl)
                 continue; /* blacklisted */
-            if (strcmp(content, "1.\n2.\n3.\n") == 0)
-                continue; /* user did not change default "How to reproduce" */
 
             if (strlen(content) <= CD_TEXT_ATT_SIZE)
             {
                 /* Add small (less than few kb) text items inline */
                 bool was_multiline = 0;
                 char *tmp = NULL;
-                add_content(&was_multiline,
-                        &tmp,
-			/* "reproduce: blah" looks ugly, fixing: */
-                        (strcmp(name, FILENAME_REPRODUCE) == 0) ? "How to reproduce" : name,
-                        content
-                );
+                add_content(&was_multiline, &tmp, name, content);
 
                 if (was_multiline)
                 {
@@ -233,8 +226,6 @@ char* make_description_logger(crash_data_t *crash_data)
             }
             if (*bl)
                 continue; /* blacklisted */
-            if (strcmp(content, "1.\n2.\n3.\n") == 0)
-                continue; /* user did not change default "How to reproduce" */
 
             bool was_multiline = 0;
             char *tmp = NULL;
@@ -262,22 +253,11 @@ char* make_description_logger(crash_data_t *crash_data)
     return strbuf_free_nobuf(buf_dsc);
 }
 
-char* make_description_reproduce_comment(crash_data_t *crash_data)
+char* make_description_comment(crash_data_t *crash_data)
 {
-    char *repro = NULL;
     char *comment = NULL;
     struct crash_item *value;
 
-    value = get_crash_data_item_or_NULL(crash_data, FILENAME_REPRODUCE);
-    if (value)
-    {
-        if (value->content[0]
-         && strcmp(value->content, "1.\n2.\n3.\n") != 0
-        ) {
-            repro = xasprintf("\n\nHow to reproduce\n-----\n%s", value->content);
-        }
-    }
-
     value = get_crash_data_item_or_NULL(crash_data, FILENAME_COMMENT);
     if (value)
     {
@@ -285,18 +265,14 @@ char* make_description_reproduce_comment(crash_data_t *crash_data)
             comment = xasprintf("\n\nComment\n-----\n%s", value->content);
     }
 
-    if (!repro && !comment)
+    if (!comment)
         return NULL;
 
     struct strbuf *buf_dsc = strbuf_new();
 
-    if (repro)
-        strbuf_append_str(buf_dsc, repro);
-
     if (comment)
         strbuf_append_str(buf_dsc, comment);
 
-    free(repro);
     free(comment);
 
     return strbuf_free_nobuf(buf_dsc);