ekiga r6431 - trunk/lib/engine/gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Wed Jul  2 11:34:19 2008
New Revision: 6431
URL: http://svn.gnome.org/viewvc/ekiga?rev=6431&view=rev

Log:
Simplified the code, which fixed #540876

Modified:
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	Wed Jul  2 11:34:19 2008
@@ -539,11 +539,13 @@
   gboolean result = FALSE;
   RosterViewGtk *self = NULL;
   GtkTreeIter child_iter;
-  gboolean offline = TRUE;
   gint column_type;
 
   self = ROSTER_VIEW_GTK (data);
 
+  if (self->priv->show_offline_contacts)
+    return TRUE;
+
   gtk_tree_model_get (model, iter,
 		      COLUMN_TYPE, &column_type,
 		      -1);
@@ -552,9 +554,8 @@
 
   case TYPE_PRESENTITY:
     gtk_tree_model_get (model, iter,
-			COLUMN_OFFLINE, &offline,
+			COLUMN_OFFLINE, &result,
 			-1);
-    result = self->priv->show_offline_contacts || offline;
     break;
 
   case TYPE_GROUP:
@@ -564,9 +565,8 @@
       do {
 
 	gtk_tree_model_get (model, &child_iter,
-			    COLUMN_OFFLINE, &offline,
+			    COLUMN_OFFLINE, &result,
 			    -1);
-	result = self->priv->show_offline_contacts || offline;
       } while (!result && gtk_tree_model_iter_next (model, &child_iter));
     }
     break;