Add a window icon

3 files changed, 14 insertions, 0 deletions

diff --git a/Bustle.hs b/Bustle.hs
index 87e1010..6abe7d7 100644
--- a/Bustle.hs
+++ b/Bustle.hs
@@ -18,6 +18,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 -}
 module Main where
 
+import Prelude hiding (catch)
+import Control.Exception (catch)
+
+import Paths_bustle
 import Bustle.Parser
 import Bustle.Renderer
 
@@ -41,6 +45,14 @@ run filename act = do
   window <- windowNew
   windowSetTitle window $ filename ++ " - D-Bus Activity Visualizer"
 
+  iconName <- getDataFileName "bustle.png"
+  let load x = pixbufNewFromFile x >>= windowSetIcon window
+  foldl1 (\m n -> m `catch` const n)
+    [ load iconName
+    , load "bustle.png"
+    , putStrLn "Couldn't find window icon. Oh well."
+    ]
+
   layout <- layoutNew Nothing Nothing
   layout `onExpose` updateLayout layout act
   scrolledWindow <- scrolledWindowNew Nothing Nothing
diff --git a/bustle.cabal b/bustle.cabal
index c1261b9..1477ac6 100644
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -7,6 +7,8 @@ License-file:   LICENSE
 Author:         Will Thompson <will.thompson@collabora.co.uk>
 Maintainer:     Will Thompson <will.thompson@collabora.co.uk>
 Build-Depends:  mtl, cairo, gtk, base, containers, parsec
+Data-files:     bustle.png
+Build-type:     Simple
 
 Executable:     bustle
 Main-is:        Bustle.hs
diff --git a/bustle.png b/bustle.png
new file mode 100644
index 0000000..779cefa
--- /dev/null
+++ b/bustle.png