diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-18 13:15:23 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-18 13:15:23 +0200 |
commit | 2c8c422ef09b253b2cd7c2cc9fde9dda76cd3bb2 (patch) | |
tree | a4b965e5acc5bd424b3f0cca2f697d861e31b24d | |
parent | 20eb553c3ac2187e8347f093f6ba480ceb85627b (diff) | |
download | abrt-2c8c422ef09b253b2cd7c2cc9fde9dda76cd3bb2.tar.gz abrt-2c8c422ef09b253b2cd7c2cc9fde9dda76cd3bb2.tar.xz abrt-2c8c422ef09b253b2cd7c2cc9fde9dda76cd3bb2.zip |
whitespace cleanup, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | lib/CommLayer/DBusClientProxy.cpp | 2 | ||||
-rw-r--r-- | lib/Plugins/SOSreport.cpp | 2 | ||||
-rw-r--r-- | src/Daemon/CrashWatcher.cpp | 2 | ||||
-rw-r--r-- | src/Gui/ABRTPlugin.py | 14 | ||||
-rw-r--r-- | src/Gui/CCDBusBackend.py | 74 | ||||
-rw-r--r-- | src/Gui/CCDump.py | 18 | ||||
-rw-r--r-- | src/Gui/CCDumpList.py | 4 | ||||
-rw-r--r-- | src/Gui/CCMainWindow.py | 68 | ||||
-rw-r--r-- | src/Gui/CCReport.py | 6 | ||||
-rw-r--r-- | src/Gui/CCReporterDialog.py | 38 | ||||
-rw-r--r-- | src/Gui/CC_gui_functions.py | 4 | ||||
-rw-r--r-- | src/Gui/PluginList.py | 4 | ||||
-rw-r--r-- | src/Gui/PluginSettingsUI.py | 12 | ||||
-rw-r--r-- | src/Gui/SettingsDialog.py | 10 | ||||
-rw-r--r-- | src/Gui/exception.py | 16 | ||||
-rw-r--r-- | src/Hooks/abrt_exception_handler.py.in | 2 | ||||
-rw-r--r-- | src/Hooks/sitecustomize.py | 4 |
17 files changed, 140 insertions, 140 deletions
diff --git a/lib/CommLayer/DBusClientProxy.cpp b/lib/CommLayer/DBusClientProxy.cpp index 4f51172d..59f9f5d5 100644 --- a/lib/CommLayer/DBusClientProxy.cpp +++ b/lib/CommLayer/DBusClientProxy.cpp @@ -33,7 +33,7 @@ DaemonWatcher_proxy::DaemonWatcher_proxy() { m_pStateChangeHandler_cb_data = NULL; m_pStateChangeHandler = NULL; - connect_signal(DaemonWatcher_proxy, NameOwnerChanged , _DaemonStateChanged); + connect_signal(DaemonWatcher_proxy, NameOwnerChanged, _DaemonStateChanged); } void DaemonWatcher_proxy::ConnectStateChangeHandler(void (*pStateChangeHandler)(bool running, void* data), void *cb_data) diff --git a/lib/Plugins/SOSreport.cpp b/lib/Plugins/SOSreport.cpp index 5247a5d5..513adfb1 100644 --- a/lib/Plugins/SOSreport.cpp +++ b/lib/Plugins/SOSreport.cpp @@ -116,7 +116,7 @@ void CActionSOSreport::Run(const std::string& pActionDir, } PLUGIN_INFO(ACTION, - CActionSOSreport , + CActionSOSreport, "SOSreport", "0.0.2", "Run sosreport, save the output in the crash dump", diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index ac33d2eb..aefe3f93 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -334,7 +334,7 @@ void CCrashWatcher::SetUpCron() cron_callback_data_t* cronPeriodicCallbackData = new cron_callback_data_t(this, (*it_ar).first, (*it_ar).second, timeout); g_timeout_add_seconds_full(G_PRIORITY_DEFAULT, - timeout , + timeout, cron_activation_periodic_cb, static_cast<gpointer>(cronPeriodicCallbackData), cron_delete_callback_data_cb); diff --git a/src/Gui/ABRTPlugin.py b/src/Gui/ABRTPlugin.py index dc95956c..ce802c2c 100644 --- a/src/Gui/ABRTPlugin.py +++ b/src/Gui/ABRTPlugin.py @@ -23,8 +23,8 @@ class PluginSettings(dict): """Class to represent common plugin info""" class PluginInfo(): - keys = ["WWW", "Name", "Enabled", - "GTKBuilder", "Version", + keys = ["WWW", "Name", "Enabled", + "GTKBuilder", "Version", "Type", "Email", "Description"] def __init__(self): @@ -38,16 +38,16 @@ class PluginInfo(): self.Email = None self.Description = None self.Settings = None - + def getName(self): return self.Name - + def getDescription(self): return self.Description - + def getGUI(self): return self.GTKBuilder - + def __str__(self): return self.Name - + diff --git a/src/Gui/CCDBusBackend.py b/src/Gui/CCDBusBackend.py index ee99e3d6..663616fa 100644 --- a/src/Gui/CCDBusBackend.py +++ b/src/Gui/CCDBusBackend.py @@ -28,16 +28,16 @@ class DBusManager(gobject.GObject): def __init__(self, dbusmanager): self.dbusmanager = dbusmanager dbus.service.Object.__init__(self, dbus.SessionBus(), APP_PATH) - + @dbus.service.method(dbus_interface=APP_IFACE) def show(self): self.dbusmanager.emit("show") try: session = dbus.SessionBus() except Exception, e: - # probably run after "$ su" + # probably run after "$ su" pass - + if session: try: app_proxy = session.get_object(APP_NAME,APP_PATH) @@ -48,23 +48,23 @@ class DBusManager(gobject.GObject): except DBusException, e: # cannot create proxy or call the method => gui is not running pass - + gobject.GObject.__init__(self) # signal emited when new crash is detected - gobject.signal_new ("crash", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,()) + gobject.signal_new ("crash", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,()) # signal emited when new analyze is complete - gobject.signal_new ("analyze-complete", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) + gobject.signal_new ("analyze-complete", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) # signal emited when smth fails - gobject.signal_new ("error", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) - gobject.signal_new ("warning", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) + gobject.signal_new ("error", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) + gobject.signal_new ("warning", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) # signal emited to update gui with current status - gobject.signal_new ("update", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) + gobject.signal_new ("update", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) # signal emited to show gui if user try to run it again - gobject.signal_new ("show", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,()) + gobject.signal_new ("show", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,()) # signal emited to show gui if user try to run it again - gobject.signal_new ("daemon-state-changed", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) - gobject.signal_new ("report-done", self ,gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) - + gobject.signal_new ("daemon-state-changed", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) + gobject.signal_new ("report-done", self, gobject.SIGNAL_RUN_FIRST,gobject.TYPE_NONE,(gobject.TYPE_PYOBJECT,)) + # export the app dbus interface if session: session.request_name(APP_NAME) @@ -75,21 +75,21 @@ class DBusManager(gobject.GObject): # disconnect callback def disconnected(*args): print "disconnect" - + def error_handler_cb(self,arg): self.emit("error",arg) - + def warning_handler_cb(self,arg): self.emit("warning",arg) - + def error_handler(self,arg): # used to silently ingore dbus timeouts pass - + def dummy(*args): # dummy function for async method call to workaround the timeout pass - + def crash_cb(self,*args): #FIXME "got another crash, gui should reload!" #for arg in args: @@ -97,17 +97,17 @@ class DBusManager(gobject.GObject): #emit a signal #print "crash" self.emit("crash") - + def update_cb(self, dest, message): # FIXME: use dest instead of 0 once we implement it in daemon #if self.uniq_name == dest: self.emit("update", message) - + def warning_cb(self, message, dest=None): # FIXME: use dest instead of 0 once we implement it in daemon #if self.uniq_name == dest: self.emit("warning", message) - + def analyze_complete_cb(self,dump): #for arg in args: # print "Analyze complete for: %s" % arg @@ -115,7 +115,7 @@ class DBusManager(gobject.GObject): # FIXME - rewrite with CCReport class # self.emit("analyze-complete", dump) pass - + def owner_changed_cb(self,name, old_owner, new_owner): if(name == CC_NAME and new_owner): self.proxy = self.connect_to_daemon() @@ -123,8 +123,8 @@ class DBusManager(gobject.GObject): if(name == CC_NAME and not(new_owner)): self.proxy = None self.emit("daemon-state-changed", "down") - - + + def connect_to_daemon(self): if not self.bus: self.bus = dbus.SystemBus() @@ -136,7 +136,7 @@ class DBusManager(gobject.GObject): self.proxy = self.bus.get_object(CC_IFACE, CC_PATH) else: raise Exception("Please check if abrt daemon is running.") - + if self.proxy: self.cc = dbus.Interface(self.proxy, dbus_interface=CC_IFACE) #intr = dbus.Interface(proxy, dbus_interface='org.freedesktop.DBus.Introspectable') @@ -158,7 +158,7 @@ class DBusManager(gobject.GObject): def addJob(self, job_id): pass #self.pending_jobs.append(job_id) - + def jobdone_cb(self, dest, job_id): if self.uniq_name == dest: dump = self.cc.GetJobResult(job_id) @@ -166,10 +166,10 @@ class DBusManager(gobject.GObject): self.emit("analyze-complete", dump) else: self.emit("error","Daemon did't return valid report info\nDebuginfo is missing?") - + def report_done(self, result): self.emit("report-done", result) - + def getReport(self, UUID): try: # let's try it async @@ -178,14 +178,14 @@ class DBusManager(gobject.GObject): self.addJob(self.cc.CreateReport(UUID, timeout=60)) except dbus.exceptions.DBusException, e: raise Exception(e) - + def Report(self,report): # map < Plguin_name vec <status, message> > self.cc.Report(report, reply_handler=self.report_done, error_handler=self.error_handler_cb, timeout=60) - + def DeleteDebugDump(self,UUID): return self.cc.DeleteDebugDump(UUID) - + def getDumps(self): row_dict = None rows = [] @@ -196,22 +196,22 @@ class DBusManager(gobject.GObject): row_dict[column] = row[column] rows.append(row_dict); return rows - + def getPluginsInfo(self): return self.cc.GetPluginsInfo() - + def getPluginSettings(self, plugin_name): settings = self.cc.GetPluginSettings(plugin_name) #for i in settings.keys(): # print i return settings - + def registerPlugin(self, plugin_name): return self.cc.RegisterPlugin(plugin_name) - + def unRegisterPlugin(self, plugin_name): return self.cc.UnRegisterPlugin(plugin_name) - + def setPluginSettings(self, plugin_name, plugin_settings): return self.cc.SetPluginSettings(plugin_name, plugin_settings) - + diff --git a/src/Gui/CCDump.py b/src/Gui/CCDump.py index 0ea106f6..feb294a4 100644 --- a/src/Gui/CCDump.py +++ b/src/Gui/CCDump.py @@ -16,25 +16,25 @@ class Dump(): self.Time = None self.Description = None self.Reported = None - + def getUUID(self): return self.UUID[CONTENT] - + def getUID(self): return self.UID[CONTENT] - + def getCount(self): return self.Count[CONTENT] - + def getExecutable(self): return self.Executable[CONTENT] - + def getPackage(self): return self.Package[CONTENT] - + def isReported(self): return self.Reported[CONTENT] == "1" - + def getTime(self,format): #print format if format: @@ -43,9 +43,9 @@ class Dump(): except Exception, e: print e return int(self.Time[CONTENT]) - + def getPackageName(self): return self.Package[CONTENT][:self.Package[CONTENT].find("-")] - + def getDescription(self): return self.Description[CONTENT] diff --git a/src/Gui/CCDumpList.py b/src/Gui/CCDumpList.py index 7684b46e..9833ad21 100644 --- a/src/Gui/CCDumpList.py +++ b/src/Gui/CCDumpList.py @@ -7,7 +7,7 @@ class DumpList(list): def __init__(self,dbus_manager=None): self.dm = dbus_manager self.ddict = {} - + def load(self): if self.dm: #print "loading DumpList" @@ -27,7 +27,7 @@ class DumpList(list): return else: print "db == None!" - + __PFList = None __PFList_dbmanager = None diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index 6f9ab46c..8e0b0085 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -21,7 +21,7 @@ try: except Exception, ex: rpm = None -#installExceptionHandler("abrt-gui", "0.0.6") +#installExceptionHandler("abrt-gui", "0.0.7") class MainWindow(): ccdaemon = None @@ -40,7 +40,7 @@ class MainWindow(): #Set the Glade file self.gladefile = "%s%sccgui.glade" % (sys.path[0],"/") self.wTree = gtk.glade.XML(self.gladefile) - + #Get the Main Window, and connect the "destroy" event self.window = self.wTree.get_widget("main_window2") self.window.set_default_size(700, 480) @@ -48,20 +48,20 @@ class MainWindow(): self.window.connect("delete_event", self.delete_event_cb) self.window.connect("destroy", self.destroy) self.window.connect("focus-in-event", self.focus_in_cb) - + self.statusWindow = self.wTree.get_widget("pBarWindow") if self.statusWindow: self.statusWindow.connect("delete_event", self.sw_delete_event_cb) - + self.appBar = self.wTree.get_widget("appBar") # pregress bar window to show while bt is being extracted self.pBarWindow = self.wTree.get_widget("pBarWindow") self.pBarWindow.set_transient_for(self.window) self.pBar = self.wTree.get_widget("pBar") - - # set colours for descritpion heading + + # set colours for description heading self.wTree.get_widget("evDescription").modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("black")) - + #init the dumps treeview self.dlist = self.wTree.get_widget("tvDumps") if os.getuid() == 0: @@ -76,7 +76,7 @@ class MainWindow(): # add pixbuff separatelly icon_column = gtk.TreeViewColumn('Icon') icon_column.cell = gtk.CellRendererPixbuf() - icon_column.cell.set_property('cell-background' , "#C9C9C9") + icon_column.cell.set_property('cell-background', "#C9C9C9") n = self.dlist.append_column(icon_column) icon_column.pack_start(icon_column.cell, False) icon_column.set_attributes(icon_column.cell, pixbuf=(n-1), cell_background_set=5) @@ -96,7 +96,7 @@ class MainWindow(): column.pack_start(column.cell, False) #column.set_attributes(column.cell, ) # FIXME: use some relative indexing - column.cell.set_property('cell-background' , "#C9C9C9") + column.cell.set_property('cell-background', "#C9C9C9") column.set_attributes(column.cell, text=(n-1), cell_background_set=5) column.set_resizable(True) #connect signals @@ -115,7 +115,7 @@ class MainWindow(): self.ccdaemon.connect("show", self.show_cb) self.ccdaemon.connect("daemon-state-changed", self.on_daemon_state_changed_cb) self.ccdaemon.connect("report-done", self.on_report_done_cb) - + # load data #self.load() def on_daemon_state_changed_cb(self, widget, state): @@ -124,17 +124,17 @@ class MainWindow(): self.window.set_sensitive(True) elif state == "down": self.window.set_sensitive(False) - + def on_miAbout_clicked(self, widget): dialog = self.wTree.get_widget("about") result = dialog.run() dialog.hide() - + def on_miPreferences_clicked(self, widget): dialog = SettingsDialog(self.window,self.ccdaemon) dialog.hydrate() dialog.show() - + def warning_cb(self, daemon, message=None): # try to hide the progressbar, we dont really care if it was visible .. try: @@ -144,7 +144,7 @@ class MainWindow(): except Exception, e: pass gui_error_message("%s" % message,parent_dialog=self.window) - + def error_cb(self, daemon, message=None): # try to hide the progressbar, we dont really care if it was visible .. try: @@ -153,16 +153,16 @@ class MainWindow(): except Exception, e: pass gui_error_message("Unable to get report!\n%s" % message,parent_dialog=self.window) - + def update_cb(self, daemon, message): message = message.replace('\n',' ') self.wTree.get_widget("lStatus").set_text(message) - + # call to update the progressbar def progress_update_cb(self, *args): self.pBar.pulse() return True - + def hydrate(self): n = None self.dumpsListStore.clear() @@ -176,15 +176,15 @@ class MainWindow(): except: icon = None if os.getuid() == 0: - n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), + n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), entry.getTime("%Y.%m.%d %H:%M:%S"), entry.getCount(), pwd.getpwuid(int(entry.getUID()))[0], entry]) else: - n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), + n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), entry.getTime("%Y.%m.%d %H:%M:%S"), entry.getCount(), entry.isReported(), entry]) # activate the last row if any.. if n: self.dlist.set_cursor(self.dumpsListStore.get_path(n)) - + def filter_dumps(self, model, miter, data): # for later.. return True @@ -203,7 +203,7 @@ class MainWindow(): #move this to Dump class lPackage = self.wTree.get_widget("lPackage") self.wTree.get_widget("lDescription").set_label(dump.getDescription()) - + def on_bDelete_clicked(self, button, treeview): dumpsListStore, path = self.dlist.get_selection().get_selected_rows() if not path: @@ -218,10 +218,10 @@ class MainWindow(): print "Couldn't delete" except Exception, e: print e - + def destroy(self, widget, data=None): gtk.main_quit() - + def on_data_changed_cb(self, *args): # FIXME mark the new entry somehow.... # remember the selected row @@ -230,7 +230,7 @@ class MainWindow(): if not path: return self.dlist.set_cursor(path[0]) - + def on_report_done_cb(self, daemon, result): try: gobject.source_remove(self.timer) @@ -242,10 +242,10 @@ class MainWindow(): message = "" for plugin, res in result.iteritems(): message += "<b>%s</b>: %s\n" % (plugin, result[plugin][1]) - + gui_info_dialog("<b>Report done!</b>\n%s" % message, self.window) self.hydrate() - + def on_analyze_complete_cb(self, daemon, report, pBarWindow): try: gobject.source_remove(self.timer) @@ -277,7 +277,7 @@ class MainWindow(): #else: # pass #print "got another crash, refresh gui?" - + def on_bReport_clicked(self, button): # FIXME don't duplicate the code, move to function dumpsListStore, path = self.dlist.get_selection().get_selected_rows() @@ -287,7 +287,7 @@ class MainWindow(): #self.pBar.show() self.pBarWindow.show_all() self.timer = gobject.timeout_add (100,self.progress_update_cb) - + dump = dumpsListStore.get_value(dumpsListStore.get_iter(path[0]), dumpsListStore.get_n_columns()-1) # show the report window with selected dump try: @@ -300,25 +300,25 @@ class MainWindow(): self.pBarWindow.hide() gui_error_message("Error getting the report: %s" % e) return - + def sw_delete_event_cb(self, widget, event, data=None): if self.timer: gobject.source_remove(self.timer) widget.hide() return True - + def delete_event_cb(self, widget, event, data=None): gtk.main_quit() - + def focus_in_cb(self, widget, event, data=None): self.window.set_urgency_hint(False) - + def on_bQuit_clicked(self, widget): gtk.main_quit() - + def show(self): self.window.show() - + def show_cb(self, daemon): if self.window: if self.window.is_active(): diff --git a/src/Gui/CCReport.py b/src/Gui/CCReport.py index 6077da87..66de1e96 100644 --- a/src/Gui/CCReport.py +++ b/src/Gui/CCReport.py @@ -20,12 +20,12 @@ class Report(): def getUUID(self): return self.UUID - + def getArchitecture(self): return self.Architecture - + def getExecutable(self): return self.Executable - + def getPackage(self): return self.Package diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py index d22f07f3..b83ac61c 100644 --- a/src/Gui/CCReporterDialog.py +++ b/src/Gui/CCReporterDialog.py @@ -23,19 +23,19 @@ class ReporterDialog(): self.report = report #Set the Glade file # FIXME add to path - self.gladefile = "%s%sreport.glade" % (sys.path[0],"/") - self.wTree = gtk.glade.XML(self.gladefile) + self.gladefile = "%s%sreport.glade" % (sys.path[0],"/") + self.wTree = gtk.glade.XML(self.gladefile) #Get the Main Window, and connect the "destroy" event self.window = self.wTree.get_widget("reporter_dialog") self.window.set_default_size(640, 480) - + # comment textview self.tvComment = self.wTree.get_widget("tvComment") self.tvComment.connect("focus-in-event", self.on_comment_focus_cb) self.comment_changed = False - + self.tvReport = self.wTree.get_widget("tvReport") - + self.reportListStore = gtk.ListStore(str, str, bool, bool, bool) # set filter #self.modelfilter = self.reportListStore.filter_new() @@ -44,12 +44,12 @@ class ReporterDialog(): renderer = gtk.CellRendererText() column = gtk.TreeViewColumn('Item', renderer, text=0) self.tvReport.append_column(column) - + renderer = CellRenderers.MultilineCellRenderer() renderer.props.editable = True renderer.props.wrap_mode = pango.WRAP_WORD renderer.props.wrap_width = 800 - + #renderer.props.wrap_mode = pango.WRAP_WORD #renderer.props.wrap_width = 600 column = gtk.TreeViewColumn('Value', renderer, text=1, editable=2) @@ -66,35 +66,35 @@ class ReporterDialog(): # connect the signals self.wTree.get_widget("bApply").connect("clicked", self.on_apply_clicked, self.tvReport) #self.wTree.get_widget("bCancel").connect("clicked", self.on_cancel_clicked, self.tvReport) - + self.tvReport.connect_after("size-allocate", self.on_window_resize) - + self.hydrate() - + def on_send_toggled(self, cell, path, model): model[path][3] = not model[path][3] - + def on_comment_focus_cb(self, widget, event): if not self.comment_changed: widget.set_buffer(gtk.TextBuffer()) self.comment_changed = True - + def on_window_resize(self, treeview, allocation): # multine support pass #print allocation - + def column_edited(self, cell, path, new_text, model): # 1 means the second cell model[path][1] = new_text return - + def on_apply_clicked(self, button, treeview): self.dehydrate() - + def on_cancel_clicked(self, button, treeview): pass - + def hydrate(self): for item in self.report: if item == "Comment": @@ -106,8 +106,8 @@ class ReporterDialog(): # item name 0| value 1| editable? 2| toggled? 3| visible?(attachment)4 if self.report[item][EDITABLE] == 'y': self.editable.append(item) - self.row_dict[item] = self.reportListStore.append([item, self.report[item][CONTENT], - item in self.editable, False, + self.row_dict[item] = self.reportListStore.append([item, self.report[item][CONTENT], + item in self.editable, False, self.report[item][TYPE] in ['a','b']]) def dehydrate(self): @@ -134,4 +134,4 @@ class ReporterDialog(): self.report = None self.window.destroy() return self.report - + diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py index f12c1986..03c664c8 100644 --- a/src/Gui/CC_gui_functions.py +++ b/src/Gui/CC_gui_functions.py @@ -52,7 +52,7 @@ def gui_error_message ( message, parent_dialog=None, ret = dialog.run () dialog.destroy() return ret - + def gui_question_dialog ( message, parent_dialog=None, message_type=gtk.MESSAGE_QUESTION, widget=None, page=0, broken_widget=None ): @@ -71,7 +71,7 @@ def gui_question_dialog ( message, parent_dialog=None, ret = dialog.run () dialog.destroy() return ret - + def get_icon_for_package(theme,package): #print package try: diff --git a/src/Gui/PluginList.py b/src/Gui/PluginList.py index b315eb95..591096bd 100644 --- a/src/Gui/PluginList.py +++ b/src/Gui/PluginList.py @@ -7,7 +7,7 @@ class PluginInfoList(list): def __init__(self,dbus_manager=None): self.dm = dbus_manager self.ddict = {} - + def load(self): if self.dm: #print "loading PluginList" @@ -33,7 +33,7 @@ class PluginInfoList(list): return else: print "db == None!" - + __PFList = None __PFList_dbmanager = None diff --git a/src/Gui/PluginSettingsUI.py b/src/Gui/PluginSettingsUI.py index c7c2ca09..dfcda151 100644 --- a/src/Gui/PluginSettingsUI.py +++ b/src/Gui/PluginSettingsUI.py @@ -8,7 +8,7 @@ class PluginSettingsUI(gtk.Dialog): self.Settings = pluginfo.Settings self.pluginfo = pluginfo self.plugin_gui = None - + if pluginfo.getGUI(): self.plugin_gui = gtk.Builder() self.plugin_gui.add_from_file(pluginfo.getGUI()) @@ -21,7 +21,7 @@ class PluginSettingsUI(gtk.Dialog): no_ui_label = gtk.Label("No UI for plugin %s" % pluginfo) self.add(no_ui_label) no_ui_label.show() - + def hydrate(self): if self.plugin_gui: if self.pluginfo.Enabled == "yes": @@ -42,10 +42,10 @@ class PluginSettingsUI(gtk.Dialog): else: #print "Plugin %s is disabled." % self.plugin_name pass - + else: print "Nothing to hydrate!" - + def dehydrate(self): #print "dehydrating %s" % self.pluginfo.getName() if self.Settings: @@ -62,9 +62,9 @@ class PluginSettingsUI(gtk.Dialog): self.Settings[key] = "no" elif type(widget) == gtk.ComboBox: print "combo box is not implemented" - + def destroy(self): self.dialog.destroy() - + def run(self): return self.dialog.run() diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py index 2ad67d78..a16a776b 100644 --- a/src/Gui/SettingsDialog.py +++ b/src/Gui/SettingsDialog.py @@ -30,7 +30,7 @@ class SettingsDialog: # =============================================== columns = [None]*1 columns[0] = gtk.TreeViewColumn('Name') - + # create list for column in columns: n = self.pluginlist.append_column(column) @@ -38,7 +38,7 @@ class SettingsDialog: column.pack_start(column.cell, False) column.set_attributes(column.cell, markup=(n-1)) column.set_resizable(True) - + # toggle toggle_renderer = gtk.CellRendererToggle() toggle_renderer.set_property('activatable', True) @@ -46,7 +46,7 @@ class SettingsDialog: column = gtk.TreeViewColumn('Enabled', toggle_renderer) column.add_attribute( toggle_renderer, "active", 1) self.pluginlist.insert_column(column, 0) - + #connect signals self.pluginlist.connect("cursor-changed", self.on_tvDumps_cursor_changed) self.builder.get_object("bConfigurePlugin").connect("clicked", self.on_bConfigurePlugin_clicked, self.pluginlist) @@ -66,7 +66,7 @@ class SettingsDialog: # FIXME: create class plugin and move this into method Plugin.Enable() plugin.Enabled = "yes" plugin.Settings = PluginSettings(self.ccdaemon.getPluginSettings(plugin.getName())) - model[path][1] = not model[path][1] + model[path][1] = not model[path][1] def filter_plugins(self, model, miter, data): return True @@ -120,7 +120,7 @@ class SettingsDialog: else: print "unknown response from settings dialog" ui.destroy() - + def on_bClose_clicked(self, button): self.window.destroy() diff --git a/src/Gui/exception.py b/src/Gui/exception.py index 739b2c83..8c670115 100644 --- a/src/Gui/exception.py +++ b/src/Gui/exception.py @@ -156,10 +156,10 @@ def __exception_window(title, text, component_name): info.set_line_wrap(True) hbox.pack_start (scw, True) # pylint: disable-msg=E1101 - win.vbox.pack_start (info, False) - win.vbox.pack_start (hbox, True) - win.vbox.set_border_width(12) - win.vbox.set_spacing(12) + win.vbox.pack_start (info, False) + win.vbox.pack_start (hbox, True) + win.vbox.set_border_width(12) + win.vbox.set_spacing(12) win.set_size_request (500, 300) win.set_position (gtk.WIN_POS_CENTER) #contents = win.get_children()[0] @@ -231,7 +231,7 @@ def exitcode(num): # # handleMyException function # -def handleMyException((etype, value, tb), progname, version, +def handleMyException((etype, value, tb), progname, version, gui = 1, debug = 1): """ The exception handling function. @@ -309,7 +309,7 @@ def handleMyException((etype, value, tb), progname, version, while 1: rc = __exception_window (_("%(progname)s - Exception Occurred") \ - % {'progname' : progname}, + % {'progname' : progname}, text, progname) print text @@ -340,7 +340,7 @@ def handleMyException((etype, value, tb), progname, version, out.close() except IOError: - _generic_error_dialog(progname, + _generic_error_dialog(progname, _("Failed to write to file %s.") \ % (tfile), None) else: @@ -365,7 +365,7 @@ def installExceptionHandler(progname, version, gui = 1, debug = 1): debug - show the full traceback (with "Save to file" in GUI) """ sys.excepthook = lambda etype, value, tb: \ - handleMyException((etype, value, tb), + handleMyException((etype, value, tb), progname, version, gui, debug) if __name__ == '__main__': diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in index 2b893e31..33c4291b 100644 --- a/src/Hooks/abrt_exception_handler.py.in +++ b/src/Hooks/abrt_exception_handler.py.in @@ -108,7 +108,7 @@ def write_dump(pid, tb_uuid, tb): import time ttime = int(time.time()) # localstatedir - dir_name = "@DEBUG_DUMP_DIR@/pyhook-%s-%s" % (ttime , pid) + dir_name = "@DEBUG_DUMP_DIR@/pyhook-%s-%s" % (ttime, pid) dd = ABRTUtils.CDebugDump() try: #os.mkdir(dir_name) diff --git a/src/Hooks/sitecustomize.py b/src/Hooks/sitecustomize.py index 5e7b5244..abae27bf 100644 --- a/src/Hooks/sitecustomize.py +++ b/src/Hooks/sitecustomize.py @@ -22,9 +22,9 @@ if conf.has_key("enabled"): if conf["enabled"] == "yes": try: from abrt_exception_handler import * - + installExceptionHandler(debug = 1) except Exception, e: # FIXME don't print anything, write it to some log file print e - pass
\ No newline at end of file + pass |