#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
#include "empathy-roster-contact.h"
-#include "empathy-utils.h"
+#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
-#include "empathy-images.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
-G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
+G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_LIST_BOX_ROW)
#define AVATAR_SIZE 48
if (pixbuf == NULL)
{
- pixbuf = empathy_pixbuf_from_icon_name_sized (
- EMPATHY_IMAGE_AVATAR_DEFAULT, AVATAR_SIZE);
+ pixbuf = tpaw_pixbuf_from_icon_name_sized (
+ TPAW_IMAGE_AVATAR_DEFAULT, AVATAR_SIZE);
}
gtk_image_set_from_pixbuf (GTK_IMAGE (self->priv->avatar), pixbuf);
static void
empathy_roster_contact_init (EmpathyRosterContact *self)
{
- GtkWidget *main_box, *box, *first_line_box;
+ GtkWidget *alig, *main_box, *box, *first_line_box;
GtkStyleContext *context;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_ROSTER_CONTACT, EmpathyRosterContactPriv);
+ alig = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alig);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alig), 4, 4, 4, 12);
+
main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
/* Avatar */
FALSE, FALSE, 0);
gtk_widget_show (self->priv->presence_icon);
- gtk_container_add (GTK_CONTAINER (self), main_box);
+ gtk_container_add (GTK_CONTAINER (self), alig);
+ gtk_container_add (GTK_CONTAINER (alig), main_box);
gtk_widget_show (main_box);
}
return g_object_new (EMPATHY_TYPE_ROSTER_CONTACT,
"individual", individual,
"group", group,
- "bottom-padding", 4,
- "top-padding", 4,
- "left-padding", 4,
- "right-padding", 12,
NULL);
}