empathy r2329 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan 30 17:34:21 2009
New Revision: 2329
URL: http://svn.gnome.org/viewvc/empathy?rev=2329&view=rev

Log:
conform to GET_PRIV style

Modified:
   trunk/libempathy-gtk/empathy-contact-selector.c
   trunk/libempathy-gtk/empathy-contact-selector.h

Modified: trunk/libempathy-gtk/empathy-contact-selector.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-selector.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-selector.c	Fri Jan 30 17:34:21 2009
@@ -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 @@
 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;
 }
 
 

Modified: trunk/libempathy-gtk/empathy-contact-selector.h
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-selector.h	(original)
+++ trunk/libempathy-gtk/empathy-contact-selector.h	Fri Jan 30 17:34:21 2009
@@ -49,6 +49,7 @@
 struct _EmpathyContactSelector
 {
   GtkComboBox parent;
+  gpointer priv;
 };
 
 struct _EmpathyContactSelectorClass