summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarel Klic <kklic@redhat.com>2010-03-31 18:33:54 +0200
committerKarel Klic <kklic@redhat.com>2010-03-31 18:33:54 +0200
commit7fb914d14a80deb9ecdc9218ec1dee1e57026d97 (patch)
tree64252538a29e42aa0c553adad2b7de1647f931f9 /lib
parent140262f87cff4c95962945bd5cb55a6c57f371e8 (diff)
parente7039f8f8e313a52cd99f606006891b61355d67f (diff)
downloadabrt-7fb914d14a80deb9ecdc9218ec1dee1e57026d97.tar.gz
abrt-7fb914d14a80deb9ecdc9218ec1dee1e57026d97.tar.xz
abrt-7fb914d14a80deb9ecdc9218ec1dee1e57026d97.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'lib')
-rw-r--r--lib/Plugins/Bugzilla.GTKBuilder7
-rw-r--r--lib/Plugins/CCpp.cpp12
-rw-r--r--lib/Plugins/SOSreport.cpp2
3 files changed, 5 insertions, 16 deletions
diff --git a/lib/Plugins/Bugzilla.GTKBuilder b/lib/Plugins/Bugzilla.GTKBuilder
index abb55578..a071bd7b 100644
--- a/lib/Plugins/Bugzilla.GTKBuilder
+++ b/lib/Plugins/Bugzilla.GTKBuilder
@@ -46,7 +46,7 @@
<object class="GtkLabel" id="lLogin">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Login:</property>
+ <property name="label" translatable="yes">Login(email):</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -172,7 +172,7 @@
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Don't have an account yet? You can register at</property>
+ <property name="label" translatable="yes">Don't have an account yet?</property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -183,7 +183,8 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xpad">5</property>
- <property name="label" translatable="yes">https://bugzilla.redhat.com/createaccount.cgi</property>
+ <property name="label" translatable="yes">You can create it &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</property>
+ <property name="use_markup">True</property>
<property name="selectable">True</property>
</object>
<packing>
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 27144d7d..c3174008 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -111,18 +111,6 @@ static string create_hash(const char *pInput)
return hash_str;
}
-static string concat_str_vector(char **strings)
-{
- string result;
- while (*strings)
- {
- result += *strings++;
- if (*strings)
- result += ' ';
- }
- return result;
-}
-
/* Returns status. See `man 2 wait` for status information. */
static int ExecVP(char **pArgs, uid_t uid, int redirect_stderr, string& pOutput)
{
diff --git a/lib/Plugins/SOSreport.cpp b/lib/Plugins/SOSreport.cpp
index 188d16d6..102ad3d8 100644
--- a/lib/Plugins/SOSreport.cpp
+++ b/lib/Plugins/SOSreport.cpp
@@ -77,7 +77,7 @@ void CActionSOSreport::Run(const char *pActionDir, const char *pArgs, int force)
}
}
- static const char command_default[] = "nice sosreport --batch --no-progressbar"
+ static const char command_default[] = "nice sosreport --batch"
" --only=anaconda --only=bootloader"
" --only=devicemapper --only=filesys --only=hardware --only=kernel"
" --only=libraries --only=memory --only=networking --only=nfsserver"