[GnomeMeeting-devel-list] Make the address of the public IP detector configurable

[Miguel Rodríguez Pérez <migrax terra es>]

Well, I guess most people won't ever need this after the new script
arrives at seconix. In any case it may be useful in some setups
Maybe somebody out there doesn't want to let seconix know that he is
using gnomemeeting and makes a script local to his network that uses
snmp to get the public address from the router, ...

Of course, this is only configurable with gconf, and not from the UI.
-- 
Miguel Rodríguez Pérez <migrax terra es>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnomemeeting/ChangeLog,v
retrieving revision 1.1128
diff -d -u -r1.1128 ChangeLog
--- ChangeLog	25 Jan 2004 16:54:03 -0000	1.1128
+++ ChangeLog	26 Jan 2004 13:44:43 -0000
@@ -1,3 +1,13 @@
+2004-01-26  Miguel Rodríguez Pérez  <migrax terra es>
+
+	* src/endpoint.cpp (OnGatewayIPTimeout): Use NAT_KEY/public_ip_detector
+	for the address of the script to determine our public ip.
+
+	* configure.in: Increment schema age to 45.
+
+	* gnomemeeting.schemas.in.in: Add a new key:
+	NAT_KEY/public_ip_detector. In search of a better name...
+
 2004-01-25 Kilian Krause <kk verfaction de>
 
 	* src/ldap_window.cpp, src/ldap_window.hi, src/tools.h: code cleanup
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnomemeeting/configure.in,v
retrieving revision 1.228
diff -d -u -r1.228 configure.in
--- configure.in	25 Jan 2004 15:04:56 -0000	1.228
+++ configure.in	26 Jan 2004 13:44:43 -0000
@@ -37,7 +37,7 @@
 dnl ###########################################################################
 dnl   This is to check correct gconf installation
 dnl ###########################################################################
-SCHEMA_AGE=44
+SCHEMA_AGE=45
 
 dnl increment this number if you add anything to the schema file
 AC_SUBST(SCHEMA_AGE)
Index: gnomemeeting.schemas.in.in
===================================================================
RCS file: /cvs/gnome/gnomemeeting/gnomemeeting.schemas.in.in,v
retrieving revision 1.87
diff -d -u -r1.87 gnomemeeting.schemas.in.in
--- gnomemeeting.schemas.in.in	25 Jan 2004 15:04:56 -0000	1.87
+++ gnomemeeting.schemas.in.in	26 Jan 2004 13:44:44 -0000
@@ -641,6 +641,17 @@
 	<long>Enter the public IP of your NAT/PAT router if you want to use IP translation. If you are registered to ils.seconix.com, GnomeMeeting will automatically fetch the public IP using the ILS service.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/apps/gnomemeeting/general/nat/public_ip_detector</key>
+      <applyto>/apps/gnomemeeting/general/nat/public_ip_detector</applyto>
+      <owner>GnomeMeeting</owner>
+      <type>string</type>
+      <default>http://213.193.144.104/ip/</default>
+      <locale name="C">
+	<short>Address of public IP detector</short>
+        <long>Enter a valid URL to connect to a web application that output the public IP of your host.</long>
+      </locale>
+    </schema>
     <schema>	
       <key>/schemas/apps/gnomemeeting/general/user_interface/start_hidden</key>
       <applyto>/apps/gnomemeeting/general/user_interface/start_hidden</applyto>
Index: src/endpoint.cpp
===================================================================
RCS file: /cvs/gnome/gnomemeeting/src/endpoint.cpp,v
retrieving revision 1.351
diff -d -u -r1.351 endpoint.cpp
--- src/endpoint.cpp	25 Jan 2004 15:04:58 -0000	1.351
+++ src/endpoint.cpp	26 Jan 2004 13:44:45 -0000
@@ -2033,7 +2033,8 @@
 
   if (ip_checking) {
 
-    if (web_client.GetTextDocument ("http://213.193.144.104/ip/";, html)) {
+    gchar *ip_detector = gconf_get_string (NAT_KEY "public_ip_detector");
+    if (ip_detector != NULL && web_client.GetTextDocument (ip_detector, html)) {
 
       if (!html.IsEmpty ()) {
 
@@ -2045,7 +2046,8 @@
 
       }
     }
-
+    if (ip_detector != NULL)
+      g_free (ip_detector);
     if (!ip_address.IsEmpty ()) {
 
       gdk_threads_enter ();