ekiga r6518 - in trunk: . lib/engine/addressbook/skel lib/engine/framework lib/engine/presence/skel

[jpuydt svn gnome org]

Author: jpuydt
Date: Sat Jul 26 00:53:37 2008
New Revision: 6518
URL: http://svn.gnome.org/viewvc/ekiga?rev=6518&view=rev

Log:
Fixed huge small bugs in some populate menu methods

Modified:
   trunk/ChangeLog
   trunk/lib/engine/addressbook/skel/contact-core.cpp
   trunk/lib/engine/framework/menu-builder-tools.cpp
   trunk/lib/engine/presence/skel/presence-core.cpp

Modified: trunk/lib/engine/addressbook/skel/contact-core.cpp
==============================================================================
--- trunk/lib/engine/addressbook/skel/contact-core.cpp	(original)
+++ trunk/lib/engine/addressbook/skel/contact-core.cpp	Sat Jul 26 00:53:37 2008
@@ -165,7 +165,7 @@
        iter != contact_decorators.end ();
        iter++) {
 
-    populated = (*iter)->populate_menu (contact, uri, builder);
+    populated = (*iter)->populate_menu (contact, uri, builder) || populated;
   }
 
   return populated;

Modified: trunk/lib/engine/framework/menu-builder-tools.cpp
==============================================================================
--- trunk/lib/engine/framework/menu-builder-tools.cpp	(original)
+++ trunk/lib/engine/framework/menu-builder-tools.cpp	Sat Jul 26 00:53:37 2008
@@ -223,7 +223,7 @@
   for (std::list<TemporaryMenuBuilderHelper*>::iterator iter = helpers.begin ();
        iter != helpers.end ();
        ++iter)
-    result = result || (*iter)->populate_menu (builder);
+    result =  (*iter)->populate_menu (builder) || result;
 
   clear ();
 

Modified: trunk/lib/engine/presence/skel/presence-core.cpp
==============================================================================
--- trunk/lib/engine/presence/skel/presence-core.cpp	(original)
+++ trunk/lib/engine/presence/skel/presence-core.cpp	Sat Jul 26 00:53:37 2008
@@ -177,7 +177,7 @@
        iter != presentity_decorators.end ();
        iter++) {
 
-    populated = (*iter)->populate_menu (presentity, uri, builder);
+    populated = (*iter)->populate_menu (presentity, uri, builder) || populated;
   }
 
   return populated;