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

5 files changed, 16 insertions, 10 deletions

diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 646974dd..7c2d4657 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -538,7 +538,8 @@ static void handle_dbus_err(bool error_flag, DBusError *err)
         return;
     error_msg_and_die(
             "Error requesting DBus name %s, possible reasons: "
-            "abrt run by non-root; dbus config is incorrect",
+            "abrt run by non-root; dbus config is incorrect; "
+            "or dbus daemon needs to be restarted to reload dbus config",
             ABRTD_DBUS_NAME);
 }
 
diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index d97b34eb..e429908e 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -218,7 +218,9 @@ class MainWindow():
         dump = dumpsListStore.get_value(dumpsListStore.get_iter(path[0]), dumpsListStore.get_n_columns()-1)
         #move this to Dump class
         if dump.isReported():
-            report_label = _("<b>This crash has been reported, you can find the report(s) at:</b>\n")
+            report_label = _("<b>This crash has been reported:</b>\n")
+            # plugin message follows, but at least in case of kerneloops,
+            # it is not informative (no URL to the report)
             for message in dump.getMessage().split('\n'):
                 if message:
                     if "http" in message[0:5] or "file:///"[0:8] in message:
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 8ff52acd..09a9c914 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -96,7 +96,7 @@ class ReporterDialog():
     # this callback is called when user press Cancel or Report button in Report dialog
     def on_response(self, dialog, response_id, daemon):
         # the button has been pressed (probably)
-        print "response_id", response_id
+        # print "response_id", response_id
         if response_id == gtk.RESPONSE_APPLY:
             if not (self.check_settings(daemon) and self.check_report()):
                 dialog.stop_emission("response")
diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py
index ba895c67..0532ab79 100644
--- a/src/Gui/CC_gui_functions.py
+++ b/src/Gui/CC_gui_functions.py
@@ -45,9 +45,12 @@ def gui_report_dialog ( report_status_dict, parent_dialog,
         plugin_label = 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.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)
         # 0 means not succesfull
@@ -206,24 +209,24 @@ def get_icon_for_package(theme,package):
             return gtk.gdk.pixbuf_new_from_file_at_size(icon_filename,22,22)
         else:
             return None
-            
+
 def show_log(log, parent=None):
     builder = gtk.Builder()
     builderfile = "%s%sdialogs.glade" % (sys.path[0],"/")
     builder.add_from_file(builderfile)
     dialog = builder.get_object("LogViewer")
     tevLog = builder.get_object("tevLog")
-    
+
     if parent:
         dialog.set_position (gtk.WIN_POS_CENTER_ON_PARENT)
         dialog.set_transient_for(parent)
     else:
         dialog.set_position (gtk.WIN_POS_CENTER)
-    
+
     buff = gtk.TextBuffer()
     buff.set_text(log)
     tevLog.set_buffer(buff)
-    
+
     dialog.run()
     dialog.destroy()
 
diff --git a/src/Hooks/sitecustomize.py b/src/Hooks/sitecustomize.py
index 97941e87..8027726b 100644
--- a/src/Hooks/sitecustomize.py
+++ b/src/Hooks/sitecustomize.py
@@ -13,12 +13,12 @@ def abrt_daemon_ok():
     except Exception, ex:
         # log the exception?
         return False
-        
+
     pid = pidfile.readline()
     pidfile.close()
     if not pid:
         return False
-    
+
     try:
         # pid[:-1] strips the trailing '\n'
         cmdline = open("/proc/%s/cmdline" % pid[:-1], "r").readline()
@@ -27,7 +27,7 @@ def abrt_daemon_ok():
         return False
     if not ("abrtd" in cmdline):
         return False
-        
+
     return True
 
 if abrt_daemon_ok():