GUI: fix rhbz#560971 "Don't show empty 'Not loaded plugins' section"

also fix bad plugin descr for TicketUploader

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 23 insertions, 11 deletions

diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index 8ac6a87..d924b91 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -435,7 +435,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
 
     map_plugin_settings_t::const_iterator end = pSettings.end();
     map_plugin_settings_t::const_iterator it;
-   
+
     it = pSettings.find("Customer");
     if (it == end)
     {
@@ -443,7 +443,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["Customer"] = it->second;
-    
+
     it = pSettings.find("Ticket");
     if (it == end)
     {
@@ -451,7 +451,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["Ticket"] = it->second;
-    
+
     it = pSettings.find("URL");
     if (it == end)
     {
@@ -459,7 +459,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["URL"] = it->second;
-    
+
     it = pSettings.find("Encrypt");
     if (it == end)
     {
@@ -467,7 +467,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["Encrypt"] = it->second;
-    
+
     it = pSettings.find("Upload");
     if (it == end)
     {
@@ -475,7 +475,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["Upload"] = it->second;
-    
+
     it = pSettings.find("RetryCount");
     if (it == end)
     {
@@ -483,7 +483,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["RetryCount"] = it->second;
-    
+
     it = pSettings.find("RetryDelay");
     if (it == end)
     {
@@ -491,7 +491,7 @@ map_plugin_settings_t CTicketUploader::parse_settings(const map_plugin_settings_
         return plugin_settings;
     }
     plugin_settings["RetryDelay"] = it->second;
-    
+
     VERB1 log("User settings ok, using them instead of defaults");
     return plugin_settings;
 }
@@ -500,7 +500,7 @@ PLUGIN_INFO(REPORTER,
             CTicketUploader,
             "TicketUploader",
             "0.0.1",
-            "Asks ticket# and customer name from user, sends report to FTP",
+            "Packs crash data into .tar.gz file, optionally uploads it via FTP/SCP/etc",
             "gavin@redhat.com",
             "https://fedorahosted.org/abrt/wiki",
             PLUGINS_LIB_DIR"/TicketUploader.GTKBuilder");
diff --git a/src/Gui/PluginsSettingsDialog.py b/src/Gui/PluginsSettingsDialog.py
index 611a8c5..0ba390d 100644
--- a/src/Gui/PluginsSettingsDialog.py
+++ b/src/Gui/PluginsSettingsDialog.py
@@ -97,22 +97,34 @@ class PluginsSettingsDialog:
             # don't force refresh as it will overwrite settings if g-k is not available
             pluginlist = getPluginInfoList(self.ccdaemon)
         except Exception, e:
-            print e
+            log("Error while loading plugins info: %s", e)
             #gui_error_message("Error while loading plugins info, please check if abrt daemon is running\n %s" % e)
             return
         plugin_rows = {}
+        group_empty = {}
         for plugin_type in PluginInfo.types.keys():
             it = self.pluginsListStore.append(None,
+                        # 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
         for entry in pluginlist:
             if entry.Description:
                 text = "<b>%s</b>\n%s" % (entry.getName(), entry.Description)
             else:
                 # non-loaded plugins have empty description
                 text = "<b>%s</b>" % entry.getName()
-            self.pluginsListStore.append(plugin_rows[entry.getType()],
+            plugin_type = entry.getType()
+            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
+        # 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])
         self.pluginlist.expand_all()
 
     def dehydrate(self):