diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-23 19:28:23 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-09 17:20:06 +0800 |
| commit | 5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06 (patch) | |
| tree | 83e0f7e5ce62e3bb46ce7c62d50e37b8ac221080 /src | |
| parent | 5d709fede1e2cc6e5d3d54d30a5f3aed0752994a (diff) | |
| download | gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.tar gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.tar.gz gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.tar.bz2 gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.tar.lz gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.tar.xz gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.tar.zst gsoc2013-empathy-5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06.zip | |
Move to using ->priv pointer in the object instance
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-window.c | 12 | ||||
| -rw-r--r-- | src/empathy-call-window.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index fc5568953..6ddf66a54 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -96,9 +96,6 @@ typedef enum { CAMERA_STATE_ON, } CameraState; -/* private structure */ -typedef struct _EmpathyCallWindowPriv EmpathyCallWindowPriv; - struct _EmpathyCallWindowPriv { gboolean dispose_has_run; @@ -217,9 +214,7 @@ struct _EmpathyCallWindowPriv EmpathySoundManager *sound_mgr; }; -#define GET_PRIV(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), EMPATHY_TYPE_CALL_WINDOW, \ - EmpathyCallWindowPriv)) +#define GET_PRIV(o) (EMPATHY_CALL_WINDOW (o)->priv) static void empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window); @@ -1020,7 +1015,7 @@ create_pipeline (EmpathyCallWindow *self) static void empathy_call_window_init (EmpathyCallWindow *self) { - EmpathyCallWindowPriv *priv = GET_PRIV (self); + EmpathyCallWindowPriv *priv; GtkBuilder *gui; GtkWidget *top_vbox; GtkWidget *h; @@ -1028,6 +1023,9 @@ empathy_call_window_init (EmpathyCallWindow *self) GtkWidget *page; gchar *filename; + priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EMPATHY_TYPE_CALL_WINDOW, EmpathyCallWindowPriv); + filename = empathy_file_lookup ("empathy-call-window.ui", "src"); gui = empathy_builder_get_file (filename, "call_window_vbox", &top_vbox, diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h index d02b2ed62..11237fff6 100644 --- a/src/empathy-call-window.h +++ b/src/empathy-call-window.h @@ -29,6 +29,7 @@ G_BEGIN_DECLS typedef struct _EmpathyCallWindow EmpathyCallWindow; +typedef struct _EmpathyCallWindowPriv EmpathyCallWindowPriv; typedef struct _EmpathyCallWindowClass EmpathyCallWindowClass; struct _EmpathyCallWindowClass { @@ -37,6 +38,7 @@ struct _EmpathyCallWindowClass { struct _EmpathyCallWindow { GtkWindow parent; + EmpathyCallWindowPriv *priv; }; GType empathy_call_window_get_type (void); |