From 8948b2aa23d5ce0542ce5fffeec6948167a01c91 Mon Sep 17 00:00:00 2001
From: u_quark <el01049@gmail.com>
Date: Thu, 26 Jul 2012 19:14:38 +0300
Subject: [PATCH] Added support for the new DBus library namely dbus-0.10

---
 xmonad.hs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 ("<b>" ++ (UTF8.decodeString str) ++ "</b>")]
+dbusOutput dbus str = do
+    let signal = (D.signal "/org/xmonad/Log" "org.xmonad.Log" "Update") {
+            D.signalBody = [D.toVariant ("<b>" ++ (UTF8.decodeString str) ++ "</b>")]
+        }
+    D.emit dbus signal
 
 pangoColor :: String -> String -> String
 pangoColor fg = wrap left right