ekiga r5934 - in trunk: . src/devices src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Tue Jan 22 07:26:02 2008
New Revision: 5934
URL: http://svn.gnome.org/viewvc/ekiga?rev=5934&view=rev

Log:
Delete files replaced by the engine.
Improved gc handling.



Removed:
   trunk/src/devices/videodisplay.cpp
   trunk/src/devices/videodisplay.h
   trunk/src/devices/videodisplay_dx.cpp
   trunk/src/devices/videodisplay_dx.h
   trunk/src/devices/videodisplay_x.cpp
   trunk/src/devices/videodisplay_x.h
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	Tue Jan 22 07:26:02 2008
@@ -140,7 +140,7 @@
   GtkWidget *status_option_menu;
 
 #ifndef WIN32
-  GC videoWidgetGC;
+  GdkGC* video_widget_gc;
 #endif
 
   unsigned int missed_calls;
@@ -2293,19 +2293,21 @@
 #ifdef WIN32  
   display_info.hwnd = ((HWND)GDK_WINDOW_HWND (mw->main_video_image->window));
 #else 
-  if (!mw->videoWidgetGC) { 
-    GdkGC* gc = gdk_gc_new(mw->main_video_image->window);
-    if ( gc == NULL)
+  if (!mw->video_widget_gc) { 
+    mw->video_widget_gc = gdk_gc_new(mw->main_video_image->window);
+    if ( mw->video_widget_gc == NULL)
       return FALSE;
 
-    mw->videoWidgetGC = GDK_GC_XGC(gc);
-    if (mw->videoWidgetGC == NULL)
-      return FALSE;
   }
-  display_info.gc = mw->videoWidgetGC;
-  display_info.window = GDK_WINDOW_XWINDOW (mw->main_video_image->window); // None
-  if (display_info.window == 0)  //FIXME
+
+  if (GDK_GC_XGC(mw->video_widget_gc) == NULL)
     return FALSE;
+
+  display_info.gc = GDK_GC_XGC(mw->video_widget_gc);
+  display_info.window = GDK_WINDOW_XWINDOW (mw->main_video_image->window);
+  if (display_info.window == 0)  //FIXME: Should be None
+    return FALSE;
+
   display_info.xdisplay = GDK_DISPLAY ();
 #endif
   display_info.widget_info_set = TRUE;
@@ -3637,7 +3639,7 @@
   ep = dynamic_cast<GMManager *> (core.get ("opal-component"));
 
 #ifndef WIN32
-  mw->videoWidgetGC = NULL;
+  mw->video_widget_gc = NULL;
 #endif
 
   /* Tooltips and accelerators */