diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
| commit | 8ddcb9404d65bc6b09910099988fe6a0f33fe250 (patch) | |
| tree | 2214c48219c8f3cf1b4110113467fa92d38bfa84 /lib/Plugins/Catcut.cpp | |
| parent | 04d69684f58d851ab604b2ed5eeb04f373efd4d8 (diff) | |
| parent | b348085ac9f3d4a7ded81026bffa962a065bdf97 (diff) | |
| download | abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.gz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.xz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.zip | |
resolve conflict
Diffstat (limited to 'lib/Plugins/Catcut.cpp')
| -rw-r--r-- | lib/Plugins/Catcut.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp index 27b868d..b69038f 100644 --- a/lib/Plugins/Catcut.cpp +++ b/lib/Plugins/Catcut.cpp @@ -390,9 +390,9 @@ ctx::add_attachments(const char* xmlrpc_URL, map_crash_report_t::const_iterator it = pCrashReport.begin(); for (; it != pCrashReport.end(); it++) { - if (it->second[CD_TYPE] == CD_ATT) + if (it->second[CD_TYPE] == CD_TXT && it->second[CD_TYPE].size() > CD_TEXT_ATT_SIZE) { - update_client(_("Attaching (CD_ATT): %s"), it->first.c_str()); + update_client(_("Attaching (text): %s"), it->first.c_str()); string description = "File: " + it->first; string URL = request_upload(auth_cookie, @@ -410,7 +410,7 @@ ctx::add_attachments(const char* xmlrpc_URL, } else if (it->second[CD_TYPE] == CD_BIN) { - update_client(_("Attaching (CD_ATT): %s"), it->first.c_str()); + update_client(_("Attaching binary: %s"), it->first.c_str()); string description = "File: " + it->first; string URL = request_upload(auth_cookie, |