ekiga r7778 - in trunk/lib/engine: chat components/avahi-publisher components/call-history components/evolution components/ldap components/opal presence

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Mar 17 20:28:12 2009
New Revision: 7778
URL: http://svn.gnome.org/viewvc/ekiga?rev=7778&view=rev

Log:
Made sigc::mem_fun calls look more alike for better sed-ability.

Modified:
   trunk/lib/engine/chat/dialect-impl.h
   trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp
   trunk/lib/engine/components/call-history/history-book.cpp
   trunk/lib/engine/components/evolution/evolution-book.cpp
   trunk/lib/engine/components/evolution/evolution-contact.cpp
   trunk/lib/engine/components/ldap/ldap-book.cpp
   trunk/lib/engine/components/ldap/ldap-source.cpp
   trunk/lib/engine/components/opal/opal-call-manager.cpp
   trunk/lib/engine/presence/presence-core.cpp

Modified: trunk/lib/engine/chat/dialect-impl.h
==============================================================================
--- trunk/lib/engine/chat/dialect-impl.h	(original)
+++ trunk/lib/engine/chat/dialect-impl.h	Tue Mar 17 20:28:12 2009
@@ -245,7 +245,7 @@
 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 @@
 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);
 }
 

Modified: trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp
==============================================================================
--- trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp	(original)
+++ trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp	Tue Mar 17 20:28:12 2009
@@ -72,8 +72,7 @@
   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 ();

Modified: trunk/lib/engine/components/call-history/history-book.cpp
==============================================================================
--- trunk/lib/engine/components/call-history/history-book.cpp	(original)
+++ trunk/lib/engine/components/call-history/history-book.cpp	Tue Mar 17 20:28:12 2009
@@ -137,8 +137,7 @@
 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;
 }
 

Modified: trunk/lib/engine/components/evolution/evolution-book.cpp
==============================================================================
--- trunk/lib/engine/components/evolution/evolution-book.cpp	(original)
+++ trunk/lib/engine/components/evolution/evolution-book.cpp	Tue Mar 17 20:28:12 2009
@@ -242,8 +242,7 @@
 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 @@
 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"));
 

Modified: trunk/lib/engine/components/evolution/evolution-contact.cpp
==============================================================================
--- trunk/lib/engine/components/evolution/evolution-contact.cpp	(original)
+++ trunk/lib/engine/components/evolution/evolution-contact.cpp	Tue Mar 17 20:28:12 2009
@@ -320,8 +320,7 @@
 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 @@
 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"));

Modified: trunk/lib/engine/components/ldap/ldap-book.cpp
==============================================================================
--- trunk/lib/engine/components/ldap/ldap-book.cpp	(original)
+++ trunk/lib/engine/components/ldap/ldap-book.cpp	Tue Mar 17 20:28:12 2009
@@ -535,8 +535,7 @@
 
   /* 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 @@
     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 @@
     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 @@
 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 @@
   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);

Modified: trunk/lib/engine/components/ldap/ldap-source.cpp
==============================================================================
--- trunk/lib/engine/components/ldap/ldap-source.cpp	(original)
+++ trunk/lib/engine/components/ldap/ldap-source.cpp	Tue Mar 17 20:28:12 2009
@@ -116,8 +116,7 @@
 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 @@
 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 @@
     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);

Modified: trunk/lib/engine/components/opal/opal-call-manager.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-call-manager.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-call-manager.cpp	Tue Mar 17 20:28:12 2009
@@ -744,8 +744,7 @@
   else {
 
       patience--;
-      runtime->run_in_main (sigc::mem_fun (this,
-					  &CallManager::HandleSTUNResult),
+      runtime->run_in_main (sigc::mem_fun (this, &CallManager::HandleSTUNResult),
 			    1);
   }
 }
@@ -756,8 +755,7 @@
   // 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);
   }

Modified: trunk/lib/engine/presence/presence-core.cpp
==============================================================================
--- trunk/lib/engine/presence/presence-core.cpp	(original)
+++ trunk/lib/engine/presence/presence-core.cpp	Tue Mar 17 20:28:12 2009
@@ -164,10 +164,8 @@
 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 ();