Re: [Ekiga-devel-list] Ekiga compilation error

[Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>]

yannick wrote:
> Compilation was working yesterday evening (europa) but failed this
> morning:
>
> full log:
> http://launchpadlibrarian.net/16724491/buildlog_ubuntu-hardy-amd64.ekiga-snapshot_20080812v01hardy3_FAILEDTOBUILD.txt.gz
>
> g++ -DHAVE_CONFIG_H -I. -I.. -I../lib -I../lib/gmconf -I../lib/toolbox
> -I../lib/gui -I../lib/engine/ -I../lib/engine/gui/gtk-frontend
> -I../lib/engine/account/skel -I../lib/engine/addressbook/skel
> -I../lib/engine/chat/skel -I../lib/engine/presence/skel
> -I../lib/engine/protocol/skel -I../lib/engine/protocol/sip
> -I../lib/engine/videooutput/skel -I../lib/engine/videoinput/skel
> -I../lib/engine/audioinput/skel -I../lib/engine/audiooutput/skel
> -I../lib/engine/hal/skel -I../lib/engine/framework
> -I../lib/engine/gui/gtk-core -I../src -I../src/clients/
> -I../src/components/ -I../src/devices/ -I../src/endpoints/ -I../src/gui/
> -I..  -DSCHEMA_AGE=61 -I../lib/engine/videooutput/common
> -I../lib/engine/videooutput/x    -DPNG_NO_MMX_CODE
> -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0
> -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0
> -I/usr/lib/glib-2.0/include -I/usr/include/freetype2
> -I/usr/include/libpng12 -I/usr/include/pixman-1   -pthread
> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -DORBIT2=1
> -pthread -DPNG_NO_MMX_CODE -I/usr/include/libgnome-2.0
> -I/usr/include/orbit-2.0 -I/usr/include/gconf/2
> -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include
> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
> -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0
> -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0
> -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0
> -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0
> -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/gail-1.0
> -I/usr/include/freetype2 -I/usr/include/atk-1.0
> -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/libpng12
> -I/usr/include/pixman-1   -I/usr/include/dbus-1.0
> -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0
> -I/usr/lib/glib-2.0/include    -DPTRACING=1 -D_REENTRANT -fno-exceptions
> -I/usr/include/opal   -DPTRACING -DNDEBUG -Os -g -fno-exceptions
> -felide-constructors -DPTRACING=1 -D_REENTRANT -fno-exceptions
> -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include
> -I/usr/include/libxml2   -g -O2 -Wall -Wextra -Winit-self
> -Wswitch-default -Wswitch-enum -Wstrict-aliasing=2 -Wfloat-equal
> -Wshadow -MT opal-account.o -MD -MP -MF .deps/opal-account.Tpo -c -o
> opal-account.o `test -f 'endpoints/opal-account.cpp' || echo
> './'`endpoints/opal-account.cpp
> endpoints/sip-endpoint.cpp: In member function 'virtual void Opal::Sip::EndPoint::fetch(std::string)':
> endpoints/sip-endpoint.cpp:308: error: 'SubscribeType' is not a member of 'SIPSubscribe'
> endpoints/sip-endpoint.cpp:308: error: expected `;' before 'type'
> endpoints/sip-endpoint.cpp:309: error: 'type' was not declared in this scope
> endpoints/sip-endpoint.cpp: In member function 'virtual void Opal::Sip::EndPoint::unfetch(std::string)':
> endpoints/sip-endpoint.cpp:318: error: 'SubscribeType' is not a member of 'SIPSubscribe'
> endpoints/sip-endpoint.cpp:318: error: expected `;' before 'type'
> endpoints/sip-endpoint.cpp:319: error: 'type' was not declared in this scope
> endpoints/sip-endpoint.cpp: In member function 'virtual void Opal::Sip::EndPoint::OnRegistered(const PString&, bool)':
> endpoints/sip-endpoint.cpp:630: error: 'SubscribeType' is not a member of 'SIPSubscribe'
> endpoints/sip-endpoint.cpp:630: error: expected `;' before 'type'
> endpoints/sip-endpoint.cpp:631: error: 'type' was not declared in this scope
> endpoints/sip-endpoint.cpp:640: error: 'SubscribeType' is not a member of 'SIPSubscribe'
> endpoints/sip-endpoint.cpp:640: error: expected `;' before 't'
> endpoints/sip-endpoint.cpp:641: error: 't' was not declared in this scope
> make[4]: *** [sip-endpoint.o] Error 1

It was simpler than I thought, see patch attached (which voids using any 
type).

==============

For developement info, here is an excerpt of the changes in opal:

-      SIPSubscribe::SubscribeType & type,
+      const PString & eventPackage,

  ------>   SIPSubscribe::SubscribeType   changed in   const PString


-  SIPSubscribe::SubscribeType type;
+  PCaselessString m_eventPackage;

-    PSafePtr<SIPHandler> FindSIPHandlerByUrl(const PString & url, 
SIP_PDU::Methods meth, SIPSubscribe::SubscribeType type, PSafetyMode m);
+    PSafePtr<SIPHandler> FindSIPHandlerByUrl(const PString & url, 
SIP_PDU::Methods meth, const PString & eventPackage, PSafetyMode m);


-    enum SubscribeType {
-      Unknown,
-      MessageSummary,
-      Presence
-    };
+    static const PString MessageSummary;
+    static const PString Presence;

-    if (type == SIPSubscribe::Presence)
+    if (m_eventPackage == SIPSubscribe::Presence)


-    if (SIPURL(url) == handler->GetTargetAddress() && meth == 
handler->GetMethod() && handler->GetSubscribeType() == type)
+    if (SIPURL(url) == handler->GetTargetAddress() && meth == 
handler->GetMethod() && handler->GetEventPackage() == eventPackage)


+const PString SIPSubscribe::MessageSummary = "message-summary";
+const PString SIPSubscribe::Presence = "presence";


-  switch (type) {
-  case MessageSummary:
-    eventField = "message-summary";
+  if (eventPackage == MessageSummary)
-  case Presence:
-    eventField = "presence";
+  else if (eventPackage == Presence)

--
Eugen

--- ekiga-svn/src/endpoints/sip-endpoint.cpp	2008-08-11 21:04:28.000000000 +0200
+++ myekiga/src/endpoints/sip-endpoint.cpp	2008-08-12 15:32:46.000000000 +0200
@@ -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 ());