[ekiga/ds-gtk-application] Revert "Roster: Fixed roster displaying only one line of info."

[Damien Sandras <dsandras src gnome org>]

commit e595525404837834836538d168cef823b89f6e86
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.
    
    Conflicts:
        lib/engine/gui/gtk-frontend/roster-view-gtk.cpp

 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp |   15 ++-------------
 lib/gui/gm-cell-renderer-bitext.c               |    2 --
 2 files changed, 2 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 433339e..95f17d2 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -1066,7 +1066,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;
 
@@ -1126,17 +1125,7 @@ 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_style_context_get_color (gtk_widget_get_style_context (GTK_WIDGET (self->priv->tree_view)),
                                  (!active||away)?GTK_STATE_FLAG_INSENSITIVE:GTK_STATE_FLAG_NORMAL,
                                  &color);
@@ -1146,7 +1135,7 @@ on_presentity_added (RosterViewGtk* self,
                         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, &color, -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 e8ac54f..57fca52 100644
--- a/lib/gui/gm-cell-renderer-bitext.c
+++ b/lib/gui/gm-cell-renderer-bitext.c
@@ -249,8 +249,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