ekiga r6329 - in trunk: . src/gui

[dsandras svn gnome org]

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

Log:
First run of Ekiga without g_threads_init, gdk_threads_init,
gdk_threads_enter, gdk_threads_leave and friends...
Now, timeouts, idle and gconf notifer do not need to be protected
anymore.


Modified:
   trunk/ChangeLog
   trunk/src/gui/accounts.cpp
   trunk/src/gui/assistant.cpp
   trunk/src/gui/callbacks.cpp
   trunk/src/gui/conf.cpp
   trunk/src/gui/main.cpp
   trunk/src/gui/misc.cpp

Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp	(original)
+++ trunk/src/gui/accounts.cpp	Mon May 26 20:43:30 2008
@@ -895,9 +895,9 @@
   gnomemeeting_account_toggle_active (account);
 
   /* Update the account */
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
   dynamic_cast<GMManager *>(aw->core.get ("opal-component"))->Register (account);
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
 
   gm_account_delete (account);
 }

Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp	(original)
+++ trunk/src/gui/assistant.cpp	Mon May 26 20:43:30 2008
@@ -506,12 +506,12 @@
   }
 
   /* Register the current Endpoint to GnomeMeeting.NET */
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
   if (account->enabled) {
     manager = dynamic_cast<GMManager *> (assistant->priv->core->get ("opal-component"));
     manager->Register (account);
   }
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
 
   gm_account_delete (account);
 }

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Mon May 26 20:43:30 2008
@@ -267,11 +267,11 @@
   GtkWidget *prefs_window = NULL;
   GtkWidget *accounts_window = NULL;
 
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
   Ekiga::ServiceCore *core = GnomeMeeting::Process ()->GetServiceCore ();
   GMManager *manager = dynamic_cast<GMManager*> (core->get("opal-component"));
   manager->ClearAllCalls ();
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
   
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
   assistant_window = GnomeMeeting::Process ()->GetAssistantWindow (false);

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Mon May 26 20:43:30 2008
@@ -103,9 +103,9 @@
 
   if (gm_conf_entry_get_type (entry) == GM_CONF_LIST) {
 
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
     gm_accounts_window_update_accounts_list (accounts_window);
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
   }
 
 }
@@ -122,9 +122,9 @@
 		    G_GNUC_UNUSED gpointer data)
 {
   if (gm_conf_entry_get_type (entry) == GM_CONF_STRING) {
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
 //     GnomeMeeting::Process ()->DetectDevices (); //FIXME
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
   }
 }
 
@@ -146,9 +146,9 @@
    
     prefs_window = GnomeMeeting::Process ()->GetPrefsWindow (false);
     if (prefs_window) {
-      gdk_threads_enter ();
+      //gdk_threads_enter ();
       gm_prefs_window_sound_events_list_build (prefs_window);
-      gdk_threads_leave ();
+      //gdk_threads_leave ();
     }
   }
 }
@@ -170,13 +170,13 @@
 
   if (gm_conf_entry_get_type (entry) == GM_CONF_BOOL) {
 
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
 
     val = gm_conf_entry_get_bool (entry);
 
     gm_main_window_set_stay_on_top (GTK_WIDGET (data), val);
 
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
   }
 }
 
@@ -192,9 +192,9 @@
                              GmConfEntry *, 
                              gpointer)
 {
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
   gm_conf_set_int (GENERAL_KEY "kind_of_net", NET_CUSTOM);
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 }
 
 

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Mon May 26 20:43:30 2008
@@ -669,11 +669,11 @@
                            mw->current_call->get_received_video_bandwidth (),
                            videooutput_stats.tx_fps,
                            videooutput_stats.rx_fps);
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
     gm_main_window_push_info_message (GTK_WIDGET (self), msg);
     if (mw->current_call)
       gm_main_window_set_call_duration (GTK_WIDGET (self), mw->current_call->get_duration ().c_str ());
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
 
     g_free (msg);
   }
@@ -2268,12 +2268,12 @@
   statusicon = GTK_STATUS_ICON (GnomeMeeting::Process ()->GetStatusicon ());
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
   
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
 
   if (!gtk_status_icon_is_embedded (GTK_STATUS_ICON (statusicon))) 
     gtk_widget_show (main_window);
   
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 
   return FALSE;
 }
@@ -2290,11 +2290,11 @@
   
   if (gm_conf_entry_get_type (entry) == GM_CONF_INT) {
 
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
     section = gm_conf_entry_get_int (entry);
     gm_main_window_set_panel_section (GTK_WIDGET (data), 
                                       section);
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
   }
 }
 
@@ -2308,13 +2308,13 @@
 
   if (gm_conf_entry_get_type (entry) == GM_CONF_BOOL) {
 
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
     if (gm_conf_entry_get_bool (entry)) 
       gm_main_window_show_call_panel (GTK_WIDGET (data));
     else 
       gm_main_window_hide_call_panel (GTK_WIDGET (data));
 
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
   }
 }
 
@@ -2330,10 +2330,10 @@
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
   mw = gm_mw_get_mw (main_window);
 
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
   gtk_notebook_set_current_page (GTK_NOTEBOOK (mw->main_notebook), 
                                  GPOINTER_TO_INT (data));
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 
   return FALSE;
 }
@@ -2349,11 +2349,11 @@
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
   mw = gm_mw_get_mw (main_window);
 
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
   gtk_tooltips_set_tip (mw->tips, mw->statusbar_ebox,
                         (gchar *) data, NULL);
   g_free ((gchar *) data);
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 
   return FALSE;
 
@@ -2379,10 +2379,10 @@
   gdk_window_get_pointer (GDK_WINDOW (GTK_WIDGET (main_window)->window), 
                           &x, &y, &mask);
 
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
   timeout = gm_conf_get_int (PERSONAL_DATA_KEY "auto_away_timeout");
   status = gm_conf_get_string (PERSONAL_DATA_KEY "short_status");
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 
   if (x != idle->x && y != idle->y) {
     
@@ -2409,10 +2409,10 @@
 
     idle->idle = TRUE;
 
-    gdk_threads_enter ();
+    //gdk_threads_enter ();
     idle->last_status = g_strdup (status);
     gm_conf_set_string (PERSONAL_DATA_KEY "short_status", "away");
-    gdk_threads_leave ();
+    //gdk_threads_leave ();
   }
   g_free (status);
 
@@ -4309,8 +4309,8 @@
   
   /* GTK+ initialization */
   g_type_init ();
-  g_thread_init (NULL);
-  gdk_threads_init ();
+//  g_thread_init (NULL);
+//  gdk_threads_init ();
 #ifndef WIN32
   signal (SIGPIPE, SIG_IGN);
 #endif
@@ -4504,9 +4504,9 @@
 #endif
 
   /* The GTK loop */
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
   gtk_main ();
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 
 #ifdef HAVE_DBUS
   g_object_unref (dbus_component);

Modified: trunk/src/gui/misc.cpp
==============================================================================
--- trunk/src/gui/misc.cpp	(original)
+++ trunk/src/gui/misc.cpp	Mon May 26 20:43:30 2008
@@ -87,11 +87,13 @@
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
 
   
-  gdk_threads_enter ();
+  //gdk_threads_enter ();
+  std::cout << "FIXME" << std::endl << std::flush;
+  //FIXME Should use a signal in the runtime.
   gnomemeeting_error_dialog (GTK_WINDOW (main_window), 
 			     _("Error"),
 			     "%s", (gchar *) data);
-  gdk_threads_leave ();
+  //gdk_threads_leave ();
 
   return FALSE;
 }