[ekiga] Revert "Roster: Fixed roster displaying only one line of info."

[Eugen Dedu <ededu src gnome org>]

commit ce9a48460554bc7d2fd232f92f2186cb364d10f7
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date:   Mon Aug 4 01:22:12 2014 +0200

    Revert "Roster: Fixed roster displaying only one line of info."
    
    This reverts commit d7238451a251d85be98df3500986b3d3c64a8ddc.  With
    current version of gtk+, this bug is fixed without this commit.

 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp |   14 +-------------
 lib/gui/gm-cell-renderer-bitext.c               |    2 --
 2 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 1754717..da8f973 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -1017,7 +1017,6 @@ on_presentity_added (RosterViewGtk* self,
   bool active = false;
   bool away = false;
   guint timeout = 0;
-  std::string status;
   gchar *old_presence = NULL;
   gboolean should_emit = FALSE;
 
@@ -1077,24 +1076,13 @@ on_presentity_added (RosterViewGtk* self,
                             -1);
       }
     }
-    status = presentity->get_status ();
-    if (status.empty ()) {
-      if (presentity->get_presence () == "away")
-        status = _("Away");
-      else if (presentity->get_presence () == "available")
-        status = _("Available");
-      else if (presentity->get_presence () == "offline")
-        status = _("Offline");
-      else if (presentity->get_presence () == "busy")
-        status = _("Busy");
-    }
     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, status.c_str (),
+                        COLUMN_STATUS, presentity->get_status ().c_str (),
                         COLUMN_PRESENCE, presentity->get_presence ().c_str (),
                         COLUMN_ACTIVE, (!active || away) ? "gray" : "black", -1);
     gtk_tree_model_get (GTK_TREE_MODEL (self->priv->store), &iter,
diff --git a/lib/gui/gm-cell-renderer-bitext.c b/lib/gui/gm-cell-renderer-bitext.c
index 26ac7c4..111669e 100644
--- a/lib/gui/gm-cell-renderer-bitext.c
+++ b/lib/gui/gm-cell-renderer-bitext.c
@@ -234,8 +234,6 @@ gm_cell_renderer_bitext_init (GmCellRendererBitext* self)
                                            GmCellRendererBitextPrivate);
   self->priv->primary_text = g_strdup ("");
   self->priv->secondary_text = g_strdup ("");
-
-  gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (self), 2);
 }
 
 static void