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

[dsandras svn gnome org]

Author: dsandras
Date: Mon Nov 10 10:33:25 2008
New Revision: 7320
URL: http://svn.gnome.org/viewvc/ekiga?rev=7320&view=rev

Log:
Removed unused stuff.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/ekiga.cpp
   trunk/src/endpoints/ekiga.h
   trunk/src/gui/main.cpp

Modified: trunk/src/endpoints/ekiga.cpp
==============================================================================
--- trunk/src/endpoints/ekiga.cpp	(original)
+++ trunk/src/endpoints/ekiga.cpp	Mon Nov 10 10:33:25 2008
@@ -121,82 +121,6 @@
 }
 
 
-bool
-GnomeMeeting::DetectInterfaces ()
-{
-  //TODO
-  PString config_interface;
-  PString iface_noip;
-  PString ip;
-  PIPSocket::InterfaceTable ifaces;
-
-  PINDEX i = 0;
-  PINDEX pos = 0;
-  bool res = FALSE;
-
-  gchar *conf_interface = NULL;
-
-  PWaitAndSignal m(iface_access_mutex);
-
-  /* Detect the valid interfaces */
-  res = PIPSocket::GetInterfaceTable (ifaces);
-  interfaces.RemoveAll ();
-
-  conf_interface = gm_conf_get_string (PROTOCOLS_KEY "interface");
-  config_interface = conf_interface;
-  g_free (conf_interface);
-
-  pos = config_interface.Find("[");
-  if (pos != P_MAX_INDEX)
-    iface_noip = config_interface.Left (pos).Trim ();
-  while (i < ifaces.GetSize ()) {
-
-    ip = " [" + ifaces [i].GetAddress ().AsString () + "]";
-
-    if (ifaces [i].GetName () + ip == config_interface || ifaces [i].GetName () == iface_noip) 
-      break;
-
-    i++;
-  }
-
-  pos = i;
-  i = 0;
-
-  while (i < ifaces.GetSize ()) {
-
-    ip = " [" + ifaces [i].GetAddress ().AsString () + "]";
-
-    if (i != pos) {
-
-      if (ifaces [i].GetAddress ().AsString () != "0.0.0.0") {
-
-        if (ifaces [i].GetName ().Find ("ppp") != P_MAX_INDEX) {
-
-          if (i > 0) {
-            interfaces += interfaces [0];
-            interfaces [0] = ifaces [i].GetName () + ip;     
-          }
-          else
-            interfaces += ifaces [i].GetName () + ip;
-        }
-        else if (!ifaces [i].GetAddress ().IsLoopback ())
-          interfaces += ifaces [i].GetName () + ip;
-      }
-    }
-    else {
-
-      if (!interfaces [0].IsEmpty ())
-        interfaces += interfaces [0];
-      interfaces [0] = ifaces [pos].GetName () + ip;
-    }
-
-    i++;
-  }
-
-  return res;
-}
-
-
 Ekiga::ServiceCore *
 GnomeMeeting::GetServiceCore ()
 {
@@ -301,14 +225,6 @@
 #endif
 }
 
-PStringArray 
-GnomeMeeting::GetInterfaces ()
-{
-  PWaitAndSignal m(iface_access_mutex);
-
-  return interfaces;
-}
-
 
 void
 GnomeMeeting::InitEngine ()

Modified: trunk/src/endpoints/ekiga.h
==============================================================================
--- trunk/src/endpoints/ekiga.h	(original)
+++ trunk/src/endpoints/ekiga.h	Mon Nov 10 10:33:25 2008
@@ -94,16 +94,6 @@
 
   
   /* DESCRIPTION  :  /
-   * BEHAVIOR     :  Detects the available interfaces.
-   *                 Returns FALSE if none is is detected, TRUE
-   *                 otherwise. 
-   *                 Updates the preferences window.
-   * PRE          :  /
-   */
-  bool DetectInterfaces ();
-
-  
-  /* DESCRIPTION  :  /
    * BEHAVIOR     :  Returns a pointer to the GmWindow structure
    *                 of widgets.
    * PRE          :  /
@@ -162,32 +152,15 @@
    */
   void BuildGUI ();
 
-  
-  /* DESCRIPTION  : / 
-   * BEHAVIOR     : Returns the list of detected interfaces. 
-   * 		    That doesn't force a redetection. Use DetectInterfaces 
-   * 		    for that.
-   * PRE          : /
-   */
-  PStringArray GetInterfaces ();
-
  private:
   
   Ekiga::ServiceCore *service_core;
 
-  PThread *audio_tester;
-
-  PMutex at_access_mutex;
   PMutex ep_var_mutex;
   PMutex dev_access_mutex;
-  PMutex iface_access_mutex;
   int call_number;
 
 
-  /* Detected interfaces */
-  PStringArray interfaces;
-
-
   /* The different components of the GUI */
   GtkWidget *main_window;
   GtkWidget *history_window;

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Mon Nov 10 10:33:25 2008
@@ -4477,7 +4477,6 @@
 
   GnomeMeeting::Process ()->InitEngine ();
   GnomeMeeting::Process ()->BuildGUI ();
-  GnomeMeeting::Process ()->DetectInterfaces ();
   
   /* Add depreciated notifiers */
   gnomemeeting_conf_init ();