ekiga r6741 - in trunk/lib/engine: components/avahi-publisher presence/avahi

[jpuydt svn gnome org]

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

Log:
Little cosmetic changes

Modified:
   trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp
   trunk/lib/engine/presence/avahi/avahi-presentity.cpp

Modified: trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp
==============================================================================
--- trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp	(original)
+++ trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp	Sun Aug 31 08:16:13 2008
@@ -39,6 +39,12 @@
 
 #include "avahi-publisher.h"
 
+/* anytime there's a line like :
+ * ret = avahi_...
+ * then it's possible to get debug information with a line like :
+ * g_print ("Error in avahi code: %s\n", avahi_strerror (ret));
+ */
+
 /* here are the avahi C callbacks */
 
 static void
@@ -109,12 +115,11 @@
 			     iter->protocol.c_str ());
 
       /* FIXME: no collision checking here */
-      avahi_entry_group_update_service_txt_strlst (group, AVAHI_IF_UNSPEC,
-						   AVAHI_PROTO_UNSPEC,
-						   (AvahiPublishFlags)0,
-						   name, typ, NULL,
-						   txt_record);
-
+      ret =avahi_entry_group_update_service_txt_strlst (group, AVAHI_IF_UNSPEC,
+							AVAHI_PROTO_UNSPEC,
+							(AvahiPublishFlags)0,
+							name, typ, NULL,
+							txt_record);
     }
 
     avahi_string_list_free (txt_record);
@@ -275,7 +280,6 @@
   result = avahi_string_list_add_printf (result,
 					 "presence=%s",
 					 details.get_short_status ().c_str ());
-
   result = avahi_string_list_add_printf (result,
 					 "status=%s",
 					 details.get_long_status ().c_str ());

Modified: trunk/lib/engine/presence/avahi/avahi-presentity.cpp
==============================================================================
--- trunk/lib/engine/presence/avahi/avahi-presentity.cpp	(original)
+++ trunk/lib/engine/presence/avahi/avahi-presentity.cpp	Sun Aug 31 08:16:13 2008
@@ -42,7 +42,7 @@
 Avahi::Presentity::Presentity (Ekiga::PresenceCore &_core,
 			       std::string _name,
 			       std::string _url):
-  core(_core), name(_name), url (_url)
+  core(_core), name(_name), presence("unknown"), url (_url)
 {
   groups.insert (_("Neighbours"));
 }