← Back to branch summary

~ubuntu-branches/ubuntu/edgy/ekiga/edgy

« back to all changes in this revision

Viewing changes to src/endpoints/sip.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2006-06-26 11:10:35 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060626111035-xapgx0ov26c69t3y
Tags: 2.0.2-1ubuntu1
* Resynchronized with Debian, only Ubuntu changes are:
  - debian/control.in, debian/patches/01_lpi.dpatch, 
    debian/patches/02_autoconf.dpatch: 
    - Launchpad Integration
  - debian/control.in, debian/patches/42_change_pixmaps.dpatch:
    - patched icons.
  - debian/patches/trayicon_transparency.dpatch:
    - upstream fix to enable transparency in the system tray.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/endpoints/sip.cpp
93
93
  SetInviteTimeout (PTimeInterval (0, 6));
94
94
  SetNonInviteTimeout (PTimeInterval (0, 6));
95
95
  SetNATBindingTimeout (PTimeInterval (0, binding_timeout));
96
 
  SetRetryTimeouts (250, 10000);
 
96
  SetRetryTimeouts (500, 4000);
97
97
  SetMaxRetries (8);
98
98
 
99
99
 
232
232
                                     endpoint.GetRegisteredAccounts());
233
233
  gnomemeeting_threads_leave ();
234
234
 
235
 
 
236
 
  /* MWI Subscribe */
237
 
  if (wasRegistering && !IsSubscribed (domain, username))
238
 
    MWISubscribe (domain, username); 
239
 
 
240
235
  /* Signal the SIPEndpoint */
241
236
  SIPEndPoint::OnRegistered (domain, username, wasRegistering);
242
237
 
364
359
  call = endpoint.FindCallWithLock (endpoint.GetCurrentCallToken());
365
360
  if (call)
366
361
    con = endpoint.GetConnection (call, TRUE);
367
 
  if ((con && con->GetIdentifier () == connection.GetIdentifier()) 
368
 
      || (icm == DO_NOT_DISTURB))
 
362
  if ((con && con->GetIdentifier () == connection.GetIdentifier())) {
 
363
    return TRUE;
 
364
  }
 
365
  
 
366
  if (icm == DO_NOT_DISTURB)
369
367
    reason = 1;
370
368
  else if (forward_host && always_forward)
371
369
    reason = 2; // Forward
541
539
{
542
540
  return SIPEndPoint::GetRegistrationsCount ();
543
541
}
 
542
 
 
543
 
 
544
SIPURL
 
545
GMSIPEndpoint::GetDefaultRegisteredPartyName ()
 
546
{
 
547
  GmAccount *account = NULL;
 
548
  
 
549
  PString url;
 
550
 
 
551
  account = gnomemeeting_get_default_account ("SIP");
 
552
  if (account) {
 
553
 
 
554
    if (PString(account->username).Find("@") == P_MAX_INDEX)
 
555
      url = PString (account->username) + "@" + PString (account->host);
 
556
 
 
557
    return url;
 
558
  }
 
559
  
 
560
  return SIPEndPoint::GetDefaultRegisteredPartyName (); 
 
561
}