ekiga r6962 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Sep 14 10:09:00 2008
New Revision: 6962
URL: http://svn.gnome.org/viewvc/ekiga?rev=6962&view=rev

Log:
The Main window is now a GmWindow, use the correct API.


Modified:
   trunk/ChangeLog
   trunk/src/gui/callbacks.cpp
   trunk/src/gui/statusicon.cpp

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Sun Sep 14 10:09:00 2008
@@ -273,7 +273,7 @@
   prefs_window = GnomeMeeting::Process ()->GetPrefsWindow (false);
   accounts_window = GnomeMeeting::Process ()->GetAccountsWindow ();
   
-  gnomemeeting_window_hide (main_window);
+  gtk_widget_hide (main_window);
   if (assistant_window)
     gnomemeeting_window_hide (assistant_window);
   if (prefs_window)

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Sun Sep 14 10:09:00 2008
@@ -269,13 +269,17 @@
     window = GnomeMeeting::Process ()->GetMainWindow (); //FIXME
 
     // FIXME when the main window becomes a gobject
-    if (!gnomemeeting_window_is_visible (window))
-      gnomemeeting_window_show (window);
-    else
+    if (!(GTK_WIDGET_VISIBLE (window) 
+          && !(gdk_window_get_state (GDK_WINDOW (window->window)) & GDK_WINDOW_STATE_ICONIFIED))) {
+      gtk_widget_show (window);
+    }
+    else {
+
       if (gtk_window_has_toplevel_focus (GTK_WINDOW (window)))
-	gnomemeeting_window_hide (window);
+        gtk_widget_hide (window);
       else
-	gtk_window_present (GTK_WINDOW (window));
+        gtk_window_present (GTK_WINDOW (window));
+    }
   }
   else {