aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2009-01-31 01:34:21 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-31 01:34:21 +0800
commitd057c6cd0da17c5d7c6dd2a8f4e79a3536db507e (patch)
tree84b2cd378c95270291339e293151bea61cbc03dd
parent638056b7fb08f3293d570102e2cd41f5c4a98530 (diff)
downloadgsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.tar
gsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.tar.gz
gsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.tar.bz2
gsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.tar.lz
gsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.tar.xz
gsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.tar.zst
gsoc2013-empathy-d057c6cd0da17c5d7c6dd2a8f4e79a3536db507e.zip
conform to GET_PRIV style
svn path=/trunk/; revision=2329
-rw-r--r--libempathy-gtk/empathy-contact-selector.c17
-rw-r--r--libempathy-gtk/empathy-contact-selector.h1
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