summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2010-01-20 21:41:46 +0100
committerJiri Moskovcak <jmoskovc@redhat.com>2010-01-20 21:41:46 +0100
commit9fac90866f5936fc507463faade2bc6be56f7182 (patch)
treed2309661a1d8e712c3ac09b89a5b2807f9c18f56 /src
parentbbb210c836aaa6487e643176548b8b3feb11c347 (diff)
downloadabrt-9fac90866f5936fc507463faade2bc6be56f7182.tar.gz
abrt-9fac90866f5936fc507463faade2bc6be56f7182.tar.xz
abrt-9fac90866f5936fc507463faade2bc6be56f7182.zip
Fixed reporting from abrt-gui when g-keyring is not accessible
- when g-k is not available to user, GUI let him to insert his credentials, but only remembers it until he closes the gui
Diffstat (limited to 'src')
-rw-r--r--src/Gui/CCMainWindow.py10
-rw-r--r--src/Gui/PluginList.py7
2 files changed, 8 insertions, 9 deletions
diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index f67cd06a..e7853f52 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -303,14 +303,8 @@ class MainWindow():
try:
self.pBarWindow.show_all()
self.timer = gobject.timeout_add(100, self.progress_update_cb)
- # Old way: it needs to talk to daemon
- #reporters_settings = {}
- ## self.pluginlist = getPluginInfoList(self.ccdaemon, refresh=True)
- ## don't force refresh!
- #self.pluginlist = getPluginInfoList(self.ccdaemon)
- #for plugin in self.pluginlist.getReporterPlugins():
- # reporters_settings[str(plugin)] = plugin.Settings
- reporters_settings = getCurrentConfBackend().load_all()
+ pluginlist = getPluginInfoList(self.ccdaemon)
+ reporters_settings = pluginlist.getReporterPluginsSettings()
log2("Report(result,settings):")
log2(" result:%s", str(result))
# Careful, this will print reporters_settings["Password"] too
diff --git a/src/Gui/PluginList.py b/src/Gui/PluginList.py
index d2232bbc..78e58298 100644
--- a/src/Gui/PluginList.py
+++ b/src/Gui/PluginList.py
@@ -38,7 +38,12 @@ class PluginInfoList(list):
def getReporterPlugins(self):
return [x for x in self if x["Enabled"] == 'yes' and x["Type"] == 'Reporter']
-
+ def getReporterPluginsSettings(self):
+ reporters_settings = {}
+ for plugin in self.getReporterPlugins():
+ reporters_settings[str(plugin)] = plugin.Settings
+ return reporters_settings
+
__PFList = None
__PFList_dbmanager = None