ekiga r7096 - in branches/gnome-2-24: . lib/engine/audioinput/skel lib/engine/audiooutput/skel lib/engine/videoinput/skel

[mschneid svn gnome org]

Author: mschneid
Date: Thu Sep 25 17:22:52 2008
New Revision: 7096
URL: http://svn.gnome.org/viewvc/ekiga?rev=7096&view=rev

Log:
Fix message box when device was unplugged in out-of-call state (#552262)


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/NEWS
   branches/gnome-2-24/lib/engine/audioinput/skel/audioinput-core.cpp
   branches/gnome-2-24/lib/engine/audiooutput/skel/audiooutput-core.cpp
   branches/gnome-2-24/lib/engine/videoinput/skel/videoinput-core.cpp

Modified: branches/gnome-2-24/NEWS
==============================================================================
--- branches/gnome-2-24/NEWS	(original)
+++ branches/gnome-2-24/NEWS	Thu Sep 25 17:22:52 2008
@@ -1,4 +1,5 @@
 Changes since Ekiga 3.00
+- Fix message box when device was unplugged in out-of-call state (#552262)
 - Fix handling when closing addressbook- and chat-window using the window frame (Jan Schampera)
 - Various string fixes, typo fixes, translator helps (Jan Schampera)
 

Modified: branches/gnome-2-24/lib/engine/audioinput/skel/audioinput-core.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/audioinput/skel/audioinput-core.cpp	(original)
+++ branches/gnome-2-24/lib/engine/audioinput/skel/audioinput-core.cpp	Thu Sep 25 17:22:52 2008
@@ -250,7 +250,7 @@
        iter++) {
      if ((*iter)->has_device (source, device_name, device)) {
 
-       if ( current_device == device) {
+       if ( ( current_device == device) && (preview_config.active || stream_config.active) ) {
 
             AudioInputDevice new_device;
             new_device.type = AUDIO_INPUT_FALLBACK_DEVICE_TYPE;

Modified: branches/gnome-2-24/lib/engine/audiooutput/skel/audiooutput-core.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/audiooutput/skel/audiooutput-core.cpp	(original)
+++ branches/gnome-2-24/lib/engine/audiooutput/skel/audiooutput-core.cpp	Thu Sep 25 17:22:52 2008
@@ -225,7 +225,7 @@
        iter != managers.end ();
        iter++) {
      if ((*iter)->has_device (sink, device_name, device)) {
-       if (device == current_device[primary]) {
+       if ( (device == current_device[primary]) && (current_primary_config.active) ) {
 
          AudioOutputDevice new_device;
          new_device.type   = AUDIO_OUTPUT_FALLBACK_DEVICE_TYPE;

Modified: branches/gnome-2-24/lib/engine/videoinput/skel/videoinput-core.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/videoinput/skel/videoinput-core.cpp	(original)
+++ branches/gnome-2-24/lib/engine/videoinput/skel/videoinput-core.cpp	Thu Sep 25 17:22:52 2008
@@ -242,7 +242,7 @@
        iter != managers.end ();
        iter++) {
      if ((*iter)->has_device (source, device_name, capabilities, device)) {
-       if ( current_device == device ) {
+       if ( (current_device == device) && (preview_config.active || stream_config.active) ) {
 
             VideoInputDevice new_device;
             new_device.type   = VIDEO_INPUT_FALLBACK_DEVICE_TYPE;