From 71d3637ffe75f9dd910d418e9b9d5242ec9ac423 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Thu, 19 Feb 2009 14:52:09 +0100
Subject: Moved dbus backend from lib to applet - better OO model.

---
 src/Applet/Applet.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/Applet/Applet.cpp')

diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp
index b33cc9f..8984e0e 100644
--- a/src/Applet/Applet.cpp
+++ b/src/Applet/Applet.cpp
@@ -18,7 +18,6 @@
     */
     
 #include "CCApplet.h"
-#include "DBusClient.h"
 #include <iostream>
 
 //@@global applet object
@@ -43,7 +42,6 @@ int main(int argc, char **argv)
     gdk_threads_init();
     gdk_threads_enter();
     gtk_init(&argc,&argv);
-    applet = new CApplet();
     /* move to the DBusClient::connect */
     DBus::Glib::BusDispatcher dispatcher;
     /* this should bind the dispatcher with mainloop */
@@ -51,8 +49,9 @@ int main(int argc, char **argv)
     DBus::default_dispatcher = &dispatcher;
 
 	DBus::Connection conn = DBus::Connection::SystemBus();
-    CDBusClient client(conn, CC_DBUS_PATH, CC_DBUS_NAME);
-    client.ConnectCrashHandler(crash_notify_cb);
+    //CDBusClient client(conn, CC_DBUS_PATH, CC_DBUS_NAME);
+    applet = new CApplet(conn, CC_DBUS_PATH, CC_DBUS_NAME);
+    applet->ConnectCrashHandler(crash_notify_cb);
     gtk_main();
     gdk_threads_leave();
     return 0;
-- 
cgit