2 files changed, 11 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-selector.c b/libempathy-gtk/empathy-contact-selector.c
index 322fedc24..517ab1a58 100644
--- a/libempathy-gtk/empathy-contact-selector.c
+++ b/libempathy-gtk/empathy-contact-selector.c
@@ -27,27 +27,25 @@
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy-gtk/empathy-contact-list-store.h>
+#include <libempathy/empathy-utils.h>
+
 #include "empathy-contact-selector.h"
 
 G_DEFINE_TYPE (EmpathyContactSelector, empathy_contact_selector,
     GTK_TYPE_COMBO_BOX)
 
-#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE \
-    ((object), EMPATHY_TYPE_CONTACT_SELECTOR, EmpathyContactSelectorPriv))
-
 enum
 {
   PROP_0,
   PROP_STORE
 };
 
-typedef struct _EmpathyContactSelectorPriv EmpathyContactSelectorPriv;
-
-struct _EmpathyContactSelectorPriv
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactSelector)
+typedef struct
 {
   EmpathyContactListStore *store;
   gboolean is_blank_set;
-};
+} EmpathyContactSelectorPriv;
 
 static void changed_cb (GtkComboBox *widget, gpointer data);
 
@@ -288,6 +286,11 @@ empathy_contact_selector_constructor (GType type,
 static void
 empathy_contact_selector_init (EmpathyContactSelector *empathy_contact_selector)
 {
+  EmpathyContactSelectorPriv *priv =
+      G_TYPE_INSTANCE_GET_PRIVATE (empathy_contact_selector,
+      EMPATHY_TYPE_CONTACT_SELECTOR, EmpathyContactSelectorPriv);
+
+  empathy_contact_selector->priv = priv;
 }
 
 
diff --git a/libempathy-gtk/empathy-contact-selector.h b/libempathy-gtk/empathy-contact-selector.h
index c7e30e363..1418f7cd3 100644
--- a/libempathy-gtk/empathy-contact-selector.h
+++ b/libempathy-gtk/empathy-contact-selector.h
@@ -49,6 +49,7 @@ typedef struct _EmpathyContactSelectorClass EmpathyContactSelectorClass;
 struct _EmpathyContactSelector
 {
   GtkComboBox parent;
+  gpointer priv;
 };
 
 struct _EmpathyContactSelectorClass