ekiga r6739 - trunk/lib/engine/presence/avahi

[jpuydt svn gnome org]

Author: jpuydt
Date: Sun Aug 31 08:16:08 2008
New Revision: 6739
URL: http://svn.gnome.org/viewvc/ekiga?rev=6739&view=rev

Log:
Made the avahi presence code cope with the new avahi publishing code

Modified:
   trunk/lib/engine/presence/avahi/avahi-heap.cpp

Modified: trunk/lib/engine/presence/avahi/avahi-heap.cpp
==============================================================================
--- trunk/lib/engine/presence/avahi/avahi-heap.cpp	(original)
+++ trunk/lib/engine/presence/avahi/avahi-heap.cpp	Sun Aug 31 08:16:08 2008
@@ -244,7 +244,7 @@
 			       AvahiIfIndex /*interface*/,
 			       AvahiProtocol /*protocol*/,
 			       AvahiResolverEvent event,
-			       const char *name,
+			       const char * /*name*/,
 			       const char * /*type*/,
 			       const char * /*domain*/,
 			       const char * /*host_name*/,
@@ -253,6 +253,7 @@
 			       AvahiStringList *txt,
 			       AvahiLookupResultFlags /*flags*/)
 {
+  std::string name;
   std::string software;
   std::string presence;
   std::string status;
@@ -276,7 +277,9 @@
 
 	    std::string key (ckey);
 	    std::string value (cvalue);
-	    if (key == "presence") 
+	    if (key == "display_name")
+	      name = value;
+	    else if (key == "presence") 
               presence = value;
             else if (key == "status") 
               status = value;