summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-09-25 13:40:36 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-09-25 13:40:36 -0700
commit8fe518ce740ae728f658c1854a7ffa074e800e9d (patch)
tree45284ef98e1a9fa8bf2490698447b89384e5b157
parente8523c60b12b5de15bb1ac42ecdadf5e5e52206d (diff)
parentbe8f0c0cadca9ffa92a982e27d7e9a88753b6fac (diff)
Merge branch 'master' into next
-rw-r--r--grc/gui/MainWindow.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py
index 54141af547..9a2823a7ab 100644
--- a/grc/gui/MainWindow.py
+++ b/grc/gui/MainWindow.py
@@ -91,8 +91,11 @@ class MainWindow(gtk.Window):
vbox = gtk.VBox()
self.add(vbox)
- # Set window icon
- self.set_icon_from_file(os.path.dirname(os.path.abspath(__file__)) + "/icon.png")
+ icon_theme = gtk.icon_theme_get_default()
+ icon = icon_theme.lookup_icon("gnuradio-grc", 48, 0)
+ if not icon:
+ # Set window icon
+ self.set_icon_from_file(os.path.dirname(os.path.abspath(__file__)) + "/icon.png")
# Create the menu bar and toolbar
self.add_accel_group(Actions.get_accel_group())