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

4 files changed, 14 insertions, 9 deletions

diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index 7967028..c0666f0 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -2,6 +2,7 @@
 import sys
 import pwd
 import getopt
+from glib import markup_escape_text
 
 from abrt_utils import _, init_logging, log, log1, log2
 import gobject
@@ -233,7 +234,7 @@ class MainWindow():
             # it is not informative (no URL to the report)
             for message in dump.getMessage().split(';'):
                 if message:
-                    message_clean = message.strip()
+                    message_clean = markup_escape_text(message.strip())
                     if "http" in message_clean[0:5] or "file:///" in message_clean[0:8]:
                         report_message = "<a href=\"%s\">%s</a>" % (message_clean, message_clean)
                     else:
diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py
index 9378de5..acfd2a5 100644
--- a/src/Gui/CC_gui_functions.py
+++ b/src/Gui/CC_gui_functions.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from glib import markup_escape_text
 import gtk
 import pango
 import subprocess
@@ -66,7 +67,7 @@ def gui_report_dialog ( report_status_dict, parent_dialog,
         # this first one is actually a fallback to set at least
         # a raw text in case when set_markup() fails
         status_label.set_text(report_status_dict[plugin][MESSAGE])
-        status_label.set_markup("<span foreground='red'>%s</span>" % report_status_dict[plugin][MESSAGE])
+        status_label.set_markup("<span foreground='red'>%s</span>" % markup_escape_text(report_status_dict[plugin][MESSAGE]))
         # if the report was not succesful then this won't pass so this runs only
         # if report succeds and gets overwriten by the status message
         if report_status_dict[plugin][STATUS] == '1':
diff --git a/src/Gui/PluginsSettingsDialog.py b/src/Gui/PluginsSettingsDialog.py
index d6129b1..787faee 100644
--- a/src/Gui/PluginsSettingsDialog.py
+++ b/src/Gui/PluginsSettingsDialog.py
@@ -107,7 +107,7 @@ class PluginsSettingsDialog:
                         # cell_text, toggle_active, toggle_visible, group_name_visible, color, plugin
                         ["<b>%s</b>" % PluginInfo.types[plugin_type], 0, 0, 1, "gray", None])
             plugin_rows[plugin_type] = it
-            group_empty[plugin_type] = 1
+            group_empty[plugin_type] = it
         for entry in pluginlist:
             if entry.Description:
                 text = "<b>%s</b>\n%s" % (entry.getName(), entry.Description)
@@ -118,13 +118,13 @@ class PluginsSettingsDialog:
             self.pluginsListStore.append(plugin_rows[plugin_type],
                         # cell_text, toggle_active, toggle_visible, group_name_visible, color, plugin
                         [text, entry.Enabled == "yes", 1, 0, "white", entry])
-            group_empty[plugin_type] = 0
+            if group_empty.has_key(plugin_type):
+                del group_empty[plugin_type]
         # rhbz#560971 "Don't show empty 'Not loaded plugins' section"
-        for plugin_type in group_empty.keys():
-            if group_empty[plugin_type]:
-                self.pluginsListStore.append(plugin_rows[plugin_type],
-                        # cell_text, toggle_active, toggle_visible, group_name_visible, color, plugin
-                        ["(none)", 0, 1, 0, "white", None])
+        # don't show any empty groups
+        for it in group_empty.values():
+            self.pluginsListStore.remove(it)
+        
         self.pluginlist.expand_all()
 
     def dehydrate(self):
diff --git a/src/Gui/report.glade b/src/Gui/report.glade
index cff0dc8..7b3aac4 100644
--- a/src/Gui/report.glade
+++ b/src/Gui/report.glade
@@ -302,6 +302,7 @@
                                 <property name="height_request">200</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="accepts_tab">False</property>
                               </object>
                             </child>
                           </object>
@@ -377,6 +378,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="wrap_mode">word-char</property>
+                                            <property name="accepts_tab">False</property>
                                           </object>
                                         </child>
                                       </object>
@@ -414,6 +416,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="wrap_mode">word-char</property>
+                                            <property name="accepts_tab">False</property>
                                           </object>
                                         </child>
                                       </object>