Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

4 files changed, 25 insertions, 20 deletions

diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 9abb737..40bee1a 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -696,7 +696,7 @@ bool analyzer_has_InformAllUsers(const char *analyzer_name)
     return string_to_bool(it->second.c_str());
 }
 
-bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char* uid)
+bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char *uid_str)
 {
     CAnalyzer* analyzer = g_pPluginManager->GetAnalyzer(analyzer_name);
     if (!analyzer)
@@ -715,16 +715,14 @@ bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char* uid)
     vector_string_t logins;
     parse_args(it->second.c_str(), logins);
 
+    uid_t uid = xatoi_u(uid_str);
     unsigned size = logins.size();
-    if (size == 0)
-        return false;
-
     for (unsigned ii = 0; ii < size; ii++)
     {
-        uid_t id = getuidbyname(logins[ii].c_str())
-        if (id == (uid_t)-1)
+        struct passwd* pw = getpwnam(logins[ii].c_str());
+        if (!pw)
             continue;
-        if (strcmp(uid, to_string(id).c_str()) == 0)
+        if (pw->pw_uid == uid)
             return true;
     }
 */
diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h
index 5fab84d..71d17f3 100644
--- a/src/Daemon/MiddleWare.h
+++ b/src/Daemon/MiddleWare.h
@@ -152,7 +152,7 @@ void AddActionOrReporter(const char *pActionOrReporter,
 
 bool analyzer_has_InformAllUsers(const char *analyzer_name);
 
-bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char* uid);
+bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char *uid_str);
 
 void autoreport(const pair_string_string_t& reporter_options, const map_crash_data_t& crash_report);
 #endif /*MIDDLEWARE_H_*/
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 023cc6e..74cf37e 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -20,6 +20,10 @@ from abrt_utils import _, log, log1, log2
 REFRESH = -50
 SHOW_LOG = -60
 
+# default texts
+COMMENT_HINT_TEXT = _("Brief description how to reproduce this or what you did...")
+HOW_TO_HINT_TEXT = "1.\n2.\n3.\n"
+
 class ReporterDialog():
     """Reporter window"""
     def __init__(self, report, daemon, log=None, parent=None):
@@ -202,8 +206,8 @@ class ReporterDialog():
 
     def hydrate(self):
         self.editable = []
-        self.old_comment = ""
-        self.old_how_to_reproduce = ""
+        self.old_comment = COMMENT_HINT_TEXT
+        self.old_how_to_reproduce = HOW_TO_HINT_TEXT
         for item in self.report:
             try:
                 log2("report[%s]:%s/%s/%s", item, self.report[item][0], self.report[item][1], self.report[item][2][0:20])
@@ -245,7 +249,10 @@ class ReporterDialog():
                 vbAttachments.pack_start(toggle)
                 # bind item to checkbox
                 toggle.item = item
-                toggle.show()
+                #FIXME: temporary workaround, in 1.0.4 reporters don't care
+                # about this, they just send what they want to
+                # TicketUploader even sends coredump!!
+                #toggle.show()
                 continue
 
             # It must be CD_TXT field
@@ -261,16 +268,16 @@ class ReporterDialog():
         #end for
 
         buff = gtk.TextBuffer()
-        self.show_hint_comment = (self.old_comment == "")
+        self.show_hint_comment = (self.old_comment == COMMENT_HINT_TEXT)
         if self.show_hint_comment:
-            buff.set_text(_("Brief description how to reproduce this or what you did..."))
+            buff.set_text(COMMENT_HINT_TEXT)
         else:
             buff.set_text(self.old_comment)
         self.tvComment.set_buffer(buff)
 
         buff = gtk.TextBuffer()
         if self.old_how_to_reproduce == "":
-            buff.set_text("1.\n2.\n3.\n")
+            buff.set_text(HOW_TO_HINT_TEXT)
         else:
             buff.set_text(self.old_how_to_reproduce)
         self.tevHowToReproduce.set_buffer(buff)
diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py
index e226021..708a151 100644
--- a/src/Gui/CC_gui_functions.py
+++ b/src/Gui/CC_gui_functions.py
@@ -43,18 +43,18 @@ def gui_report_dialog ( report_status_dict, parent_dialog,
     message = ""
     status_vbox = gtk.VBox()
     for plugin, res in report_status_dict.iteritems():
-        status_hbox = gtk.HBox()
-        plugin_label = Label()
+        plugin_status_vbox = gtk.VBox()
+        plugin_label = gtk.Label()
         plugin_label.set_markup("<b>%s</b>: " % plugin)
         plugin_label.set_justify(gtk.JUSTIFY_RIGHT)
         plugin_label.set_alignment(0, 0)
-        status_label = Label()
+        status_label = gtk.Label()
         status_label.set_max_width_chars(MAX_WIDTH)
         status_label.set_selectable(True)
         status_label.set_line_wrap(True)
         status_label.set_alignment(0, 0)
-        status_hbox.pack_start(plugin_label, expand=False)
-        status_hbox.pack_start(status_label, expand=False)
+        plugin_status_vbox.pack_start(plugin_label, expand=False)
+        plugin_status_vbox.pack_start(status_label, expand=False)
         # 0 means not succesfull
         #if report_status_dict[plugin][0] == '0':
         # this first one is actually a fallback to set at least
@@ -73,7 +73,7 @@ def gui_report_dialog ( report_status_dict, parent_dialog,
                 status_label.set_text("%s" % report_status_dict[plugin][1])
         if len(report_status_dict[plugin][1]) > MAX_WIDTH:
             status_label.set_tooltip_text(report_status_dict[plugin][1])
-        status_vbox.pack_start(status_hbox, expand=False)
+        status_vbox.pack_start(plugin_status_vbox, expand=False)
     main_hbox.pack_start(status_vbox)
 
     if widget != None: