aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-call-window.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-23 19:28:23 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:06 +0800
commit5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06 (patch)
tree83e0f7e5ce62e3bb46ce7c62d50e37b8ac221080 /src/empathy-call-window.c
parent5d709fede1e2cc6e5d3d54d30a5f3aed0752994a (diff)
downloadgsoc2013-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/empathy-call-window.c')
-rw-r--r--src/empathy-call-window.c12
1 files changed, 5 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,