[ekiga] Cleanup and fix warning

[Eugen Dedu <ededu src gnome org>]

commit 60564a122bda437e21cf840d929a9b809c793aed
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Jun 2 19:05:22 2010 +0200

    Cleanup and fix warning

 src/gui/main_window.cpp |    2 +-
 src/gui/statusicon.cpp  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 04faf4f..0c9db75 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -4491,7 +4491,6 @@ main (int argc,
    * is a fatal error.
    */
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
-  EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (main_window); //TODO no priv here
   boost::shared_ptr<Ekiga::CallCore> call_core = service_core->get<Ekiga::CallCore> ("call-core");
   if (error == -1) {
 
@@ -4567,6 +4566,7 @@ main (int argc,
 
 #ifdef HAVE_DBUS
   /* Create the dbus server instance */
+  EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (main_window);
   EkigaDBusComponent *dbus_component = ekiga_dbus_component_new (mw->priv->core);
 #endif
 
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index 5b605fd..7e01409 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -271,8 +271,8 @@ statusicon_activated_cb (G_GNUC_UNUSED GtkStatusIcon *icon,
     window = GnomeMeeting::Process ()->GetMainWindow (); //FIXME
 
     // FIXME when the main window becomes a gobject
-    if (!(gtk_widget_get_visible (window)
-          && !(gdk_window_get_state (GDK_WINDOW (window->window)) & GDK_WINDOW_STATE_ICONIFIED))) {
+    if (!gtk_widget_get_visible (window)
+        || (gdk_window_get_state (GDK_WINDOW (window->window)) & GDK_WINDOW_STATE_ICONIFIED)) {
       gtk_widget_show (window);
     }
     else {