ekiga r7212 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Oct 12 17:43:32 2008
New Revision: 7212
URL: http://svn.gnome.org/viewvc/ekiga?rev=7212&view=rev

Log:
Fixed previous commit.


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	Sun Oct 12 17:43:32 2008
@@ -961,6 +961,8 @@
   tmp_msg = g_strdup (_("No video will be displayed during this call."));
   switch (error_code) {
 
+    case Ekiga::VO_ERROR_NONE:
+      break;
     case Ekiga::VO_ERROR:
     default:
 #ifdef WIN32  
@@ -3889,8 +3891,8 @@
   conn = videooutput_core->device_closed.connect (sigc::bind (sigc::ptr_fun (on_videooutput_device_closed_cb), (gpointer) mw));
   mw->priv->connections.push_back (conn);
 
-  conn = videooutput_core->device_error.connect (sigc::bind (sigc::ptr_fun (on_videooutput_device_error_cb), (gpointer) window));
-  mw->connections.push_back (conn);
+  conn = videooutput_core->device_error.connect (sigc::bind (sigc::ptr_fun (on_videooutput_device_error_cb), (gpointer) mw));
+  mw->priv->connections.push_back (conn);
 
   conn = videooutput_core->size_changed.connect (sigc::bind (sigc::ptr_fun (on_size_changed_cb), (gpointer) mw));
   mw->priv->connections.push_back (conn);