aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rwxr-xr-xfetchmailconf12
2 files changed, 9 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index fec0f8a4..93000a3f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@
fetchmail-4.5.1 ():
* Checkalias option from Enrico Musio <enrico.musio@spaziozerouno.it>.
* Discard Unix From_ lines in headers (copes with Debian bug report #23808.
+* Tell fetchmailconf not to care if the attempt to create an icon window fails.
fetchmail-4.5.0bis (Sat Jun 20 10:55:52 EDT 1998):
diff --git a/fetchmailconf b/fetchmailconf
index b22a91d7..ac41880d 100755
--- a/fetchmailconf
+++ b/fetchmailconf
@@ -1373,10 +1373,14 @@ if __name__ == '__main__':
# OK, now run the configuration edit
root = MainWindow(rcfile)
- icon_image = PhotoImage(data=fetchmail_gif)
- icon_window = Toplevel()
- Label(icon_window, image=icon_image, bg='black').pack()
- root.master.iconwindow(icon_window)
+ try:
+ # Some older pythons will error out on this
+ icon_image = PhotoImage(data=fetchmail_gif)
+ icon_window = Toplevel()
+ Label(icon_window, image=icon_image, bg='black').pack()
+ root.master.iconwindow(icon_window)
+ except:
+ pass
root.mainloop()
# The following sets edit modes for GNU EMACS