ekiga r7340 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Thu Nov 13 22:21:31 2008
New Revision: 7340
URL: http://svn.gnome.org/viewvc/ekiga?rev=7340&view=rev

Log:
Fixed a few warnings. Allow answering/rejecting calls from the main
window when the notification area is used.


Modified:
   trunk/ChangeLog
   trunk/src/gui/main.cpp

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Nov 13 22:21:31 2008
@@ -551,6 +551,7 @@
 #else
     ekiga_main_window_incoming_call_dialog_show (mw, call);
 #endif
+    mw->current_call = &call;
   }
   else {
     ekiga_main_window_update_calling_state (mw, Calling);
@@ -955,8 +956,8 @@
 
 void 
 on_videooutput_device_error_cb (Ekiga::VideoOutputManager & /* manager */, 
-                                Ekiga::VideoOutputErrorCodes error_code, 
-                                gpointer self)
+                                Ekiga::VideoOutputErrorCodes /* error_code */, 
+                                gpointer /*self*/)
 {
   gchar *dialog_title = NULL;
   gchar *dialog_msg = NULL;
@@ -1468,6 +1469,8 @@
       ekiga_main_window_update_calling_state (mw, Standby);
     }
   }
+  else if (mw->calling_state == Called && mw->current_call)
+    mw->current_call->answer ();
 }
 
 
@@ -1489,10 +1492,14 @@
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (data);
   GmConnectButton *button = GM_CONNECT_BUTTON (mw->priv->connect_button);
 
-  if (mw->priv->current_call && gm_connect_button_get_connected (button))
+  if (gm_connect_button_get_connected (GM_CONNECT_BUTTON (mw->connect_button)))
     hangup_call_cb (widget, data);
-  else if (!mw->priv->current_call && !gm_connect_button_get_connected (button))
-    place_call_cb (widget, data);
+  else if (!gm_connect_button_get_connected (GM_CONNECT_BUTTON (mw->connect_button))) {
+    if (!mw->current_call)
+      place_call_cb (widget, data);
+    else
+      mw->current_call->answer ();
+  }
 }
 
 
@@ -2411,7 +2418,7 @@
 
       /* Update the connect button */
       gm_connect_button_set_connected (GM_CONNECT_BUTTON (mw->priv->connect_button),
-				       FALSE);
+ 				       TRUE);
       
       break;
 
@@ -2710,6 +2717,7 @@
 {
   EkigaMainWindow *mw;
 
+  std::cout << main_window << std::endl << std::flush;
   g_return_if_fail (main_window != NULL);
 
   mw = EKIGA_MAIN_WINDOW (main_window);