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

[mschneid svn gnome org]

Author: mschneid
Date: Sat Sep  6 13:11:21 2008
New Revision: 6837
URL: http://svn.gnome.org/viewvc/ekiga?rev=6837&view=rev

Log:
s/interface/iface 


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	Sat Sep  6 13:11:21 2008
@@ -59,7 +59,7 @@
       public:
           std::string voip_protocol;
           std::string protocol;
-          std::string interface;
+          std::string iface;
           bool publish;
           unsigned port;
         };

Modified: trunk/src/endpoints/h323-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/h323-endpoint.cpp	(original)
+++ trunk/src/endpoints/h323-endpoint.cpp	Sat Sep  6 13:11:21 2008
@@ -219,9 +219,9 @@
 
 bool Opal::H323::EndPoint::set_listen_port (unsigned port)
 {
-  interface.protocol = "tcp";
-  interface.voip_protocol = "h323";
-  interface.interface = "*";
+  iface.protocol = "tcp";
+  iface.voip_protocol = "h323";
+  iface.iface = "*";
 
   if (port > 0) {
 
@@ -231,7 +231,7 @@
     str << "tcp$*:" << port;
     if (StartListeners (PStringArray (str.str ()))) {
 
-      interface.port = port;
+      iface.port = port;
       return true;
     }
   }
@@ -242,7 +242,7 @@
 
 const Ekiga::CallProtocolManager::Interface & Opal::H323::EndPoint::get_listen_interface () const
 {
-  return interface;
+  return iface;
 }
 
 

Modified: trunk/src/endpoints/h323-endpoint.h
==============================================================================
--- trunk/src/endpoints/h323-endpoint.h	(original)
+++ trunk/src/endpoints/h323-endpoint.h	Sat Sep  6 13:11:21 2008
@@ -127,7 +127,7 @@
       PMutex gk_name_mutex;
       PString gk_name;
 
-      Ekiga::CallProtocolManager::Interface interface;
+      Ekiga::CallProtocolManager::Interface iface;
 
       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	Sat Sep  6 13:11:21 2008
@@ -472,9 +472,9 @@
 {
   unsigned udp_min, udp_max;
 
-  interface.protocol = "udp";
-  interface.voip_protocol = "sip";
-  interface.interface = "*";
+  iface.protocol = "udp";
+  iface.voip_protocol = "sip";
+  iface.iface = "*";
 
   manager.get_udp_ports (udp_min, udp_max);
 
@@ -492,7 +492,7 @@
 
         if (StartListeners (PStringArray (str.str ()))) {
 
-          interface.port = port;
+          iface.port = port;
           return true;
         }
 
@@ -500,7 +500,7 @@
       }
     }
     else
-      interface.port = port;
+      iface.port = port;
   }
 
   return false;
@@ -509,7 +509,7 @@
 
 const Ekiga::CallProtocolManager::Interface & Opal::Sip::EndPoint::get_listen_interface () const
 {
-  return interface;
+  return iface;
 }
 
 

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