diff options
-rw-r--r-- | abrt.spec | 8 | ||||
-rw-r--r-- | lib/Plugins/Makefile.am | 18 | ||||
-rw-r--r-- | lib/Plugins/ReportUploader.GTKBuilder (renamed from lib/Plugins/TicketUploader.GTKBuilder) | 0 | ||||
-rw-r--r-- | lib/Plugins/ReportUploader.conf (renamed from lib/Plugins/TicketUploader.conf) | 0 | ||||
-rw-r--r-- | lib/Plugins/ReportUploader.cpp (renamed from lib/Plugins/TicketUploader.cpp) | 28 | ||||
-rw-r--r-- | lib/Plugins/ReportUploader.h (renamed from lib/Plugins/TicketUploader.h) | 12 | ||||
-rw-r--r-- | lib/Plugins/abrt-ReportUploader.7 (renamed from lib/Plugins/abrt-TicketUploader.7) | 6 | ||||
-rw-r--r-- | po/POTFILES.in | 2 |
8 files changed, 37 insertions, 37 deletions
@@ -406,10 +406,10 @@ fi %files plugin-ticketuploader %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/TicketUploader.conf -%{_libdir}/%{name}/libTicketUploader.so* -%{_libdir}/%{name}/TicketUploader.GTKBuilder -%{_mandir}/man7/%{name}-TicketUploader.7.gz +%config(noreplace) %{_sysconfdir}/%{name}/plugins/ReportUploader.conf +%{_libdir}/%{name}/libReportUploader.so* +%{_libdir}/%{name}/ReportUploader.GTKBuilder +%{_mandir}/man7/%{name}-ReportUploader.7.gz %files plugin-filetransfer %defattr(-,root,root,-) diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index 690d91de..659cf6be 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -12,7 +12,7 @@ pluginslib_LTLIBRARIES = \ libSOSreport.la \ libBugzilla.la \ libRHTSupport.la \ - libTicketUploader.la \ + libReportUploader.la \ libPython.la \ libFileTransfer.la @@ -21,7 +21,7 @@ dist_pluginslib_DATA = \ Mailx.GTKBuilder \ Bugzilla.GTKBuilder \ RHTSupport.GTKBuilder \ - TicketUploader.GTKBuilder \ + ReportUploader.GTKBuilder \ KerneloopsReporter.GTKBuilder pluginsconfdir = $(PLUGINS_CONF_DIR) @@ -33,7 +33,7 @@ dist_pluginsconf_DATA = \ Kerneloops.conf \ Bugzilla.conf \ RHTSupport.conf \ - TicketUploader.conf \ + ReportUploader.conf \ FileTransfer.conf \ Python.conf \ SOSreport.conf @@ -48,7 +48,7 @@ man_MANS = \ abrt-plugins.7 \ abrt-SQLite3.7 \ abrt-RunApp.7 \ - abrt-TicketUploader.7 + abrt-ReportUploader.7 EXTRA_DIST = $(man_MANS) @@ -130,11 +130,11 @@ libRHTSupport_la_CPPFLAGS = \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -DLOCALSTATEDIR='"$(localstatedir)"' -# TicketUploader -libTicketUploader_la_SOURCES = TicketUploader.h TicketUploader.cpp -libTicketUploader_la_LDFLAGS = -avoid-version -libTicketUploader_la_LIBADD = $(CURL_LIBS) -libTicketUploader_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +# ReportUploader +libReportUploader_la_SOURCES = ReportUploader.h ReportUploader.cpp +libReportUploader_la_LDFLAGS = -avoid-version +libReportUploader_la_LIBADD = $(CURL_LIBS) +libReportUploader_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # Python libPython_la_SOURCES = Python.h Python.cpp Python_hash.h Python_hash.cpp diff --git a/lib/Plugins/TicketUploader.GTKBuilder b/lib/Plugins/ReportUploader.GTKBuilder index b6f8299f..b6f8299f 100644 --- a/lib/Plugins/TicketUploader.GTKBuilder +++ b/lib/Plugins/ReportUploader.GTKBuilder diff --git a/lib/Plugins/TicketUploader.conf b/lib/Plugins/ReportUploader.conf index 57692531..57692531 100644 --- a/lib/Plugins/TicketUploader.conf +++ b/lib/Plugins/ReportUploader.conf diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/ReportUploader.cpp index 4af55648..ae118995 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/ReportUploader.cpp @@ -1,5 +1,5 @@ /* - TicketUploader.cpp + ReportUploader.cpp Copyright (C) 2009 RedHat inc. @@ -19,7 +19,7 @@ */ #include "abrtlib.h" #include "abrt_curl.h" -#include "TicketUploader.h" +#include "ReportUploader.h" #include "DebugDump.h" #include "ABRTException.h" #include "CommLayerInner.h" @@ -27,14 +27,14 @@ using namespace std; -CTicketUploader::CTicketUploader() : +CReportUploader::CReportUploader() : m_bEncrypt(false), m_bUpload(false), m_nRetryCount(3), m_nRetryDelay(20) {} -CTicketUploader::~CTicketUploader() +CReportUploader::~CReportUploader() {} @@ -90,7 +90,7 @@ static void WriteCommand(const char *cmd, const char *input) } } -void CTicketUploader::SendFile(const char *pURL, const char *pFilename, int retry_count, int retry_delay) +void CReportUploader::SendFile(const char *pURL, const char *pFilename, int retry_count, int retry_delay) { if (pURL[0] == '\0') { @@ -154,7 +154,7 @@ static void write_str_to_file(const char *str, const char *path, const char *fna fclose(ofile); } -string CTicketUploader::Report(const map_crash_data_t& pCrashData, +string CReportUploader::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { @@ -189,12 +189,12 @@ string CTicketUploader::Report(const map_crash_data_t& pCrashData, retry_count = m_nRetryCount; retry_delay = m_nRetryDelay; } - update_client(_("Creating a TicketUploader report...")); + update_client(_("Creating a ReportUploader report...")); bool have_ticket_name = (ticket_name != ""); if (!have_ticket_name) { - ticket_name = "TicketUploader-newticket"; + ticket_name = "ReportUploader-newticket"; } // Format the time to add to the file name @@ -368,7 +368,7 @@ static bool is_string_safe(const char *str) return true; } -void CTicketUploader::SetSettings(const map_plugin_settings_t& pSettings) +void CReportUploader::SetSettings(const map_plugin_settings_t& pSettings) { m_pSettings = pSettings; @@ -414,7 +414,7 @@ void CTicketUploader::SetSettings(const map_plugin_settings_t& pSettings) } } -const map_plugin_settings_t& CTicketUploader::GetSettings() +const map_plugin_settings_t& CReportUploader::GetSettings() { m_pSettings["Customer"] = m_sCustomer; m_pSettings["Ticket"] = m_sTicket; @@ -428,7 +428,7 @@ const map_plugin_settings_t& CTicketUploader::GetSettings() } //todo: make static -map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_t& pSettings) +map_plugin_settings_t CReportUploader::parse_settings(const map_plugin_settings_t& pSettings) { map_plugin_settings_t plugin_settings; @@ -496,10 +496,10 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_ } PLUGIN_INFO(REPORTER, - CTicketUploader, - "TicketUploader", + CReportUploader, + "ReportUploader", "0.0.1", "Packs crash data into .tar.gz file, optionally uploads it via FTP/SCP/etc", "gavin@redhat.com", "https://fedorahosted.org/abrt/wiki", - PLUGINS_LIB_DIR"/TicketUploader.GTKBuilder"); + PLUGINS_LIB_DIR"/ReportUploader.GTKBuilder"); diff --git a/lib/Plugins/TicketUploader.h b/lib/Plugins/ReportUploader.h index 402e2ccf..3611eb9f 100644 --- a/lib/Plugins/TicketUploader.h +++ b/lib/Plugins/ReportUploader.h @@ -1,5 +1,5 @@ /* - TicketUploader.h + ReportUploader.h Attach a configureable Ticket Number and Customer name to a report. Create a compressed, optionally encrypted, tarball. @@ -21,13 +21,13 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef TICKETUPLOADER_H_ -#define TICKETUPLOADER_H_ +#ifndef REPORTUPLOADER_H_ +#define REPORTUPLAODER_H_ #include "Plugin.h" #include "Reporter.h" -class CTicketUploader : public CReporter +class CReportUploader : public CReporter { private: std::string m_sCustomer; @@ -42,8 +42,8 @@ class CTicketUploader : public CReporter map_plugin_settings_t parse_settings(const map_plugin_settings_t& pSettings); public: - CTicketUploader(); - virtual ~CTicketUploader(); + CReportUploader(); + virtual ~CReportUploader(); virtual const map_plugin_settings_t& GetSettings(); virtual void SetSettings(const map_plugin_settings_t& pSettings); diff --git a/lib/Plugins/abrt-TicketUploader.7 b/lib/Plugins/abrt-ReportUploader.7 index 6b923eba..bd91f266 100644 --- a/lib/Plugins/abrt-TicketUploader.7 +++ b/lib/Plugins/abrt-ReportUploader.7 @@ -1,12 +1,12 @@ .TH abrt "7" "9 July 2009" "" .SH NAME -TicketUploader plugin for abrt(8) +ReportUploader plugin for abrt(8) .SH DESCRIPTION .P .I abrt is a daemon which watches for application crashes. When a crash occurs, it collects the crash data and performs some actions according to -the configuration. This manual page describes the \fITicketUploader\fP plugin +the configuration. This manual page describes the \fIReportUploader\fP plugin for \fIabrt\fP. .P This plugin will send a report to an anonymous FTP site. It's intended @@ -25,7 +25,7 @@ in the ticketing system. The plugin is invoked in the \fIabrt.conf\fP configuration file. No parameters are necessary. .SH CONFIGURATION -The \fITicketUploader.conf\fP configuration file contains +The \fIReportUploader.conf\fP configuration file contains entries in a format "Option = Value". The options are: .SS Customer This is the customer's name or other customer identifier. diff --git a/po/POTFILES.in b/po/POTFILES.in index 13bb5d45..3f7a7eac 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ # [encoding: UTF-8] # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -lib/Plugins/TicketUploader.cpp +lib/Plugins/ReportUploader.cpp lib/Plugins/RHTSupport.cpp lib/Utils/make_descr.cpp src/Applet/abrt-applet.desktop.in |