[ekiga] Fix compilation of xcap plugin

[Eugen Dedu <ededu src gnome org>]

commit e18062934c5058f783b13fc34ab81da4a6690e16
Author: Igor Pashev <pashev igor gmail com>
Date:   Mon Apr 4 23:07:15 2011 +0200

    Fix compilation of xcap plugin
    
    Fixes bug #646282.

 plugins/resource-list/Makefile.am  |    2 +-
 plugins/resource-list/rl-entry.cpp |    2 +-
 plugins/resource-list/rl-heap.cpp  |   10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/resource-list/Makefile.am b/plugins/resource-list/Makefile.am
index 5620613..c1ab5a3 100644
--- a/plugins/resource-list/Makefile.am
+++ b/plugins/resource-list/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmresource_list.la
 
-resource_list_dir = $(top_srcdir)/plugins/resource-list/
+resource_list_dir = $(top_srcdir)/plugins/resource-list
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
diff --git a/plugins/resource-list/rl-entry.cpp b/plugins/resource-list/rl-entry.cpp
index 8db0486..f442105 100644
--- a/plugins/resource-list/rl-entry.cpp
+++ b/plugins/resource-list/rl-entry.cpp
@@ -161,7 +161,7 @@ RL::Entry::populate_menu (Ekiga::MenuBuilder& builder)
 		      boost::bind (&RL::Entry::refresh, this));
 
   if ( !uri.empty ())
-    populated = presence_core->populate_presentity_menu (Ekiga::PresentityPtr (this, null_deleter), uri, builder)
+    populated = presence_core->populate_presentity_menu (Ekiga::PresentityPtr (this, null_deleter ()), uri, builder)
       || populated;
 
   return populated;
diff --git a/plugins/resource-list/rl-heap.cpp b/plugins/resource-list/rl-heap.cpp
index 08c3240..beeac6b 100644
--- a/plugins/resource-list/rl-heap.cpp
+++ b/plugins/resource-list/rl-heap.cpp
@@ -185,7 +185,7 @@ RL::Heap::visit_presentities (boost::function1<bool, Ekiga::PresentityPtr > visi
 {
   bool go_on = true;
 
-  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::iterator
+  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
 	 iter = presentities.begin ();
        go_on && iter != presentities.end ();
        ++iter)
@@ -254,7 +254,7 @@ RL::Heap::refresh ()
   while ( !presentities.empty ()) {
 
     presentities.begin()->first->removed ();
-    for (std::list<boost::signals::connection>::iterator iter2
+    for (std::list<boost::signals::connection>::const_iterator iter2
 	   = presentities.begin()->second.begin ();
 	 iter2 != presentities.begin()->second.end ();
 	 ++iter2)
@@ -381,7 +381,7 @@ void
 RL::Heap::push_presence (const std::string uri_,
 			 const std::string presence)
 {
-  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::iterator
+  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
 	 iter = presentities.begin ();
        iter != presentities.end ();
        ++iter) {
@@ -395,7 +395,7 @@ void
 RL::Heap::push_status (const std::string uri_,
 		       const std::string status)
 {
-  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::iterator
+  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
 	 iter = presentities.begin ();
        iter != presentities.end ();
        ++iter) {
@@ -514,7 +514,7 @@ RL::Heap::new_entry ()
 			   "contact on a remote server"));
 
   std::set<std::string> all_groups;
-  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::iterator
+  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
 	 iter = presentities.begin ();
        iter != presentities.end ();
        ++iter) {