[ekiga] Cosmetic changes

[Eugen Dedu <ededu src gnome org>]

commit 0870de9e5bba06271055a835950abc47adce805b
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Apr 5 10:10:42 2011 +0200

    Cosmetic changes

 plugins/resource-list/rl-entry-ref.cpp  |    7 ++---
 plugins/resource-list/rl-entry.cpp      |   12 ++++------
 plugins/resource-list/rl-presentity.cpp |   34 +++++++++++++++---------------
 3 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/plugins/resource-list/rl-entry-ref.cpp b/plugins/resource-list/rl-entry-ref.cpp
index cba9a8b..30726c8 100644
--- a/plugins/resource-list/rl-entry-ref.cpp
+++ b/plugins/resource-list/rl-entry-ref.cpp
@@ -58,8 +58,8 @@ RL::EntryRef::EntryRef (Ekiga::ServiceCore& core_,
 
 
     if (child->type == XML_ELEMENT_NODE
-	&& child->name != NULL
-	&& xmlStrEqual (BAD_CAST "display-name", child->name)) {
+        && child->name != NULL
+        && xmlStrEqual (BAD_CAST "display-name", child->name)) {
 
       name_node = child;
     }
@@ -139,8 +139,7 @@ RL::EntryRef::populate_menu (Ekiga::MenuBuilder& builder)
 		      boost::bind (&RL::EntryRef::refresh, this));
 
   if ( !uri.empty ())
-    populated = presence_core->populate_presentity_menu (Ekiga::PresentityPtr (this), uri, builder)
-      || populated;
+    populated = presence_core->populate_presentity_menu (Ekiga::PresentityPtr (this), uri, builder);
 
   return populated;
 }
diff --git a/plugins/resource-list/rl-entry.cpp b/plugins/resource-list/rl-entry.cpp
index f442105..7dd09d7 100644
--- a/plugins/resource-list/rl-entry.cpp
+++ b/plugins/resource-list/rl-entry.cpp
@@ -161,8 +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;
+    populated = presence_core->populate_presentity_menu (Ekiga::PresentityPtr (this, null_deleter ()), uri, builder);
 
   return populated;
 }
@@ -197,8 +196,8 @@ RL::Entry::on_xcap_answer (bool error,
 
     node = xmlDocGetRootElement (doc.get ());
     if (node == NULL
-	|| node->name == NULL
-	|| !xmlStrEqual (BAD_CAST "entry", node->name)) {
+        || node->name == NULL
+        || !xmlStrEqual (BAD_CAST "entry", node->name)) {
 
       set_status (_("Invalid server data"));
     } else {
@@ -215,10 +214,9 @@ RL::Entry::parse ()
 {
   for (xmlNodePtr child = node->children; child != NULL; child = child->next) {
 
-
     if (child->type == XML_ELEMENT_NODE
-	&& child->name != NULL
-	&& xmlStrEqual (BAD_CAST "display-name", child->name)) {
+        && child->name != NULL
+        && xmlStrEqual (BAD_CAST "display-name", child->name)) {
 
       name_node = child;
     }
diff --git a/plugins/resource-list/rl-presentity.cpp b/plugins/resource-list/rl-presentity.cpp
index 8a90b83..fe254a2 100644
--- a/plugins/resource-list/rl-presentity.cpp
+++ b/plugins/resource-list/rl-presentity.cpp
@@ -66,7 +66,7 @@ RL::Presentity::Presentity (Ekiga::ServiceCore &services_,
   boost::shared_ptr<Ekiga::PresenceCore> presence_core(services.get<Ekiga::PresenceCore> ("presence-core"));
   xmlChar *xml_str = NULL;
   xmlNsPtr ns = xmlSearchNsByHref (doc.get (), node,
-				   BAD_CAST "http://www.ekiga.org";);
+                                   BAD_CAST "http://www.ekiga.org";);
 
   if (ns == NULL) {
 
@@ -94,25 +94,25 @@ RL::Presentity::Presentity (Ekiga::ServiceCore &services_,
 
       if (xmlStrEqual (BAD_CAST ("display-name"), child->name)) {
 
-	name_node = child;
-	continue;
+        name_node = child;
+        continue;
       }
       else if (xmlStrEqual (BAD_CAST ("group"), child->name)
-	       && child->ns == ns) {
+               && child->ns == ns) {
 
         xml_str = xmlNodeGetContent (child);
-	if (xml_str != NULL)
-	  group_nodes[(const char *)xml_str] = child;
-	else
-	  group_nodes[""] = child;
+        if (xml_str != NULL)
+          group_nodes[(const char *)xml_str] = child;
+        else
+          group_nodes[""] = child;
         xmlFree (xml_str);
-	continue;
+        continue;
       }
     }
   }
 
   for (std::map<std::string, xmlNodePtr>::const_iterator iter
-	 = group_nodes.begin ();
+         = group_nodes.begin ();
        iter != group_nodes.end ();
        iter++)
     groups.insert (iter->first);
@@ -229,12 +229,12 @@ RL::Presentity::edit_presentity ()
 
   request->title (_("Edit remote contact"));
   request->instructions (_("Please fill in this form to change an existing "
-			  "contact on a remote server"));
+                           "contact on a remote server"));
   request->text ("name", _("Name:"), get_name (), std::string ());
   request->text ("uri", _("Address:"), uri, std::string ());
 
   request->editable_set ("groups", _("Choose groups:"),
-			groups, all_groups);
+                         groups, all_groups);
 
   questions (request);
 }
@@ -252,7 +252,7 @@ RL::Presentity::edit_presentity_form_submitted (bool submitted,
   const std::set<std::string> new_groups = result.editable_set ("groups");
   std::map<std::string, xmlNodePtr> future_group_nodes;
   xmlNsPtr ns = xmlSearchNsByHref (node->doc, node,
-				   BAD_CAST "http://www.ekiga.org";);
+                                   BAD_CAST "http://www.ekiga.org";);
   bool reload = false;
 
   robust_xmlNodeSetContent (node, &name_node, "name", new_name);
@@ -266,7 +266,7 @@ RL::Presentity::edit_presentity_form_submitted (bool submitted,
   }
 
   for (std::map<std::string, xmlNodePtr>::const_iterator iter
-	 = group_nodes.begin ();
+         = group_nodes.begin ();
        iter != group_nodes.end () ;
        iter++) {
 
@@ -306,8 +306,8 @@ 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 (&RL::Presentity::save_result, this, _1, reload));
+                 (const char*)xmlBufferContent (buffer),
+                 boost::bind (&RL::Presentity::save_result, this, _1, reload));
   }
 
   xmlBufferFree (buffer);
@@ -325,7 +325,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, _1));
+               boost::bind (&RL::Presentity::erase_result, this, _1));
 }
 
 void