[ekiga] Simplified the code of on_presentity_added in the RosterViewGtk class



commit b5774ff3374461df9b7a2f36ef8428980e348ca1
Author: Snark <jpuydt gnome org>
Date:   Thu Nov 11 13:14:26 2010 +0100

    Simplified the code of on_presentity_added in the RosterViewGtk class
    
    That simplification is already used in the on_presentity_updated class.

 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 377b0e8..03941af 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -969,6 +969,9 @@ on_presentity_added (Ekiga::ClusterPtr /*cluster*/,
   active = presentity->get_presence () != "offline";
   away = presentity->get_presence () == "away";
 
+  if (groups.empty ())
+    groups.insert (_("Unsorted"));
+
   for (std::set<std::string>::const_iterator group = groups.begin ();
        group != groups.end ();
        group++) {
@@ -994,23 +997,6 @@ on_presentity_added (Ekiga::ClusterPtr /*cluster*/,
 			-1);
   }
 
-  if (groups.empty ()) {
-
-    roster_view_gtk_find_iter_for_group (self, heap, &heap_iter,
-					 _("Unsorted"), &group_iter);
-    roster_view_gtk_find_iter_for_presentity (self, &group_iter, presentity, &iter);
-    gtk_tree_store_set (self->priv->store, &iter,
-			COLUMN_TYPE, TYPE_PRESENTITY,
-			COLUMN_OFFLINE, active,
-			COLUMN_HEAP, heap.get (),
-			COLUMN_PRESENTITY, presentity.get (),
-			COLUMN_NAME, presentity->get_name ().c_str (),
-			COLUMN_STATUS, presentity->get_status ().c_str (),
-			COLUMN_PRESENCE, presentity->get_presence ().c_str (),
-			COLUMN_ACTIVE, active ? "black" : "gray",
-			-1);
-  }
-
   roster_view_gtk_update_groups (self, &heap_iter);
 
   GtkTreeModel* model = gtk_tree_view_get_model (self->priv->tree_view);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]