summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2010-01-29 19:14:44 +0100
committerJiri Moskovcak <jmoskovc@redhat.com>2010-01-29 19:14:44 +0100
commit3d052c559827f6fa66fe1e77d81196240b22f00b (patch)
treed167a5eb5b010c191c37f0506a5213b806773960
parent488fab414343b13b242813e7cdebcee5fead4607 (diff)
parent211127853d05bae994824d8141691723f1957954 (diff)
downloadabrt-3d052c559827f6fa66fe1e77d81196240b22f00b.tar.gz
abrt-3d052c559827f6fa66fe1e77d81196240b22f00b.tar.xz
abrt-3d052c559827f6fa66fe1e77d81196240b22f00b.zip
Merge branch 'master' into rhel6
-rw-r--r--src/Gui/SettingsDialog.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py
index 893c23f..a69a68e 100644
--- a/src/Gui/SettingsDialog.py
+++ b/src/Gui/SettingsDialog.py
@@ -103,10 +103,13 @@ class SettingsDialog:
## MaxCrashSize
self.builder.get_object("sbMaxCrashReportsSize").set_value(float(common["MaxCrashReportsSize"]))
## GPG keys
- self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"])
- self.gpgkeys = common["OpenGPGPublicKeys"].split(',')
- for gpgkey in self.gpgkeys:
- self.GPGKeysListStore.append([gpgkey])
+ try:
+ self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"])
+ self.gpgkeys = common["OpenGPGPublicKeys"].split(',')
+ for gpgkey in self.gpgkeys:
+ self.GPGKeysListStore.append([gpgkey])
+ except:
+ pass
## blacklist
self.builder.get_object("eBlacklist").set_text(common["BlackList"])