ekiga r6328 - in trunk: . src/endpoints src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Mon May 26 20:32:53 2008
New Revision: 6328
URL: http://svn.gnome.org/viewvc/ekiga?rev=6328&view=rev

Log:
Removed gnomemeeting_threads_enter and gnomemeeting_threads_leave.
They were introduced to fix thread-safety problems on 2001-11-23.
Toute une Ãpoque les amis, toute une Ãpoque...


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/h323.cpp
   trunk/src/gui/misc.cpp
   trunk/src/gui/misc.h

Modified: trunk/src/endpoints/h323.cpp
==============================================================================
--- trunk/src/endpoints/h323.cpp	(original)
+++ trunk/src/endpoints/h323.cpp	Mon May 26 20:32:53 2008
@@ -136,9 +136,7 @@
 {
   int mode = 0;
 
-  gnomemeeting_threads_enter ();
   mode = gm_conf_get_int (H323_KEY "dtmf_mode");
-  gnomemeeting_threads_leave ();
 
   switch (mode) 
     {

Modified: trunk/src/gui/misc.cpp
==============================================================================
--- trunk/src/gui/misc.cpp	(original)
+++ trunk/src/gui/misc.cpp	Mon May 26 20:32:53 2008
@@ -55,28 +55,6 @@
 
 
 /* The functions */
-
-
-void 
-gnomemeeting_threads_enter () 
-{
-  if ((PThread::Current () != NULL) 
-      && (PThread::Current ()->GetThreadName () != PACKAGE_NAME && PThread::Current ()->GetThreadName () != "")) {    
-    gdk_threads_enter ();
-  }
-}
-
-
-void 
-gnomemeeting_threads_leave () 
-{
-  if ((PThread::Current () != NULL) 
-      && (PThread::Current ()->GetThreadName () != PACKAGE_NAME && PThread::Current ()->GetThreadName () != "")) {    
-    gdk_threads_leave ();
-  }
-}
-
-
 GtkWidget *
 gnomemeeting_button_new (const char *lbl, 
 			 GtkWidget *pixmap)

Modified: trunk/src/gui/misc.h
==============================================================================
--- trunk/src/gui/misc.h	(original)
+++ trunk/src/gui/misc.h	Mon May 26 20:32:53 2008
@@ -43,26 +43,6 @@
 #include "common.h"
 
 
-/* DESCRIPTION  :  /
- * BEHAVIOR     :  Takes the GDK lock if we are not in the main thread.
- * PRE          :  Must not be called instead of gdk_threads_enter in timers
- *                 or idle functions, because they are executed in the main
- *                 thread.
- */
-void 
-gnomemeeting_threads_enter ();
-
-
-/* DESCRIPTION  :  /
- * BEHAVIOR     :  Releases the GDK lock if we are not in the main thread.
- * PRE          :  Must not be called instead of gdk_threads_leave in timers
- *                 or idle functions, because they are executed in the main
- *                 thread.
- */
-void 
-gnomemeeting_threads_leave ();
-
-
 /* DESCRIPTION  :  / 
  * BEHAVIOR     :  Creates a button with the GtkWidget * as pixmap 
  *                 and the label as label.