[ekiga] common-videooutput: first check new stream, size change later

[Eugen Dedu <ededu src gnome org>]

commit a000662f6e1d34383c08d76ab2fbe7774a1f728f
Author: VÃctor Manuel JÃquez Leal <vjaquez igalia com>
Date:   Thu Sep 27 12:15:49 2012 +0200

    common-videooutput: first check new stream, size change later
    
    In GMVideoOutputManager::redraw (), it is more important to know if
    there is a new stream in the connection, so that we allocate the
    required resources to process it.  Afterwards, we could process the
    frame size changes.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687775

 .../videooutput-manager-common.cpp                 |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
index ca6c7e8..c8eaf39 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
@@ -370,12 +370,11 @@ GMVideoOutputManager::redraw ()
   UpdateRequired sync_required;
   sync_required = update_required;
 
-    if (frame_display_change_needed ())
-      setup_frame_display ();
-     else
-      if (last_frame.both_streams_active != current_frame.both_streams_active ||
-          last_frame.ext_stream_active != current_frame.ext_stream_active)
-        update_gui_device();
+  if (last_frame.both_streams_active != current_frame.both_streams_active ||
+      last_frame.ext_stream_active != current_frame.ext_stream_active)
+    update_gui_device ();
+  else if (frame_display_change_needed ())
+    setup_frame_display ();
 
     switch (current_frame.mode) {
     case Ekiga::VO_MODE_LOCAL: