ekiga r6855 - in trunk: lib/engine/protocol/skel src/endpoints

[mschneid svn gnome org]

Author: mschneid
Date: Sun Sep  7 11:36:30 2008
New Revision: 6855
URL: http://svn.gnome.org/viewvc/ekiga?rev=6855&view=rev

Log:
Fix iface shadowing.


Modified:
   trunk/lib/engine/protocol/skel/call-protocol-manager.h
   trunk/src/endpoints/h323-endpoint.cpp
   trunk/src/endpoints/h323-endpoint.h
   trunk/src/endpoints/sip-endpoint.cpp
   trunk/src/endpoints/sip-endpoint.h

Modified: trunk/lib/engine/protocol/skel/call-protocol-manager.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call-protocol-manager.h	(original)
+++ trunk/lib/engine/protocol/skel/call-protocol-manager.h	Sun Sep  7 11:36:30 2008
@@ -59,7 +59,7 @@
       public:
           std::string voip_protocol;
           std::string protocol;
-          std::string iface;
+          std::string id;
           bool publish;
           unsigned port;
         };

Modified: trunk/src/endpoints/h323-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/h323-endpoint.cpp	(original)
+++ trunk/src/endpoints/h323-endpoint.cpp	Sun Sep  7 11:36:30 2008
@@ -219,9 +219,9 @@
 
 bool Opal::H323::EndPoint::set_listen_port (unsigned port)
 {
-  iface.protocol = "tcp";
-  iface.voip_protocol = "h323";
-  iface.iface = "*";
+  listen_interface.protocol = "tcp";
+  listen_interface.voip_protocol = "h323";
+  listen_interface.id = "*";
 
   if (port > 0) {
 
@@ -231,7 +231,7 @@
     str << "tcp$*:" << port;
     if (StartListeners (PStringArray (str.str ()))) {
 
-      iface.port = port;
+      listen_interface.port = port;
       return true;
     }
   }
@@ -242,7 +242,7 @@
 
 const Ekiga::CallProtocolManager::Interface & Opal::H323::EndPoint::get_listen_interface () const
 {
-  return iface;
+  return listen_interface;
 }
 
 
@@ -362,10 +362,10 @@
 
 bool Opal::H323::EndPoint::UseGatekeeper (const PString & address,
                                           const PString & domain,
-                                          const PString & iface)
+                                          const PString & listen_interface)
 {
   bool result = 
-    H323EndPoint::UseGatekeeper (address, domain, iface);
+    H323EndPoint::UseGatekeeper (address, domain, listen_interface);
 
   PWaitAndSignal m(gk_name_mutex);
 

Modified: trunk/src/endpoints/h323-endpoint.h
==============================================================================
--- trunk/src/endpoints/h323-endpoint.h	(original)
+++ trunk/src/endpoints/h323-endpoint.h	Sun Sep  7 11:36:30 2008
@@ -127,7 +127,7 @@
       PMutex gk_name_mutex;
       PString gk_name;
 
-      Ekiga::CallProtocolManager::Interface iface;
+      Ekiga::CallProtocolManager::Interface listen_interface;
 
       std::string protocol_name;
       std::string uri_prefix;

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Sun Sep  7 11:36:30 2008
@@ -472,9 +472,9 @@
 {
   unsigned udp_min, udp_max;
 
-  iface.protocol = "udp";
-  iface.voip_protocol = "sip";
-  iface.iface = "*";
+  listen_interface.protocol = "udp";
+  listen_interface.voip_protocol = "sip";
+  listen_interface.id = "*";
 
   manager.get_udp_ports (udp_min, udp_max);
 
@@ -492,7 +492,7 @@
 
         if (StartListeners (PStringArray (str.str ()))) {
 
-          iface.port = port;
+          listen_interface.port = port;
           return true;
         }
 
@@ -500,7 +500,7 @@
       }
     }
     else
-      iface.port = port;
+      listen_interface.port = port;
   }
 
   return false;
@@ -509,7 +509,7 @@
 
 const Ekiga::CallProtocolManager::Interface & Opal::Sip::EndPoint::get_listen_interface () const
 {
-  return iface;
+  return listen_interface;
 }
 
 

Modified: trunk/src/endpoints/sip-endpoint.h
==============================================================================
--- trunk/src/endpoints/sip-endpoint.h	(original)
+++ trunk/src/endpoints/sip-endpoint.h	Sun Sep  7 11:36:30 2008
@@ -182,7 +182,7 @@
       Ekiga::Runtime & runtime;
       Ekiga::AccountCore & account_core;
 
-      Ekiga::CallProtocolManager::Interface iface;
+      Ekiga::CallProtocolManager::Interface listen_interface;
 
       std::string protocol_name;
       std::string uri_prefix;