[ekiga/gnome-2-26] Made sigc::mem_fun calls look more alike for better sed-ability.

[Eugen Dedu <ededu src gnome org>]

commit 45018558c5ef4c4d50ad0a37d86392cd9eca7d9a
Author: Julien Puydt <jpuydt src gnome org>
Date:   Tue Mar 17 20:28:12 2009 +0000

    Made sigc::mem_fun calls look more alike for better sed-ability.
    
    svn path=/trunk/; revision=7778
---
 lib/engine/chat/dialect-impl.h                     |    4 +-
 .../components/avahi-publisher/avahi-publisher.cpp |    3 +-
 .../components/call-history/history-book.cpp       |    3 +-
 lib/engine/components/evolution/evolution-book.cpp |    6 +---
 .../components/evolution/evolution-contact.cpp     |    6 +---
 lib/engine/components/ldap/ldap-book.cpp           |   27 ++++++-------------
 lib/engine/components/ldap/ldap-source.cpp         |   15 +++-------
 lib/engine/components/opal/opal-call-manager.cpp   |    6 +---
 lib/engine/presence/presence-core.cpp              |    6 +---
 9 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/lib/engine/chat/dialect-impl.h b/lib/engine/chat/dialect-impl.h
index 9cbb066..6d82eef 100644
--- a/lib/engine/chat/dialect-impl.h
+++ b/lib/engine/chat/dialect-impl.h
@@ -245,7 +245,7 @@ template<typename SimpleChatType, typename MultipleChatType>
 void
 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::add_simple_chat (gmref_ptr<SimpleChatType> chat)
 {
-  simple_chats[chat].push_back (chat->removed.connect (sigc::bind (sigc::mem_fun(this, &Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed), chat)));
+  simple_chats[chat].push_back (chat->removed.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed), chat)));
   simple_chat_added.emit (chat);
 }
 
@@ -260,7 +260,7 @@ template<typename SimpleChatType, typename MultipleChatType>
 void
 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::add_multiple_chat (gmref_ptr<MultipleChatType> chat)
 {
-  multiple_chats[chat].push_back (chat->removed.connect (sigc::bind (sigc::mem_fun(this, &Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed), chat)));
+  multiple_chats[chat].push_back (chat->removed.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed), chat)));
   multiple_chat_added.emit (chat);
 }
 
diff --git a/lib/engine/components/avahi-publisher/avahi-publisher.cpp b/lib/engine/components/avahi-publisher/avahi-publisher.cpp
index cca3d59..bb1764a 100644
--- a/lib/engine/components/avahi-publisher/avahi-publisher.cpp
+++ b/lib/engine/components/avahi-publisher/avahi-publisher.cpp
@@ -72,8 +72,7 @@ Avahi::PresencePublisher::PresencePublisher (Ekiga::ServiceCore& core_,
   client(NULL), group(NULL)
 {
   display_name = details.get_display_name ();
-  details.updated.connect (sigc::mem_fun (this,
-					  &Avahi::PresencePublisher::on_details_updated));
+  details.updated.connect (sigc::mem_fun (this, &Avahi::PresencePublisher::on_details_updated));
   name = avahi_strdup (display_name.c_str ());
   glib_poll = avahi_glib_poll_new (NULL, G_PRIORITY_DEFAULT);
   create_client ();
diff --git a/lib/engine/components/call-history/history-book.cpp b/lib/engine/components/call-history/history-book.cpp
index 682b6c7..84993df 100644
--- a/lib/engine/components/call-history/history-book.cpp
+++ b/lib/engine/components/call-history/history-book.cpp
@@ -137,8 +137,7 @@ bool
 History::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
   builder.add_action ("clear",
-		      _("Clear List"), sigc::mem_fun (this,
-                                                      &History::Book::clear));
+		      _("Clear List"), sigc::mem_fun (this, &History::Book::clear));
   return true;
 }
 
diff --git a/lib/engine/components/evolution/evolution-book.cpp b/lib/engine/components/evolution/evolution-book.cpp
index 134ca75..5abd1d8 100644
--- a/lib/engine/components/evolution/evolution-book.cpp
+++ b/lib/engine/components/evolution/evolution-book.cpp
@@ -242,8 +242,7 @@ bool
 Evolution::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
   builder.add_action ("new", _("New _Contact"),
-		      sigc::mem_fun (this,
-				     &Evolution::Book::new_contact_action));
+		      sigc::mem_fun (this, &Evolution::Book::new_contact_action));
   return true;
 }
 
@@ -282,8 +281,7 @@ Evolution::Book::refresh ()
 void
 Evolution::Book::new_contact_action ()
 {
-  Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						  &Evolution::Book::on_new_contact_form_submitted));
+  Ekiga::FormRequestSimple request(sigc::mem_fun (this, &Evolution::Book::on_new_contact_form_submitted));
 
   request.title (_("New contact"));
 
diff --git a/lib/engine/components/evolution/evolution-contact.cpp b/lib/engine/components/evolution/evolution-contact.cpp
index 7231da4..d98323c 100644
--- a/lib/engine/components/evolution/evolution-contact.cpp
+++ b/lib/engine/components/evolution/evolution-contact.cpp
@@ -320,8 +320,7 @@ Evolution::Contact::set_attribute_value (unsigned int attr_type,
 void
 Evolution::Contact::edit_action ()
 {
-  Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						  &Evolution::Contact::on_edit_form_submitted));;
+  Ekiga::FormRequestSimple request(sigc::mem_fun (this, &Evolution::Contact::on_edit_form_submitted));;
 
   request.title (_("Edit contact"));
 
@@ -388,8 +387,7 @@ Evolution::Contact::on_edit_form_submitted (bool submitted,
 void
 Evolution::Contact::remove_action ()
 {
-  Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						  &Evolution::Contact::on_remove_form_submitted));;
+  Ekiga::FormRequestSimple request(sigc::mem_fun (this, &Evolution::Contact::on_remove_form_submitted));;
   gchar* instructions = NULL;
 
   request.title (_("Remove contact"));
diff --git a/lib/engine/components/ldap/ldap-book.cpp b/lib/engine/components/ldap/ldap-book.cpp
index ecd39ba..47bf059 100644
--- a/lib/engine/components/ldap/ldap-book.cpp
+++ b/lib/engine/components/ldap/ldap-book.cpp
@@ -535,8 +535,7 @@ book_saslinter(LDAP *ld, unsigned flags __attribute__((unused)),
 
   /* If there are missing items, try to get them all in one dialog */
   if (nprompts) {
-    Ekiga::FormRequestSimple request(sigc::mem_fun (ctx->book,
-						    &OPENLDAP::Book::on_sasl_form_submitted));
+    Ekiga::FormRequestSimple request(sigc::mem_fun (ctx->book, &OPENLDAP::Book::on_sasl_form_submitted));
     Ekiga::FormBuilder result;
     std::string prompt;
     std::string ctxt = "";
@@ -764,18 +763,15 @@ OPENLDAP::Book::refresh_bound ()
     gmref_ptr<Ekiga::Runtime> runtime = core.get ("runtime");
     if (patience == 3) {
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					   &OPENLDAP::Book::refresh_bound), 12);
+      runtime->run_in_main (sigc::mem_fun (this, &OPENLDAP::Book::refresh_bound), 12);
     } else if (patience == 2) {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					   &OPENLDAP::Book::refresh_bound), 21);
+      runtime->run_in_main (sigc::mem_fun (this, &OPENLDAP::Book::refresh_bound), 21);
     } else if (patience == 1) {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					   &OPENLDAP::Book::refresh_bound), 30);
+      runtime->run_in_main (sigc::mem_fun (this, &OPENLDAP::Book::refresh_bound), 30);
     } else { // patience == 0
 
       status = std::string (_("Could not connect to server"));
@@ -862,20 +858,17 @@ OPENLDAP::Book::refresh_result ()
     if (patience == 3) {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					   &OPENLDAP::Book::refresh_result),
+      runtime->run_in_main (sigc::mem_fun (this, &OPENLDAP::Book::refresh_result),
 			    12);
     } else if (patience == 2) {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					   &OPENLDAP::Book::refresh_result),
+      runtime->run_in_main (sigc::mem_fun (this, &OPENLDAP::Book::refresh_result),
 			    21);
     } else if (patience == 1) {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					   &OPENLDAP::Book::refresh_result),
+      runtime->run_in_main (sigc::mem_fun (this, &OPENLDAP::Book::refresh_result),
 			    30);
     } else { // patience == 0
 
@@ -981,8 +974,7 @@ OPENLDAP::BookForm (Ekiga::FormRequestSimple &request,
 void
 OPENLDAP::Book::edit ()
 {
-  Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						  &OPENLDAP::Book::on_edit_form_submitted));
+  Ekiga::FormRequestSimple request(sigc::mem_fun (this, &OPENLDAP::Book::on_edit_form_submitted));
 
   OPENLDAP::BookForm (request, bookinfo, std::string(_("Edit LDAP directory")));
 
@@ -1100,8 +1092,7 @@ OPENLDAP::Book::on_edit_form_submitted (bool submitted,
   try {
     std::string errmsg;
     if (OPENLDAP::BookFormInfo (result, bookinfo, errmsg)) {
-      Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						      &OPENLDAP::Book::on_edit_form_submitted));
+      Ekiga::FormRequestSimple request(sigc::mem_fun (this, &OPENLDAP::Book::on_edit_form_submitted));
 
       result.visit (request);
       request.error (errmsg);
diff --git a/lib/engine/components/ldap/ldap-source.cpp b/lib/engine/components/ldap/ldap-source.cpp
index be1b783..06b8fcb 100644
--- a/lib/engine/components/ldap/ldap-source.cpp
+++ b/lib/engine/components/ldap/ldap-source.cpp
@@ -116,8 +116,7 @@ OPENLDAP::Source::add ()
 void
 OPENLDAP::Source::common_add (gmref_ptr<Book> book)
 {
-  book->trigger_saving.connect (sigc::mem_fun (this,
-					       &OPENLDAP::Source::save));
+  book->trigger_saving.connect (sigc::mem_fun (this, &OPENLDAP::Source::save));
   add_book (book);
 }
 
@@ -125,19 +124,16 @@ bool
 OPENLDAP::Source::populate_menu (Ekiga::MenuBuilder &builder)
 {
   builder.add_action ("add", _("Add an LDAP Address Book"),
-		      sigc::mem_fun (this,
-				     &OPENLDAP::Source::new_book));
+		      sigc::mem_fun (this, &OPENLDAP::Source::new_book));
   builder.add_action ("add", _("Add the Ekiga.net Directory"),
-		      sigc::mem_fun (this,
-				     &OPENLDAP::Source::new_ekiga_net_book));
+		      sigc::mem_fun (this, &OPENLDAP::Source::new_ekiga_net_book));
   return true;
 }
 
 void
 OPENLDAP::Source::new_book ()
 {
-  Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						  &OPENLDAP::Source::on_new_book_form_submitted));
+  Ekiga::FormRequestSimple request(sigc::mem_fun (this, &OPENLDAP::Source::on_new_book_form_submitted));
 
   bookinfo.name = "";
   bookinfo.uri = "ldap://localhost/dc=net?cn,telephoneNumber?sub?(cn=$)",
@@ -189,8 +185,7 @@ OPENLDAP::Source::on_new_book_form_submitted (bool submitted,
     std::string errmsg;
 
     if (OPENLDAP::BookFormInfo (result, bookinfo, errmsg)) {
-      Ekiga::FormRequestSimple request(sigc::mem_fun (this,
-						      &OPENLDAP::Source::on_new_book_form_submitted));
+      Ekiga::FormRequestSimple request(sigc::mem_fun (this, &OPENLDAP::Source::on_new_book_form_submitted));
 
       result.visit (request);
       request.error (errmsg);
diff --git a/lib/engine/components/opal/opal-call-manager.cpp b/lib/engine/components/opal/opal-call-manager.cpp
index acec19d..c1d03a9 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -746,8 +746,7 @@ CallManager::HandleSTUNResult ()
   else {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					  &CallManager::HandleSTUNResult),
+      runtime->run_in_main (sigc::mem_fun (this, &CallManager::HandleSTUNResult),
 			    1);
   }
 }
@@ -758,8 +757,7 @@ CallManager::ReportSTUNError (const std::string error)
   // notice we're in for an infinite loop if nobody ever reports to the user!
   if ( !call_core->errors.handle_request (error)) {
 
-    runtime->run_in_main (sigc::bind (sigc::mem_fun (this,
-						     &CallManager::ReportSTUNError),
+    runtime->run_in_main (sigc::bind (sigc::mem_fun (this, &CallManager::ReportSTUNError),
 				      error),
 			  10);
   }
diff --git a/lib/engine/presence/presence-core.cpp b/lib/engine/presence/presence-core.cpp
index dc1a5dc..34b8c25 100644
--- a/lib/engine/presence/presence-core.cpp
+++ b/lib/engine/presence/presence-core.cpp
@@ -164,10 +164,8 @@ void
 Ekiga::PresenceCore::add_presence_fetcher (gmref_ptr<PresenceFetcher> fetcher)
 {
   presence_fetchers.push_back (fetcher);
-  fetcher->presence_received.connect (sigc::mem_fun (this,
-						     &Ekiga::PresenceCore::on_presence_received));
-  fetcher->status_received.connect (sigc::mem_fun (this,
-						   &Ekiga::PresenceCore::on_status_received));
+  fetcher->presence_received.connect (sigc::mem_fun (this, &Ekiga::PresenceCore::on_presence_received));
+  fetcher->status_received.connect (sigc::mem_fun (this, &Ekiga::PresenceCore::on_status_received));
   for (std::map<std::string, uri_info>::const_iterator iter
 	 = uri_infos.begin ();
        iter != uri_infos.end ();