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

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Aug 21 19:36:55 2008
New Revision: 6675
URL: http://svn.gnome.org/viewvc/ekiga?rev=6675&view=rev

Log:
Almost fixed #548750

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	Thu Aug 21 19:36:55 2008
@@ -709,9 +709,6 @@
 
   self = ROSTER_VIEW_GTK (data);
 
-  if (self->priv->show_offline_contacts)
-    return TRUE;
-
   gtk_tree_model_get (model, iter,
 		      COLUMN_TYPE, &column_type,
 		      -1);
@@ -719,25 +716,36 @@
   switch (column_type) {
 
   case TYPE_PRESENTITY:
-    gtk_tree_model_get (model, iter,
-			COLUMN_OFFLINE, &result,
-			-1);
+
+    if (self->priv->show_offline_contacts)
+      result = TRUE;
+    else
+      gtk_tree_model_get (model, iter,
+			  COLUMN_OFFLINE, &result,
+			  -1);
     break;
 
   case TYPE_GROUP:
-    result = FALSE;
-    if (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) {
-
-      do {
-
-	gtk_tree_model_get (model, &child_iter,
-			    COLUMN_OFFLINE, &result,
-			    -1);
-      } while (!result && gtk_tree_model_iter_next (model, &child_iter));
+    if (self->priv->show_offline_contacts)
+      result = TRUE;
+    else {
+
+      if (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) {
+
+	do {
+
+	  gtk_tree_model_get (model, &child_iter,
+			      COLUMN_OFFLINE, &result,
+			      -1);
+	} while (!result && gtk_tree_model_iter_next (model, &child_iter));
+      }
     }
     break;
 
   case TYPE_HEAP:
+    result = TRUE; // FIXME for 548750: gtk_tree_model_iter_has_child (model, iter);
+    break;
+
   default:
     result = TRUE;
   }