ekiga r6911 - in trunk: . lib/engine/presence/avahi lib/engine/presence/skel src/endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Wed Sep 10 16:40:16 2008
New Revision: 6911
URL: http://svn.gnome.org/viewvc/ekiga?rev=6911&view=rev

Log:
Fixed #551679.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/presence/avahi/avahi-heap.cpp
   trunk/lib/engine/presence/skel/uri-presentity.cpp
   trunk/lib/engine/presence/skel/uri-presentity.h
   trunk/src/endpoints/sip-chat-simple.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	Wed Sep 10 16:40:16 2008
@@ -310,8 +310,11 @@
       broken = g_strsplit_set (typ, "._", 0);
       if (broken != NULL && broken[0] != NULL && broken[1] != NULL) {
 
+	std::set<std::string> groups;
+
+	groups.insert (_("Neighbours"));
 	url = g_strdup_printf ("%s:neighbour %s:%d", broken[1], host_name, port);
-	presentity = new Ekiga::URIPresentity (core, name, url);
+	presentity = new Ekiga::URIPresentity (core, name, url, groups);
 	status_received.emit (url, status);
 	presence_received.emit (url, presence);
 	add_presentity (*presentity);

Modified: trunk/lib/engine/presence/skel/uri-presentity.cpp
==============================================================================
--- trunk/lib/engine/presence/skel/uri-presentity.cpp	(original)
+++ trunk/lib/engine/presence/skel/uri-presentity.cpp	Wed Sep 10 16:40:16 2008
@@ -37,8 +37,9 @@
 
 Ekiga::URIPresentity::URIPresentity (Ekiga::ServiceCore &_core,
 				     std::string name_,
-				     std::string uri_)
-  : core(_core), name(name_), uri(uri_), presence("unknown")
+				     std::string uri_,
+				     std::set<std::string> groups_)
+  : core(_core), name(name_), uri(uri_), presence("unknown"), groups(groups_)
 {
   presence_core = dynamic_cast<Ekiga::PresenceCore*>(core.get ("presence-core"));
   presence_core->presence_received.connect (sigc::mem_fun (this, &Ekiga::URIPresentity::on_presence_received));

Modified: trunk/lib/engine/presence/skel/uri-presentity.h
==============================================================================
--- trunk/lib/engine/presence/skel/uri-presentity.h	(original)
+++ trunk/lib/engine/presence/skel/uri-presentity.h	Wed Sep 10 16:40:16 2008
@@ -69,7 +69,8 @@
      */
     URIPresentity (Ekiga::ServiceCore& _core,
 		   std::string name_,
-		   std::string uri_);
+		   std::string uri_,
+		   std::set<std::string> groups_);
 
     ~URIPresentity ();
 
@@ -102,6 +103,7 @@
     std::string name;
     std::string uri;
     std::string presence;
+    std::set<std::string> groups;
     std::string status;
     std::string avatar;
 
@@ -110,8 +112,6 @@
 
     void on_status_received (std::string uri_,
 			     std::string status_);
-
-    std::set<std::string> groups;
   };
 
   /**

Modified: trunk/src/endpoints/sip-chat-simple.cpp
==============================================================================
--- trunk/src/endpoints/sip-chat-simple.cpp	(original)
+++ trunk/src/endpoints/sip-chat-simple.cpp	Wed Sep 10 16:40:16 2008
@@ -45,7 +45,8 @@
 			     sigc::slot<bool, std::string> sender_)
   : core(core_), sender(sender_)
 {
-  presentity = new Ekiga::URIPresentity (core, name, uri);
+  presentity = new Ekiga::URIPresentity (core, name, uri,
+					 std::set<std::string>());
 }
 
 SIP::SimpleChat::~SimpleChat ()