@@ -905,9 +905,7 @@ def runDialog(self, parent):
905905 f .write (s )
906906 f .close ()
907907 except IOError :
908- m = utils .MessageDialog (parent , Gtk .MessageType .ERROR , _ ('Error writing %s.' ) % (self .path , ))
909- m .run ()
910- m .destroy ()
908+ utils .logErrorAndDialog (_ ('Error writing %s.' ) % (self .path , ), parent )
911909 dialog .destroy ()
912910 return accept
913911
@@ -6950,9 +6948,7 @@ def load(self, f, info):
69506948 msg = _ ('Error reading revision %(rev)s of %(file)s.' ) % { 'rev' : rev , 'file' : name }
69516949 else :
69526950 msg = _ ('Error reading %s.' ) % (name , )
6953- dialog = utils .MessageDialog (self .get_toplevel (), Gtk .MessageType .ERROR , msg )
6954- dialog .run ()
6955- dialog .destroy ()
6951+ utils .logErrorAndDialog (msg , self .get_toplevel ())
69566952 return
69576953 # update the panes contents, last modified time, and title
69586954 self .replaceContents (f , ss )
@@ -7114,13 +7110,9 @@ def save_file(self, f, save_as=False):
71147110 self .setSyntax (syntax )
71157111 return True
71167112 except (UnicodeEncodeError , LookupError ):
7117- dialog = utils .MessageDialog (self .get_toplevel (), Gtk .MessageType .ERROR , _ ('Error encoding to %s.' ) % (encoding , ))
7118- dialog .run ()
7119- dialog .destroy ()
7113+ utils .logErrorAndDialog (_ ('Error encoding to %s.' ) % (encoding , ), self .get_toplevel ())
71207114 except IOError :
7121- dialog = utils .MessageDialog (self .get_toplevel (), Gtk .MessageType .ERROR , _ ('Error writing %s.' ) % (name , ))
7122- dialog .run ()
7123- dialog .destroy ()
7115+ utils .logErrorAndDialog (_ ('Error writing %s.' ) % (name , ), self .get_toplevel ())
71247116 return False
71257117
71267118 # callback for save file menu item
@@ -7782,9 +7774,7 @@ def createCommitFileTabs(self, items, labels, options):
77827774 viewer .load (i , FileInfo (name , encoding , vcs , rev ))
77837775 viewer .setOptions (options )
77847776 except (IOError , OSError , WindowsError ):
7785- dialog = utils .MessageDialog (self .get_toplevel (), Gtk .MessageType .ERROR , _ ('Error retrieving commits for %s.' ) % (dn , ))
7786- dialog .run ()
7787- dialog .destroy ()
7777+ utils .logErrorAndDialog (_ ('Error retrieving commits for %s.' ) % (dn , ), self .get_toplevel ())
77887778
77897779 # create a new viewer for each modified file found in 'items'
77907780 def createModifiedFileTabs (self , items , labels , options ):
@@ -7813,9 +7803,7 @@ def createModifiedFileTabs(self, items, labels, options):
78137803 viewer .load (i , FileInfo (name , encoding , vcs , rev ))
78147804 viewer .setOptions (options )
78157805 except (IOError , OSError , WindowsError ):
7816- dialog = utils .MessageDialog (self .get_toplevel (), Gtk .MessageType .ERROR , _ ('Error retrieving modifications for %s.' ) % (dn , ))
7817- dialog .run ()
7818- dialog .destroy ()
7806+ utils .logErrorAndDialog (_ ('Error retrieving modifications for %s.' ) % (dn , ), self .get_toplevel ())
78197807
78207808 # close all tabs without differences
78217809 def closeOnSame (self ):
@@ -7874,9 +7862,7 @@ def open_modified_files_cb(self, widget, data):
78747862 self .notebook .set_current_page (n )
78757863 self .getCurrentViewer ().grab_focus ()
78767864 else :
7877- m = utils .MessageDialog (parent , Gtk .MessageType .ERROR , _ ('No modified files found.' ))
7878- m .run ()
7879- m .destroy ()
7865+ utils .logErrorAndDialog (_ ('No modified files found.' ), parent )
78807866
78817867 # callback for the open commit menu item
78827868 def open_commit_cb (self , widget , data ):
@@ -7894,9 +7880,7 @@ def open_commit_cb(self, widget, data):
78947880 self .notebook .set_current_page (n )
78957881 self .getCurrentViewer ().grab_focus ()
78967882 else :
7897- m = utils .MessageDialog (parent , Gtk .MessageType .ERROR , _ ('No committed files found.' ))
7898- m .run ()
7899- m .destroy ()
7883+ utils .logErrorAndDialog (_ ('No committed files found.' ), parent )
79007884
79017885 # callback for the reload file menu item
79027886 def reload_file_cb (self , widget , data ):
0 commit comments