Commit e1806293 authored by Igor Pashev's avatar Igor Pashev Committed by Eugen Dedu

Fix compilation of xcap plugin

Fixes bug #646282.
parent 65c7c2e3
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)
......
......@@ -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;
......
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment