From 33cd402ae968587d256e11004dac9ed52d1c3cc5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 10 Oct 2011 23:22:59 +0200
Subject: Use XCB backend

---
 src/Phi.hs           | 4 ++--
 src/SystrayHelper.hs | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Phi.hs b/src/Phi.hs
index 5cab565..e20ef97 100644
--- a/src/Phi.hs
+++ b/src/Phi.hs
@@ -48,9 +48,9 @@ main = do
       
       --theSystray = systray
       
-      theClock = clock defaultClockConfig { clockFormat = "<span font='Sans 8'>%R</span>\n<span font='Sans 6'>%A %d %B</span>"
+      theClock = clock defaultClockConfig { clockFormat = "<span font='Sans 8'>%R</span>\n<span font='Sans 6'>%a, %b %d</span>"
                                           , lineSpacing = (-3)
-                                          , clockSize = 75
+                                          , clockSize = 60
                                           }
       brightBorder :: (Widget w s c d) => w -> Border w s c d
       brightBorder = border normalDesktopBorder
diff --git a/src/SystrayHelper.hs b/src/SystrayHelper.hs
index fb9adcf..02d97df 100644
--- a/src/SystrayHelper.hs
+++ b/src/SystrayHelper.hs
@@ -3,9 +3,8 @@ import Control.Monad
 import Data.Maybe
 
 import Graphics.XHB
-import Graphics.XHB.Connection
+import Graphics.XHB.Connection.XCB
 import Graphics.XHB.Gen.Xproto
-import qualified Graphics.XHB.Connection.Open as CO
 
 import System.Exit
 
@@ -31,8 +30,7 @@ main = do
   conn <- liftM fromJust connect
   atoms <- initAtoms conn
   
-  let dispname = displayInfo conn
-      screen = (roots_Setup . connectionSetup $ conn) !! CO.screen dispname
+  let screen = (roots_Setup . connectionSetup $ conn) !! connectionScreen conn
   
   xembedWindow <- initSystray conn atoms screen
   
-- 
cgit v1.2.3