Re: [Ekiga-devel-list] Incoming calls not detected [latest]

[Damien Sandras <dsandras seconix com>]

Le dimanche 04 février 2007 à 11:17 -0800, Andre Kirchner a écrit :
> I have a much cleaner path now. Please see attached
> files.
> 
> Thomas and Craig: Thanks for the suggestions.
> 

I'll commit it tomorrow !

Thanks for your work Andre, if you want to join the team with regular
contributions, it is welcome :)


> Andre
> 
> 
>  
> ____________________________________________________________________________________
> Do you Yahoo!?
> Everyone is raving about the all-new Yahoo! Mail beta.
> http://new.mail.yahoo.com
> pièce jointe document plein texte (manager_h.txt),
> "2072352392-manager_h.txt"
> --- /home/andre/tmp/manager.h	2007-02-02 20:16:03.000000000 -0800 +++ ./manager.h	2007-02-02 20:17:44.000000000 -0800 @@ -248,8 +248,8 @@ * PRE : / */ BOOL OnIncomingConnection (OpalConnection &, -			 int, -			 PString); +			 unsigned, +			 OpalConnection::StringOptions *); /* DESCRIPTION : This callback is called when a call is established. 
> pièce jointe document plein texte (manager_cpp.txt),
> "1545496172-manager_cpp.txt"
> --- /home/andre/tmp/manager.cpp	2007-02-02 20:16:03.000000000 -0800 +++ ./manager.cpp	2007-02-04 11:03:05.000000000 -0800 @@ -839,8 +839,8 @@ BOOL GMManager::OnIncomingConnection (OpalConnection &connection, -				 int reason, -				 PString extra) +			 unsigned reason, +			 OpalConnection::StringOptions * extra) { BOOL res = FALSE; @@ -891,12 +891,12 @@ break; case 2: - connection.ForwardCall (extra); + connection.ForwardCall (extra->GetDataAt(0)); res = FALSE; short_reason = g_strdup (_("Forwarding incoming call")); long_reason = g_strdup_printf (_("Forwarding incoming call from %s to %s"), -		 utf8_name, (const char *) extra); +		 utf8_name, (const char *) extra->GetDataAt(0)); break; case 4: @@ -906,7 +906,7 @@ 				 (const char *) utf8_name); default: case 0: - res = OpalManager::OnIncomingConnection (connection); + res = OpalManager::OnIncomingConnection (connection, 0, NULL); break; } 
> pièce jointe document plein texte (sip_cpp.txt),
> "2536427989-sip_cpp.txt"
> --- /home/andre/tmp/sip.cpp	2007-02-04 11:11:51.000000000 -0800 +++ ./sip.cpp	2007-02-04 11:11:14.000000000 -0800 @@ -35,7 +35,6 @@ * */ -#include <stdio.h> #include "../../config.h" @@ -428,15 +427,10 @@ GMSIPEndpoint::OnIncomingConnection (OpalConnection &connection, unsigned options) { - FILE * pFile = fopen("./ekiga.txt", "a"); - fprintf(pFile, "GMSIPEndpoint::OnIncomingConnection\n"); - fflush(pFile); - fclose(pFile); - PSafePtr<OpalConnection> con = NULL; PSafePtr<OpalCall> call = NULL; - gchar *forward_host = NULL; + OpalConnection::StringOptions * forward_host; IncomingCallMode icm; gboolean busy_forward = FALSE; @@ -445,12 +439,12 @@ BOOL res = FALSE; - int reason = 0; + unsigned reason = 0; PTRACE (3, "GMSIPEndpoint\tIncoming connection"); gnomemeeting_threads_enter (); - forward_host = gm_conf_get_string (SIP_KEY "forward_host"); + forward_host->SetDataAt(0, PString(gm_conf_get_string (H323_KEY "forward_host"))); busy_forward = gm_conf_get_bool (CALL_FORWARDING_KEY "forward_on_busy"); always_forward = gm_conf_get_bool (CALL_FORWARDING_KEY "always_forward"); icm = @@ -468,12 +462,13 @@ if (icm == DO_NOT_DISTURB) reason = 1; - else if (forward_host && always_forward) + + else if (always_forward) reason = 2; // Forward /* We are in a call */ else if (endpoint.GetCallingState () != GMManager::Standby) { - if (forward_host && busy_forward) + if (busy_forward) reason = 2; // Forward else reason = 1; // Reject @@ -488,8 +483,6 @@ res = endpoint.OnIncomingConnection (connection, reason, forward_host); - g_free (forward_host); - return res; } 
> pièce jointe document plein texte (h323_cpp.txt),
> "730670066-h323_cpp.txt"
> --- /home/andre/tmp/h323.cpp	2007-02-02 20:39:04.000000000 -0800 +++ ./h323.cpp	2007-02-04 11:10:41.000000000 -0800 @@ -294,7 +294,7 @@ PSafePtr<OpalConnection> con = NULL; PSafePtr<OpalCall> call = NULL; - gchar *forward_host = NULL; + OpalConnection::StringOptions * forward_host; IncomingCallMode icm; gboolean busy_forward = FALSE; @@ -303,13 +303,13 @@ BOOL res = FALSE; int no_answer_timeout = 0; - int reason = 0; + unsigned reason = 0; PTRACE (3, "GMH323Endpoint\tIncoming connection"); gnomemeeting_threads_enter (); - forward_host = gm_conf_get_string (H323_KEY "forward_host"); + forward_host->SetDataAt(0, PString(gm_conf_get_string (H323_KEY "forward_host"))); busy_forward = gm_conf_get_bool (CALL_FORWARDING_KEY "forward_on_busy"); always_forward = gm_conf_get_bool (CALL_FORWARDING_KEY "always_forward"); icm = @@ -325,12 +325,13 @@ if ((con && con->GetIdentifier () == connection.GetIdentifier()) || (icm == DO_NOT_DISTURB)) reason = 1; - else if (forward_host && always_forward) + + else if (always_forward) reason = 2; // Forward /* We are in a call */ else if (endpoint.GetCallingState () != GMManager::Standby) { - if (forward_host && busy_forward) + if (busy_forward) reason = 2; // Forward else reason = 1; // Reject @@ -345,8 +346,6 @@ res = endpoint.OnIncomingConnection (connection, reason, forward_host); - g_free (forward_host); - return res; } 
> _______________________________________________ Ekiga-devel-list mailing list Ekiga-devel-list gnome org http://mail.gnome.org/mailman/listinfo/ekiga-devel-list
-- 
 _      Damien Sandras
(o-      
//\    Ekiga Softphone : http://www.ekiga.org/
v_/_  NOVACOM                 : http://www.novacom.be/
          FOSDEM                   : http://www.fosdem.org/
          SIP Phone             : sip:dsandras ekiga net