add element seletors to .xml files; fix a few places where we expect package data

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

6 files changed, 29 insertions, 3 deletions

diff --git a/src/daemon/CommLayerServerDBus.c b/src/daemon/CommLayerServerDBus.c
index 05f7df92..28a4002d 100644
--- a/src/daemon/CommLayerServerDBus.c
+++ b/src/daemon/CommLayerServerDBus.c
@@ -58,6 +58,12 @@ void send_dbus_sig_Crash(const char *package_name,
                                   const char *dir,
                                   const char *uid_str
 ) {
+    /* Happens, for example, if abrt-action-save-package-data
+     * is not configured to run.
+     */
+    if (!package_name)
+        package_name = "";
+
     DBusMessage* msg = new_signal_msg("Crash", NULL);
     if (uid_str)
     {
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c
index a3bf1cab..9a49787d 100644
--- a/src/gui-gtk/abrt-gtk.c
+++ b/src/gui-gtk/abrt-gtk.c
@@ -213,7 +213,6 @@ static void on_button_send_cb(GtkWidget *button, gpointer data)
 
 static void on_menu_report_cb(GtkMenuItem *menuitem, gpointer unused)
 {
-
     s_report_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(s_report_window), _("Problem description"));
     gtk_window_set_default_size(GTK_WINDOW(s_report_window), 400, 400);
diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
index d12521d8..00ef4a49 100644
--- a/src/plugins/report_Bugzilla.xml.in
+++ b/src/plugins/report_Bugzilla.xml.in
@@ -3,8 +3,8 @@
     <_name>Bugzilla</_name>
     <_description>Report to Bugzilla bug tracker</_description>
 
-    <requires-items></requires-items>
-    <exclude-items-by-default></exclude-items-by-default>
+    <requires-items>component,duphash,os_release</requires-items>
+    <exclude-items-by-default>coredump,count,event_log,reported_to</exclude-items-by-default>
     <exclude-items-always></exclude-items-always>
     <exclude-binary-items>yes</exclude-binary-items>
     <include-items-by-default></include-items-by-default>
diff --git a/src/plugins/report_Kerneloops.xml.in b/src/plugins/report_Kerneloops.xml.in
index 83ea50b5..a4da6b6b 100644
--- a/src/plugins/report_Kerneloops.xml.in
+++ b/src/plugins/report_Kerneloops.xml.in
@@ -2,6 +2,13 @@
 <event>
     <_name>Kerneloops.org</_name>
     <_description>Send kernel problems to oops tracker</_description>
+
+    <requires-items>backtrace</requires-items>
+    <exclude-items-by-default></exclude-items-by-default>
+    <exclude-items-always>*</exclude-items-always>
+    <exclude-binary-items>yes</exclude-binary-items>
+    <include-items-by-default></include-items-by-default>
+
     <options>
         <option type="text" name="KerneloopsReporter_SubmitURL">
             <_label>Kerneloops URL</_label>
diff --git a/src/plugins/report_Mailx.xml.in b/src/plugins/report_Mailx.xml.in
index 7584af7d..2476a3d5 100644
--- a/src/plugins/report_Mailx.xml.in
+++ b/src/plugins/report_Mailx.xml.in
@@ -2,6 +2,13 @@
 <event>
     <_name>Mailx</_name>
     <_description>Send via email</_description>
+
+    <requires-items></requires-items>
+    <exclude-items-by-default>coredump</exclude-items-by-default>
+    <exclude-items-always></exclude-items-always>
+    <exclude-binary-items>no</exclude-binary-items>
+    <include-items-by-default></include-items-by-default>
+
     <options>
         <option type="text" name="Mailx_Subject">
             <_label>Subject</_label>
diff --git a/src/plugins/report_RHTSupport.xml.in b/src/plugins/report_RHTSupport.xml.in
index 725be3ac..834528ae 100644
--- a/src/plugins/report_RHTSupport.xml.in
+++ b/src/plugins/report_RHTSupport.xml.in
@@ -2,6 +2,13 @@
 <event>
     <_name>Red Hat Customer Support</_name>
     <_description>Report to Red Hat support</_description>
+
+    <requires-items>package</requires-items>
+    <exclude-items-by-default>event_log,reported_to</exclude-items-by-default>
+    <exclude-items-always></exclude-items-always>
+    <exclude-binary-items>no</exclude-binary-items>
+    <include-items-by-default></include-items-by-default>
+
     <options>
         <option type="text" name="RHTSupport_URL">
             <_label>RH Portal URL</_label>