ekiga r6631 - in trunk: . lib/engine/gui/gtk-frontend

[dsandras svn gnome org]

Author: dsandras
Date: Sun Aug 17 18:21:39 2008
New Revision: 6631
URL: http://svn.gnome.org/viewvc/ekiga?rev=6631&view=rev

Log:
Do not display an empty status if there is none. Use correct sizes for
icons in order not to have awful icons.


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

Modified: trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	Sun Aug 17 18:21:39 2008
@@ -76,18 +76,24 @@
 on_presentity_updated (PresentityView* self)
 {
   gchar *txt = NULL;
+  GdkPixbuf *pixbuf = NULL;
 
   gtk_image_set_from_stock (GTK_IMAGE (self->priv->presence_image),
 			    self->priv->presentity->get_presence ().c_str (),
-			    GTK_ICON_SIZE_LARGE_TOOLBAR);
-  txt = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>\n<span size=\"small\">%s</span>",
-				 self->priv->presentity->get_name ().c_str (),
-				 self->priv->presentity->get_status ().c_str ());
+			    GTK_ICON_SIZE_MENU);
+  if (!self->priv->presentity->get_status ().empty ())
+    txt = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>\n<span size=\"small\">%s</span>",
+                                   self->priv->presentity->get_name ().c_str (),
+                                   self->priv->presentity->get_status ().c_str ());
+  else
+    txt = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
+                                   self->priv->presentity->get_name ().c_str ());
+
   gtk_label_set_markup (GTK_LABEL (self->priv->name_status), txt);
   g_free (txt);
   gtk_image_set_from_stock (GTK_IMAGE (self->priv->avatar_image),
 			    self->priv->presentity->get_avatar ().c_str (),
-			    GTK_ICON_SIZE_LARGE_TOOLBAR);
+			    GTK_ICON_SIZE_MENU);
 }
 
 static void