Center the 'smiley images' inside the menu items

[empathy.git] / libempathy-gtk / empathy-presence-chooser.c

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 445f79b639add4cef90a092a237c4259495d3acf..da08718cbd49d0bb88e1cb0f398a7669545b4be0 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -28,6 +28,7 @@
 #include "empathy-presence-chooser.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-presence-manager.h"
 #include "empathy-status-presets.h"
@@ -272,7 +273,7 @@ get_state_and_status (EmpathyPresenceChooser *self,
 
        state = tp_account_manager_get_most_available_presence (
                priv->account_manager, NULL, &tmp);
-       if (EMP_STR_EMPTY (tmp)) {
+       if (TPAW_STR_EMPTY (tmp)) {
                /* no message, use the default message */
                g_free (tmp);
                tmp = g_strdup (empathy_presence_get_default_message (state));
@@ -827,6 +828,9 @@ presence_chooser_constructed (GObject *object)
        GtkCellRenderer *renderer;
        const gchar *status_tooltip;
 
+       if (G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->constructed)
+               G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->constructed (object);
+
        presence_chooser_create_model (chooser);
 
        gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (chooser),