GNOME.org
 

[ekiga] Made the experimental components compile again after the boost::signals transition

commit 17e423335bfa2fc515d6daeacb6f06f8f94c9512
Author: Julien Puydt <jpuydt gnome org>
Date:   Sun Aug 30 02:20:46 2009 +0200

    Made the experimental components compile again after the boost::signals transition

 .../components/loudmouth/loudmouth-account.cpp     |    2 +-
 lib/engine/components/loudmouth/loudmouth-bank.cpp |    2 +-
 lib/engine/components/loudmouth/loudmouth-heap.cpp |    6 +++---
 .../components/loudmouth/loudmouth-presentity.cpp  |    4 ++--
 .../components/loudmouth/loudmouth-presentity.h    |    2 +-
 lib/engine/components/resource-list/rl-cluster.cpp |   10 +++++-----
 lib/engine/components/resource-list/rl-entry.cpp   |    2 +-
 lib/engine/components/resource-list/rl-heap.cpp    |   14 +++++++-------
 lib/engine/components/resource-list/rl-list.cpp    |    6 +++---
 .../components/resource-list/rl-presentity.cpp     |    7 +++----
 10 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/lib/engine/components/loudmouth/loudmouth-account.cpp b/lib/engine/components/loudmouth/loudmouth-account.cpp
index 01f82fd..ac5c40b 100644
--- a/lib/engine/components/loudmouth/loudmouth-account.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-account.cpp
@@ -256,7 +256,7 @@ LM::Account::get_node () const
 void
 LM::Account::edit ()
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Account::on_edit_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Account::on_edit_form_submitted, this, _1, _2)));
   xmlChar* xml_str = NULL;
 
   request->title (_("Edit account"));
diff --git a/lib/engine/components/loudmouth/loudmouth-bank.cpp b/lib/engine/components/loudmouth/loudmouth-bank.cpp
index 368e116..6d4b480 100644
--- a/lib/engine/components/loudmouth/loudmouth-bank.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-bank.cpp
@@ -116,6 +116,6 @@ bool
 LM::Bank::populate_menu (Ekiga::MenuBuilder& builder)
 {
   builder.add_action ("add", _("_Add a jabber/XMPP account"),
-		      boost::bind (boost::bind (&LM::Bank::add, this), (xmlNodePtr)NULL));
+		      boost::bind (&LM::Bank::add, this, (xmlNodePtr)NULL));
   return true;
 }
diff --git a/lib/engine/components/loudmouth/loudmouth-heap.cpp b/lib/engine/components/loudmouth/loudmouth-heap.cpp
index 9c2cc83..38bca1e 100644
--- a/lib/engine/components/loudmouth/loudmouth-heap.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-heap.cpp
@@ -194,7 +194,7 @@ LM::Heap::presence_handler (LmMessage* message)
 
   if (type_attr != NULL && strcmp (type_attr, "subscribe") == 0) {
 
-    boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Heap::subscribe_from_form_submitted, this)));
+    boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Heap::subscribe_from_form_submitted, this, _1, _2)));
     LmMessageNode* status = lm_message_node_find_child (lm_message_get_node (message), "status");
     gchar* instructions = NULL;
     std::string item_name;
@@ -301,7 +301,7 @@ LM::Heap::parse_roster (LmMessageNode* query)
     if ( !found) {
 
       PresentityPtr presentity(new Presentity (connection, node));
-      presentity->chat_requested.connect (boost::bind (boost::bind (&LM::Heap::on_chat_requested, this), presentity));
+      presentity->chat_requested.connect (boost::bind (&LM::Heap::on_chat_requested, this, presentity));
       add_presentity (presentity);
     }
   }
@@ -310,7 +310,7 @@ LM::Heap::parse_roster (LmMessageNode* query)
 void
 LM::Heap::add_item ()
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Heap::add_item_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Heap::add_item_form_submitted, this, _1, _2)));
 
   request->title (_("Add a roster element"));
   request->instructions (_("Please fill in this form to add a new"
diff --git a/lib/engine/components/loudmouth/loudmouth-presentity.cpp b/lib/engine/components/loudmouth/loudmouth-presentity.cpp
index 7e85e45..0aede34 100644
--- a/lib/engine/components/loudmouth/loudmouth-presentity.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-presentity.cpp
@@ -181,7 +181,7 @@ LM::Presentity::populate_menu (Ekiga::MenuBuilder& builder)
 
   if ( !has_chat) {
 
-    builder.add_action ("chat", _("Start chat"), chat_requested);
+    builder.add_action ("chat", _("Start chat"), boost::ref (chat_requested));
   }
 
   builder.add_action ("remove", _("_Remove"),
@@ -257,7 +257,7 @@ LM::Presentity::push_presence (const std::string resource,
 void
 LM::Presentity::edit_presentity ()
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Presentity::edit_presentity_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&LM::Presentity::edit_presentity_form_submitted, this, _1, _2)));
 
   request->title (_("Edit roster element"));
   request->instructions (_("Please fill in this form to change an existing "
diff --git a/lib/engine/components/loudmouth/loudmouth-presentity.h b/lib/engine/components/loudmouth/loudmouth-presentity.h
index e90e289..7030c0e 100644
--- a/lib/engine/components/loudmouth/loudmouth-presentity.h
+++ b/lib/engine/components/loudmouth/loudmouth-presentity.h
@@ -78,7 +78,7 @@ namespace LM
 
     bool has_chat;
 
-    boost::signal<void> chat_requested;
+    boost::signal0<void> chat_requested;
 
   private:
     LmConnection* connection;
diff --git a/lib/engine/components/resource-list/rl-cluster.cpp b/lib/engine/components/resource-list/rl-cluster.cpp
index 3662ca0..9280aff 100644
--- a/lib/engine/components/resource-list/rl-cluster.cpp
+++ b/lib/engine/components/resource-list/rl-cluster.cpp
@@ -54,8 +54,8 @@ RL::Cluster::Cluster (Ekiga::ServiceCore& core_): core(core_), doc()
 
   boost::shared_ptr<Ekiga::PresenceCore> presence_core = core.get<Ekiga::PresenceCore> ("presence-core");
 
-  presence_core->presence_received.connect (boost::bind (&RL::Cluster::on_presence_received, this));
-  presence_core->status_received.connect (boost::bind (&RL::Cluster::on_status_received, this));
+  presence_core->presence_received.connect (boost::bind (&RL::Cluster::on_presence_received, this, _1, _2));
+  presence_core->status_received.connect (boost::bind (&RL::Cluster::on_status_received, this, _1, _2));
 
   c_raw = gm_conf_get_string (KEY);
 
@@ -100,8 +100,8 @@ bool
 RL::Cluster::populate_menu (Ekiga::MenuBuilder& builder)
 {
   builder.add_action ("new", _("New resource list"),
-		      boost::bind (boost::bind (&RL::Cluster::new_heap, this),
-				  "", "", "", "", "", false));
+		      boost::bind (&RL::Cluster::new_heap, this,
+				   "", "", "", "", "", false));
   return true;
 }
 
@@ -161,7 +161,7 @@ RL::Cluster::new_heap (const std::string name,
 		       const std::string user,
 		       bool writable)
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Cluster::on_new_heap_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Cluster::on_new_heap_form_submitted, this, _1, _2)));
 
   request->title (_("Add new resource-list"));
   request->instructions (_("Please fill in this form to add a new "
diff --git a/lib/engine/components/resource-list/rl-entry.cpp b/lib/engine/components/resource-list/rl-entry.cpp
index 21f71e1..cd98d4b 100644
--- a/lib/engine/components/resource-list/rl-entry.cpp
+++ b/lib/engine/components/resource-list/rl-entry.cpp
@@ -162,7 +162,7 @@ RL::Entry::refresh ()
   updated ();
 
   boost::shared_ptr<XCAP::Core> xcap = core.get<XCAP::Core> ("xcap-core");
-  xcap->read (path, boost::bind (&RL::Entry::on_xcap_answer, this));
+  xcap->read (path, boost::bind (&RL::Entry::on_xcap_answer, this, _1, _2));
 }
 
 void
diff --git a/lib/engine/components/resource-list/rl-heap.cpp b/lib/engine/components/resource-list/rl-heap.cpp
index 1d50072..5bc4035 100644
--- a/lib/engine/components/resource-list/rl-heap.cpp
+++ b/lib/engine/components/resource-list/rl-heap.cpp
@@ -264,7 +264,7 @@ RL::Heap::refresh ()
 
   doc.reset ();
 
-  xcap->read (path, boost::bind (&RL::Heap::on_document_received, this));
+  xcap->read (path, boost::bind (&RL::Heap::on_document_received, this, _1, _2));
 }
 
 void
@@ -367,10 +367,10 @@ RL::Heap::parse_list (xmlNodePtr list)
 
       PresentityPtr presentity(new Presentity (services, path, doc, child, writable));
       std::list<boost::signals::connection> conns;
-      conns.push_back (presentity->updated.connect (boost::bind (presentity_updated,presentity)));
-      conns.push_back (presentity->removed.connect (boost::bind(presentity_removed,presentity)));
+      conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity)));
+      conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity)));
       conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this)));
-      conns.push_back (presentity->questions.connect (questions.make_slot()));
+      conns.push_back (presentity->questions.connect (boost::ref (questions)));
       presentities[presentity]=conns;
       presentity_added (presentity);
       continue;
@@ -408,7 +408,7 @@ RL::Heap::push_status (const std::string uri_,
 void
 RL::Heap::edit ()
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Heap::on_edit_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Heap::on_edit_form_submitted, this, _1, _2)));
 
   std::string name_str;
   std::string root_str;
@@ -507,7 +507,7 @@ RL::Heap::on_edit_form_submitted (bool submitted,
 void
 RL::Heap::new_entry ()
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Heap::on_new_entry_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Heap::on_new_entry_form_submitted, this, _1, _2)));
 
   request->title (_("Add a remote contact"));
   request->instructions (_("Please fill in this form to create a new "
@@ -602,7 +602,7 @@ RL::Heap::on_new_entry_form_submitted (bool submitted,
     boost::shared_ptr<XCAP::Core> xcap = services.get<XCAP::Core> ("xcap-core");
     xcap->write (path, "application/xcap-el+xml",
 		 (const char*)xmlBufferContent (buffer),
-		 boost::bind (&RL::Heap::new_entry_result, this));
+		 boost::bind (&RL::Heap::new_entry_result, this, _1));
   }
   xmlBufferFree (buffer);
 }
diff --git a/lib/engine/components/resource-list/rl-list.cpp b/lib/engine/components/resource-list/rl-list.cpp
index ce165ce..f15f49d 100644
--- a/lib/engine/components/resource-list/rl-list.cpp
+++ b/lib/engine/components/resource-list/rl-list.cpp
@@ -257,7 +257,7 @@ RL::ListImpl::refresh ()
   flush ();
 
   boost::shared_ptr<XCAP::Core> xcap = core.get<XCAP::Core> ("xcap-core");
-  xcap->read (path, boost::bind (&RL::ListImpl::on_xcap_answer, this));
+  xcap->read (path, boost::bind (&RL::ListImpl::on_xcap_answer, this, _1, _2));
 }
 
 void
@@ -341,8 +341,8 @@ RL::ListImpl::parse ()
 							    display_name,
 							    doc, child));
       std::list<boost::signals::connection> conns;
-      conns.push_back (entry->updated.connect (boost::bind (entry_updated, entry)));
-      conns.push_back (entry->removed.connect (boost::bind (entry_removed, entry)));
+      conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry)));
+      conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry)));
       entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns));
       ordering.push_back (ENTRY);
       entry_pos++;
diff --git a/lib/engine/components/resource-list/rl-presentity.cpp b/lib/engine/components/resource-list/rl-presentity.cpp
index fd68e60..547bf01 100644
--- a/lib/engine/components/resource-list/rl-presentity.cpp
+++ b/lib/engine/components/resource-list/rl-presentity.cpp
@@ -213,7 +213,7 @@ RL::Presentity::populate_menu (Ekiga::MenuBuilder &builder)
 void
 RL::Presentity::edit_presentity ()
 {
-  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Presentity::edit_presentity_form_submitted, this)));
+  boost::shared_ptr<Ekiga::FormRequestSimple> request = boost::shared_ptr<Ekiga::FormRequestSimple> (new Ekiga::FormRequestSimple (boost::bind (&RL::Presentity::edit_presentity_form_submitted, this, _1, _2)));
 
   // FIXME: we should be able to know all groups in the heap
   std::set<std::string> all_groups = groups;
@@ -298,8 +298,7 @@ RL::Presentity::save (bool reload)
     boost::shared_ptr<XCAP::Core> xcap = services.get<XCAP::Core> ("xcap-core");
     xcap->write (path, "application/xcap-el+xml",
 		 (const char*)xmlBufferContent (buffer),
-		 boost::bind (boost::bind (&RL::Presentity::save_result, this),
-			     reload));
+		 boost::bind (&RL::Presentity::save_result, this, _1, reload));
   }
 
   xmlBufferFree (buffer);
@@ -317,7 +316,7 @@ RL::Presentity::remove ()
 
   boost::shared_ptr<XCAP::Core> xcap = services.get<XCAP::Core> ("xcap-core");
   xcap->erase (path,
-	       boost::bind (&RL::Presentity::erase_result, this));
+	       boost::bind (&RL::Presentity::erase_result, this, _1));
 }
 
 void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]