Clean up calls to Gtk.Window.set_icon_from_file.

QuLogic · QuLogic · commit 68b4ee3f190b · 2021-09-01T15:23:19.000-04:00
According to the docs, this function was added in GTK 2.2, so probably
was only needed when we supported GTK2.

It also no longer exists in GTK4.
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -307,13 +307,7 @@ def __init__(self, canvas, num):
         super().__init__(canvas, num)
 
         self.window.set_wmclass("matplotlib", "Matplotlib")
-        try:
-            self.window.set_icon_from_file(window_icon)
-        except Exception:
-            # Some versions of gtk throw a glib.GError but not all, so I am not
-            # sure how to catch it.  I am unhappy doing a blanket catch here,
-            # but am not sure what a better way is - JDH
-            _log.info('Could not load matplotlib icon: %s', sys.exc_info()[1])
+        self.window.set_icon_from_file(window_icon)
 
         self.vbox = Gtk.Box()
         self.vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
diff --git a/lib/matplotlib/backends/backend_gtk4.py b/lib/matplotlib/backends/backend_gtk4.py
@@ -1,6 +1,5 @@
 import functools
 import io
-import logging
 import os
 from pathlib import Path
 import sys
@@ -39,9 +38,6 @@
 )
 
 
-_log = logging.getLogger(__name__)
-
-
 def _mpl_to_gtk_cursor(mpl_cursor):
     return _api.check_getitem({
         Cursors.MOVE: "move",
@@ -264,14 +260,6 @@ def __init__(self, canvas, num):
         app.add_window(self.window)
         super().__init__(canvas, num)
 
-        try:
-            self.window.set_icon_from_file(window_icon)
-        except Exception:
-            # Some versions of gtk throw a glib.GError but not all, so I am not
-            # sure how to catch it.  I am unhappy doing a blanket catch here,
-            # but am not sure what a better way is - JDH
-            _log.info('Could not load matplotlib icon: %s', sys.exc_info()[1])
-
         self.vbox = Gtk.Box()
         self.vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
         self.window.set_child(self.vbox)
