[ekiga] DBUS: Completed DBUS resurrection.

[Damien Sandras <dsandras src gnome org>]

commit 3993e17fbc18bfcc370edaab7dbf3e0372f5af7c
Author: Damien Sandras <dsandras beip be>
Date:   Sun Apr 22 12:22:32 2012 +0200

    DBUS: Completed DBUS resurrection.
    
    It is very useful if we "hide" Ekiga ala GNOME 3 (like Empathy) and want
    to display it back by launching the application again.
    
    We had forgotten about this.
    
    Additional fixes included.

 src/ekiga.cpp           |   18 +++++-------------
 src/ekiga.h             |    5 -----
 src/gui/main_window.cpp |    8 ++++----
 3 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index b8dc6a5..68468c4 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -47,10 +47,6 @@
 #include "notify.h"
 #include "gmstockicons.h"
 
-#ifdef HAVE_DBUS
-#include "dbus.h"
-#endif
-
 #define new PNEW
 
 
@@ -65,9 +61,11 @@ GnomeMeeting::GnomeMeeting ()
 
   assistant_window = NULL;
   prefs_window = NULL;
-#ifdef HAVE_DBUS
-  dbus_component = NULL;
-#endif
+  main_window = NULL;
+  call_window = NULL;
+  assistant_window = NULL;
+  accounts_window = NULL;
+  statusicon = NULL;
 }
 
 
@@ -105,12 +103,6 @@ GnomeMeeting::Exit ()
   if (statusicon)
     g_object_unref (statusicon);
   statusicon = NULL;
-
-#ifdef HAVE_DBUS
-  if (dbus_component)
-    g_object_unref (dbus_component);
-  dbus_component = NULL;
-#endif
 }
 
 
diff --git a/src/ekiga.h b/src/ekiga.h
index 5a3d7a8..2d2cab4 100644
--- a/src/ekiga.h
+++ b/src/ekiga.h
@@ -156,11 +156,6 @@ class GnomeMeeting : public PProcess
   GtkWidget *accounts_window;
   StatusIcon *statusicon;
 
-  /* other things */
-#ifdef HAVE_DBUS
-  GObject *dbus_component;
-#endif
-
   static GnomeMeeting *GM;
 };
 
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 974ec64..4d6b50b 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -2358,10 +2358,6 @@ main (int argc,
 #endif
   PTRACE(1, "Debug level: " << debug_level);
 
-  /* Ekiga initialisation */
-  // should come *after* ptrace initialisation, to track codec loading for ex.
-  GnomeMeeting instance;
-
 #ifdef HAVE_DBUS
   if (!ekiga_dbus_claim_ownership ()) {
     ekiga_dbus_client_show ();
@@ -2371,6 +2367,10 @@ main (int argc,
   }
 #endif
 
+  /* Ekiga initialisation */
+  // should come *after* ptrace initialisation, to track codec loading for ex.
+  GnomeMeeting instance;
+
   Ekiga::Runtime::init ();
   engine_init (service_core, argc, argv);