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

22 files changed, 79 insertions, 181 deletions

diff --git a/src/applet/Makefile.am b/src/applet/Makefile.am
index cd4a643f..7b0d0dca 100644
--- a/src/applet/Makefile.am
+++ b/src/applet/Makefile.am
@@ -23,7 +23,7 @@ abrt_applet_CPPFLAGS = \
 #    $(LIBNOTIFY_CFLAGS)
 #    $(DBUS_GLIB_CFLAGS)
 abrt_applet_LDADD = \
-    ../lib/libreport.la \
+    ../lib/libreport2.la \
     ../lib/libabrt_dbus.la \
     -lglib-2.0 \
     -lgthread-2.0 \
@@ -39,7 +39,7 @@ abrt_applet_LDADD = \
 #    -D_GNU_SOURCE \
 #    -Wall -Werror
 #test_report_LDADD = \
-#    ../lib/libreport.la
+#    ../lib/libreport2.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
diff --git a/src/btparser/Makefile.am b/src/btparser/Makefile.am
index 9f64f826..ad93b317 100644
--- a/src/btparser/Makefile.am
+++ b/src/btparser/Makefile.am
@@ -15,7 +15,7 @@ libbtparser_la_SOURCES = \
 	utils.h utils.c
 libbtparser_la_CFLAGS = -Wall -Werror -D_GNU_SOURCE -I../lib
 libbtparser_la_LDFLAGS = -version-info 1:1:0
-libbtparser_la_LIBADD = ../lib/libreport.la
+libbtparser_la_LIBADD = ../lib/libreport2.la
 
 # From http://www.seul.org/docs/autotut/
 # Version consists 3 numbers: CURRENT, REVISION, AGE.
diff --git a/src/cli/CLI.cpp b/src/cli/CLI.cpp
index 5ece3171..49c08279 100644
--- a/src/cli/CLI.cpp
+++ b/src/cli/CLI.cpp
@@ -182,10 +182,6 @@ static void print_crash_info(crash_data_t *crash_data, bool show_backtrace)
     if (hostname)
         printf(_("Hostname:           %s\n"), hostname);
 
-    const char *reproduce = get_crash_item_content_or_NULL(crash_data, FILENAME_REPRODUCE);
-    if (reproduce)
-        printf(_("\nHow to reproduce:\n%s\n"), reproduce);
-
     const char *comment = get_crash_item_content_or_NULL(crash_data, FILENAME_COMMENT);
     if (comment)
         printf(_("\nComment:\n%s\n"), comment);
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 0a5c6e1a..0cf463f7 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -16,7 +16,7 @@ abrt_cli_CPPFLAGS = \
     -Wall -Werror
 #    $(GTK_CFLAGS)
 abrt_cli_LDADD = \
-    ../lib/libreport.la \
+    ../lib/libreport2.la \
     ../lib/libabrt_dbus.la \
     $(GLIB_LIBS)
 
diff --git a/src/cli/report.cpp b/src/cli/report.cpp
index 6b2bf2e2..ff18d19c 100644
--- a/src/cli/report.cpp
+++ b/src/cli/report.cpp
@@ -172,8 +172,6 @@ static void write_crash_report(crash_data_t *report, FILE *fp)
 
     write_crash_report_field(fp, report, FILENAME_COMMENT,
             _("# Describe the circumstances of this crash below"));
-    write_crash_report_field(fp, report, FILENAME_REPRODUCE,
-            _("# How to reproduce the crash?"));
     write_crash_report_field(fp, report, FILENAME_BACKTRACE,
             _("# Backtrace\n# Check that it does not contain any sensitive data (passwords, etc.)"));
     write_crash_report_field(fp, report, FILENAME_DUPHASH, "# DUPHASH");
@@ -255,7 +253,6 @@ static int read_crash_report(crash_data_t *report, const char *text)
 {
     int result = 0;
     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_DUPHASH);
     result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE);
@@ -272,15 +269,12 @@ static int read_crash_report(crash_data_t *report, const char *text)
 
 /**
  * Ensures that the fields needed for editor are present in the crash data.
- * Fields: comments, how to reproduce.
+ * Fields: comments.
  */
 static void create_fields_for_editor(crash_data_t *crash_data)
 {
     if (!get_crash_data_item_or_NULL(crash_data, FILENAME_COMMENT))
         add_to_crash_data_ext(crash_data, FILENAME_COMMENT, "", CD_FLAG_TXT + CD_FLAG_ISEDITABLE);
-
-    if (!get_crash_data_item_or_NULL(crash_data, FILENAME_REPRODUCE))
-        add_to_crash_data_ext(crash_data, FILENAME_REPRODUCE, "1. \n2. \n3. \n", CD_FLAG_TXT + CD_FLAG_ISEDITABLE);
 }
 
 /**
@@ -725,18 +719,15 @@ int report(const char *dump_dir_name, int flags)
             free(events_as_lines);
             return 1;
         }
-        /* Save comment, "how to reproduce", backtrace */
+        /* Save comment, backtrace */
         dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
         if (dd)
         {
 //TODO: we should iterate through crash_data and modify all modifiable fields
             const char *comment = get_crash_item_content_or_NULL(crash_data, FILENAME_COMMENT);
-            const char *reproduce = get_crash_item_content_or_NULL(crash_data, FILENAME_REPRODUCE);
             const char *backtrace = get_crash_item_content_or_NULL(crash_data, FILENAME_BACKTRACE);
             if (comment)
                 dd_save_text(dd, FILENAME_COMMENT, comment);
-            if (reproduce)
-                dd_save_text(dd, FILENAME_REPRODUCE, reproduce);
             if (backtrace)
                 dd_save_text(dd, FILENAME_BACKTRACE, backtrace);
             dd_close(dd);
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/Makefile.am b/src/daemon/Makefile.am
index 6fe73065..a8e0bfb6 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -34,7 +34,7 @@ abrtd_CPPFLAGS = \
 abrtd_LDADD = \
     $(DL_LIBS) \
     $(DBUS_LIBS) \
-    ../lib/libreport.la \
+    ../lib/libreport2.la \
     ../lib/libabrt_dbus.la
 
 abrt_server_SOURCES = \
@@ -53,7 +53,7 @@ abrt_server_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_server_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_handle_crashdump_SOURCES = \
     abrt-handle-crashdump.c
@@ -73,7 +73,7 @@ abrt_handle_crashdump_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_handle_crashdump_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_save_package_data_SOURCES = \
     rpm.h rpm.c \
@@ -95,7 +95,7 @@ abrt_action_save_package_data_CPPFLAGS = \
     -Wall -Werror
 abrt_action_save_package_data_LDADD = \
     $(RPM_LIBS) \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
 dist_dbusabrtconf_DATA = dbus-abrt.conf
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);
diff --git a/src/gui-gtk/Makefile.am b/src/gui-gtk/Makefile.am
index a0d0de40..054253d2 100644
--- a/src/gui-gtk/Makefile.am
+++ b/src/gui-gtk/Makefile.am
@@ -22,7 +22,7 @@ abrt_gtk_CFLAGS = \
 #    $(LIBNOTIFY_CFLAGS)
 #    $(DBUS_GLIB_CFLAGS)
 abrt_gtk_LDADD = \
-    ../lib/libreport.la \
+    ../lib/libreport2.la \
     ../lib/libabrt_dbus.la \
     -lglib-2.0 \
     -lgthread-2.0 \
@@ -38,7 +38,7 @@ abrt_gtk_LDADD = \
 #    -D_GNU_SOURCE \
 #    -Wall -Werror
 #test_report_LDADD = \
-#    ../lib/libreport.la
+#    ../lib/libreport2.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
diff --git a/src/gui-wizard-gtk/Makefile.am b/src/gui-wizard-gtk/Makefile.am
index 4281c470..789501ee 100644
--- a/src/gui-wizard-gtk/Makefile.am
+++ b/src/gui-wizard-gtk/Makefile.am
@@ -30,7 +30,7 @@ bug_reporting_wizard_CFLAGS = \
 # -lgmodule-2.0
 # -lgthread-2.0
 bug_reporting_wizard_LDADD = \
-    ../lib/libreport.la \
+    ../lib/libreport2.la \
     ../lib/libabrt_dbus.la \
     $(GLIB_LIBS) \
     $(GTK_LIBS) \
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 27692925..2a41f366 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -19,7 +19,6 @@ GtkContainer *g_container_details2;
 
 GtkLabel *g_lbl_cd_reason;
 GtkTextView *g_tv_backtrace;
-GtkTextView *g_tv_reproduce;
 GtkTextView *g_tv_comment;
 GtkTreeView *g_tv_details;
 GtkListStore *g_ls_details;
@@ -335,7 +334,6 @@ void update_gui_state_from_crash_data(void)
     g_hash_table_foreach(g_cd, append_item_to_details_ls, NULL);
 
     load_text_to_text_view(g_tv_backtrace, FILENAME_BACKTRACE);
-    load_text_to_text_view(g_tv_reproduce, FILENAME_REPRODUCE);
     load_text_to_text_view(g_tv_comment, FILENAME_COMMENT);
 
 //Doesn't work: shows empty page
@@ -735,7 +733,6 @@ static void on_page_prepare(GtkAssistant *assistant, GtkWidget *page, gpointer u
     if (pages[PAGENO_REPORT].page_widget == page)
     {
         /* User just pressed [Fwd] on comment page. Same as above */
-        save_text_from_text_view(g_tv_reproduce, FILENAME_REPRODUCE);
         save_text_from_text_view(g_tv_comment, FILENAME_COMMENT);
     }
 
@@ -773,9 +770,7 @@ static gint next_page_no(gint current_page_no, gpointer data)
 
 #if 0
     case PAGENO_BACKTRACE_APPROVAL:
-        if (get_crash_item_content_or_NULL(g_cd, FILENAME_COMMENT)
-         || get_crash_item_content_or_NULL(g_cd, FILENAME_REPRODUCE)
-        ) {
+        if (get_crash_item_content_or_NULL(g_cd, FILENAME_COMMENT)) {
             break;
         }
         current_page_no++; /* no comment, skip next page */
@@ -919,7 +914,6 @@ static void add_pages(void)
     g_lbl_report_log       = GTK_LABEL(        gtk_builder_get_object(builder, "lbl_report_log"));
     g_tv_report_log        = GTK_TEXT_VIEW(    gtk_builder_get_object(builder, "tv_report_log"));
     g_tv_backtrace         = GTK_TEXT_VIEW(    gtk_builder_get_object(builder, "tv_backtrace"));
-    g_tv_reproduce         = GTK_TEXT_VIEW(    gtk_builder_get_object(builder, "tv_reproduce"));
     g_tv_comment           = GTK_TEXT_VIEW(    gtk_builder_get_object(builder, "tv_comment"));
     g_tv_details           = GTK_TREE_VIEW(    gtk_builder_get_object(builder, "tv_details"));
     g_box_warning_labels   = GTK_BOX(          gtk_builder_get_object(builder, "box_warning_labels"));
diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade
index 0db515d2..e35f5e15 100644
--- a/src/gui-wizard-gtk/wizard.glade
+++ b/src/gui-wizard-gtk/wizard.glade
@@ -387,92 +387,47 @@
         <property name="border_width">10</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkVBox" id="vbox3">
-                <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="xalign">1.1175871339474952e-09</property>
-                    <property name="yalign">0</property>
-                    <property name="ypad">5</property>
-                    <property name="label" translatable="yes">How did this crash happen (step-by-step)? How can it be reproduced?</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTextView" id="tv_reproduce">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="wrap_mode">word</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
+            <property name="xalign">0</property>
+            <property name="yalign">0</property>
+            <property name="ypad">5</property>
+            <property name="label" translatable="yes">How did this problem happen (step-by-step)? How can it be reproduced?</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="yalign">0</property>
+            <property name="ypad">5</property>
+            <property name="label" translatable="yes">Any additional comments useful for diagnosing the problem?</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow4">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkVBox" id="vbox4">
+              <object class="GtkTextView" id="tv_comment">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Are there any comments you would like to share with the software maintainers?</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTextView" id="tv_comment">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="wrap_mode">word</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="wrap_mode">word</property>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="position">0</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -486,7 +441,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>
diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
index 6ebf3628..40e57ff5 100644
--- a/src/hooks/Makefile.am
+++ b/src/hooks/Makefile.am
@@ -13,7 +13,7 @@ abrt_hook_ccpp_CPPFLAGS = \
     -Wall \
     -D_GNU_SOURCE
 abrt_hook_ccpp_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 python_PYTHON = abrt.pth abrt_exception_handler.py
 EXTRA_DIST = abrt_exception_handler.py.in $(man_MANS)
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 477963c3..b11c3332 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,5 +1,5 @@
-libreport_includedir = $(includedir)/report
-libreport_include_HEADERS = \
+libreport2_includedir = $(includedir)/report
+libreport2_include_HEADERS = \
     report/crash_data.h \
     report/dump_dir.h \
     report/run_event.h
diff --git a/src/include/abrt_crash_data.h b/src/include/abrt_crash_data.h
index b71b046f..2a123ec3 100644
--- a/src/include/abrt_crash_data.h
+++ b/src/include/abrt_crash_data.h
@@ -52,7 +52,6 @@
 #define FILENAME_PACKAGE      "package"
 #define FILENAME_COMPONENT    "component"
 #define FILENAME_COMMENT      "comment"
-#define FILENAME_REPRODUCE    "reproduce"
 #define FILENAME_RATING       "rating"
 #define FILENAME_HOSTNAME     "hostname"
 // Optional. Set to "1" by abrt-handle-upload for every unpacked crashdump
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index 61731587..116f4b36 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -229,8 +229,8 @@ char *iso_date_string(time_t *pt);
 
 #define make_description_bz abrt_make_description_bz
 char* make_description_bz(crash_data_t *crash_data);
-#define make_description_reproduce_comment abrt_make_description_reproduce_comment
-char* make_description_reproduce_comment(crash_data_t *crash_data);
+#define make_description_comment abrt_make_description_comment
+char* make_description_comment(crash_data_t *crash_data);
 #define make_description_logger abrt_make_description_logger
 char* make_description_logger(crash_data_t *crash_data);
 #define make_description_mailx abrt_make_description_mailx
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);
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 59e0f1a4..1a3921b9 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -79,7 +79,7 @@ abrt_dump_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_dump_oops_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_analyze_c_SOURCES = \
     abrt-action-analyze-c.c
@@ -98,7 +98,7 @@ abrt_action_analyze_c_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_c_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_analyze_python_SOURCES = \
     abrt-action-analyze-python.c
@@ -117,7 +117,7 @@ abrt_action_analyze_python_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_python_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_analyze_oops_SOURCES = \
     abrt-action-analyze-oops.c
@@ -136,7 +136,7 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_oops_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_generate_backtrace_SOURCES = \
     abrt-action-generate-backtrace.c
@@ -155,7 +155,7 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_generate_backtrace_LDADD = \
-    ../lib/libreport.la \
+    ../lib/libreport2.la \
     ../btparser/libbtparser.la
 
 abrt_action_bugzilla_SOURCES = \
@@ -177,7 +177,7 @@ abrt_action_bugzilla_CPPFLAGS = \
 abrt_action_bugzilla_LDADD = \
     $(GLIB_LIBS) \
     ../lib/libabrt_web.la \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_rhtsupport_SOURCES = \
     abrt_rh_support.h abrt_rh_support.c \
@@ -202,7 +202,7 @@ abrt_action_rhtsupport_LDADD = \
     $(GLIB_LIBS) \
     $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
     ../lib/libabrt_web.la \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_upload_SOURCES = \
     abrt-action-upload.c
@@ -225,7 +225,7 @@ abrt_action_upload_LDFLAGS = -ltar
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
     $(CURL_LIBS) \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_kerneloops_SOURCES = \
     abrt-action-kerneloops.c
@@ -245,7 +245,7 @@ abrt_action_kerneloops_CPPFLAGS = \
     -Wall -Werror
 abrt_action_kerneloops_LDADD = \
     ../lib/libabrt_web.la \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_mailx_SOURCES = \
     abrt-action-mailx.c
@@ -264,7 +264,7 @@ abrt_action_mailx_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_mailx_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_print_SOURCES = \
     abrt-action-print.c
@@ -283,7 +283,7 @@ abrt_action_print_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_print_LDADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 abrt_action_install_debuginfo_SOURCES = \
     abrt-action-install-debuginfo.c
@@ -305,7 +305,7 @@ abrt_retrace_client_SOURCES = \
      -D_GNU_SOURCE \
      -Wall -Werror
  abrt_retrace_client_LDADD = \
-     ../lib/libreport.la \
+     ../lib/libreport2.la \
      ../btparser/libbtparser.la \
      $(NSS_LIBS)
 
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index 2aa32b75..1a391ae9 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -854,7 +854,7 @@ static void report_to_bugzilla(
             throw_if_xml_fault_occurred(&bz_server.env);
         }
 
-        char *dsc = make_description_reproduce_comment(crash_data);
+        char *dsc = make_description_comment(crash_data);
         if (dsc)
         {
             const char* package    = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am
index a00e2d7b..cff7af64 100644
--- a/src/report-python/Makefile.am
+++ b/src/report-python/Makefile.am
@@ -29,7 +29,7 @@ _pyreport_la_LDFLAGS = \
     -avoid-version \
     -export-symbols-regex init_pyreport
 _pyreport_la_LIBADD = \
-    ../lib/libreport.la
+    ../lib/libreport2.la
 
 # report compat: