diff --git a/xmonad.hs b/xmonad.hs index 910c577..b9fa0a0 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -1,10 +1,11 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings, PackageImports #-} import XMonad import XMonad.Config.Gnome import XMonad.Hooks.DynamicLog -import qualified DBus.Client.Simple as D +import qualified "dbus" DBus as D +import qualified "dbus" DBus.Client as D import qualified Codec.Binary.UTF8.String as UTF8 main :: IO () @@ -30,15 +31,15 @@ prettyPrinter dbus = defaultPP getWellKnownName :: D.Client -> IO () getWellKnownName dbus = do D.requestName dbus (D.busName_ "org.xmonad.Log") - [D.AllowReplacement, D.ReplaceExisting, D.DoNotQueue] + [D.nameAllowReplacement, D.nameReplaceExisting, D.nameDoNotQueue] return () dbusOutput :: D.Client -> String -> IO () -dbusOutput dbus str = D.emit dbus - "/org/xmonad/Log" - "org.xmonad.Log" - "Update" - [D.toVariant ("" ++ (UTF8.decodeString str) ++ "")] +dbusOutput dbus str = do + let signal = (D.signal "/org/xmonad/Log" "org.xmonad.Log" "Update") { + D.signalBody = [D.toVariant ("" ++ (UTF8.decodeString str) ++ "")] + } + D.emit dbus signal pangoColor :: String -> String -> String pangoColor fg = wrap left right