ekiga r6580 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Tue Aug 12 17:26:12 2008
New Revision: 6580
URL: http://svn.gnome.org/viewvc/ekiga?rev=6580&view=rev

Log:
Fixed compilation with new OPAL API thanks to Eugen Dedu.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/sip-endpoint.cpp

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Tue Aug 12 17:26:12 2008
@@ -305,8 +305,7 @@
   if (std::find (domains.begin (), domains.end (), domain) != domains.end ()
       && !IsSubscribed (SIPSubscribe::Presence, _uri.c_str ())) {
 
-    SIPSubscribe::SubscribeType type = SIPSubscribe::Presence;
-    Subscribe (type, 1800, PString (_uri.c_str ()));
+    Subscribe (SIPSubscribe::Presence, 1800, PString (_uri.c_str ()));
   }
 }
 
@@ -315,8 +314,7 @@
 {
   if (IsSubscribed (SIPSubscribe::Presence, uri.c_str ())) {
 
-    SIPSubscribe::SubscribeType type = SIPSubscribe::Presence;
-    Subscribe (type, 0, PString (uri.c_str ()));
+    Subscribe (SIPSubscribe::Presence, 0, PString (uri.c_str ()));
 
     subscribed_uris.remove (uri);
   }
@@ -627,8 +625,7 @@
           && ((was_registering && !IsSubscribed (SIPSubscribe::Presence, (*iter).c_str ()))
               || (!was_registering && IsSubscribed (SIPSubscribe::Presence, (*iter).c_str ())))) {
 
-        SIPSubscribe::SubscribeType type = SIPSubscribe::Presence;
-        Subscribe (type, was_registering ? 500 : 0, PString ((*iter).c_str ()));
+        Subscribe (SIPSubscribe::Presence, was_registering ? 500 : 0, PString ((*iter).c_str ()));
         if (!was_registering)
           subscribed_uris.remove (*iter);
       }
@@ -636,10 +633,8 @@
   }
 
   /* Subscribe for MWI */
-  if (!IsSubscribed (SIPSubscribe::MessageSummary, aor)) { 
-    SIPSubscribe::SubscribeType t = SIPSubscribe::MessageSummary;
-    Subscribe (t, 3600, aor);
-  }
+  if (!IsSubscribed (SIPSubscribe::MessageSummary, aor))
+    Subscribe (SIPSubscribe::MessageSummary, 3600, aor);
 
   /* Signal */
   Ekiga::Account *account = account_core.find_account (strm.str ());