From c860a93266c7cca7e75cd68da969e48784fb185f Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Thu, 24 Mar 2011 23:33:01 +0100
Subject: remove plugins/Mailx.conf and plugins/RHTSupport.conf

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---
 src/plugins/Mailx.conf               | 17 -----------------
 src/plugins/Makefile.am              |  2 --
 src/plugins/RHTSupport.conf          | 11 -----------
 src/plugins/abrt-action-rhtsupport.c |  2 +-
 src/plugins/report_Mailx.xml         |  2 +-
 src/plugins/report_RHTSupport.xml    |  4 +---
 6 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 src/plugins/Mailx.conf
 delete mode 100644 src/plugins/RHTSupport.conf

(limited to 'src/plugins')

diff --git a/src/plugins/Mailx.conf b/src/plugins/Mailx.conf
deleted file mode 100644
index 1d946427..00000000
--- a/src/plugins/Mailx.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description: Sends an email with a report (using mailx command)
-
-# Configuration to Email reporter plugin
-Enabled = yes
-
-# In abrt.conf, plugin takes one parameter: subject (in "" if you need to embed spaces).
-# If it isn't specified, then a default subject is taken from this file
-Subject = "[abrt] crash report"
-
-# Your Email
-EmailFrom = user@localhost
-
-# Email To
-EmailTo = root@localhost
-
-# Warning! enabling this may cause sending a lot of MB via email
-SendBinaryData = no
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 03d7a85c..7cc9f1b4 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -24,11 +24,9 @@ pluginsconfdir = $(PLUGINS_CONF_DIR)
 dist_pluginsconf_DATA = \
     CCpp.conf \
     Python.conf \
-    Mailx.conf \
     Logger.conf \
     Kerneloops.conf \
     Bugzilla.conf \
-    RHTSupport.conf \
     Upload.conf
 
 eventsdir = $(EVENTS_DIR)
diff --git a/src/plugins/RHTSupport.conf b/src/plugins/RHTSupport.conf
deleted file mode 100644
index ecd5992a..00000000
--- a/src/plugins/RHTSupport.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Description: Reports crashes to Red Hat support
-
-Enabled = yes
-
-URL = https://api.access.redhat.com/rs
-# No means that ssl certificates will not be checked
-SSLVerify = yes
-# Your login has to exist
-Login =
-# Your password
-Password =
diff --git a/src/plugins/abrt-action-rhtsupport.c b/src/plugins/abrt-action-rhtsupport.c
index d7f93ea9..9175fdec 100644
--- a/src/plugins/abrt-action-rhtsupport.c
+++ b/src/plugins/abrt-action-rhtsupport.c
@@ -70,7 +70,7 @@ static void report_to_rhtsupport(
         free(url);
         free(login);
         free(password);
-        error_msg_and_die(_("Empty login or password, please check RHTSupport.conf"));
+        error_msg_and_die(_("Empty RHTS login or password"));
         return;
     }
 
diff --git a/src/plugins/report_Mailx.xml b/src/plugins/report_Mailx.xml
index 5ff7ee34..6ef33d16 100644
--- a/src/plugins/report_Mailx.xml
+++ b/src/plugins/report_Mailx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <event>
     <name>Mailx</name>
-    <description>Send the problem report over email</description>
+    <description>Send via email</description>
     <options>
         <option type="text" name="Mailx_Subject">
             <label>Subject</label>
diff --git a/src/plugins/report_RHTSupport.xml b/src/plugins/report_RHTSupport.xml
index a01a7dba..9dd0a734 100644
--- a/src/plugins/report_RHTSupport.xml
+++ b/src/plugins/report_RHTSupport.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <event>
     <name>Red Hat Customer Support</name>
-    <description>Report problems to Red Hat support</description>
+    <description>Report to Red Hat support</description>
     <options>
         <option type="text" name="RHTSupport_URL">
             <label>RH Portal URL</label>
@@ -26,5 +26,3 @@
         </option>
     </options>
 </event>
-
-
-- 
cgit