diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-05-10 17:01:31 +0100 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 11:03:06 +0100 |
commit | 3abe4df5f32c37e968d0556c755b8387d9f1f771 (patch) | |
tree | ec24331ac656b5292b2c3400e3399de80aa7c79d /tp-account-widgets/tpaw-irc-server.c | |
parent | 7eae2e49e62834cfff13cc2ee10b37eaff38a6fb (diff) | |
download | telepathy-account-widgets-3abe4df5f32c37e968d0556c755b8387d9f1f771.tar.gz |
tpaw-utils: use self->priv instead of EMPATHY_GET_PRIV(self)
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'tp-account-widgets/tpaw-irc-server.c')
-rw-r--r-- | tp-account-widgets/tpaw-irc-server.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/tp-account-widgets/tpaw-irc-server.c b/tp-account-widgets/tpaw-irc-server.c index aa9b5332..f459448c 100644 --- a/tp-account-widgets/tpaw-irc-server.c +++ b/tp-account-widgets/tpaw-irc-server.c @@ -22,14 +22,14 @@ #include "tpaw-irc-server.h" #include "empathy-utils.h" +#include "tpaw-utils.h" -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, TpawIrcServer) -typedef struct +struct _TpawIrcServerPriv { gchar *address; guint port; gboolean ssl; -} TpawIrcServerPriv; +}; /* properties */ enum @@ -58,18 +58,17 @@ tpaw_irc_server_get_property (GObject *object, GParamSpec *pspec) { TpawIrcServer *self = TPAW_IRC_SERVER (object); - TpawIrcServerPriv *priv = GET_PRIV (self); switch (property_id) { case PROP_ADDRESS: - g_value_set_string (value, priv->address); + g_value_set_string (value, self->priv->address); break; case PROP_PORT: - g_value_set_uint (value, priv->port); + g_value_set_uint (value, self->priv->port); break; case PROP_SSL: - g_value_set_boolean (value, priv->ssl); + g_value_set_boolean (value, self->priv->ssl); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -84,29 +83,28 @@ tpaw_irc_server_set_property (GObject *object, GParamSpec *pspec) { TpawIrcServer *self = TPAW_IRC_SERVER (object); - TpawIrcServerPriv *priv = GET_PRIV (self); switch (property_id) { case PROP_ADDRESS: - if (tp_strdiff (priv->address, g_value_get_string (value))) + if (tp_strdiff (self->priv->address, g_value_get_string (value))) { - g_free (priv->address); - priv->address = g_value_dup_string (value); + g_free (self->priv->address); + self->priv->address = g_value_dup_string (value); g_signal_emit (object, signals[MODIFIED], 0); } break; case PROP_PORT: - if (priv->port != g_value_get_uint (value)) + if (self->priv->port != g_value_get_uint (value)) { - priv->port = g_value_get_uint (value); + self->priv->port = g_value_get_uint (value); g_signal_emit (object, signals[MODIFIED], 0); } break; case PROP_SSL: - if (priv->ssl != g_value_get_boolean (value)) + if (self->priv->ssl != g_value_get_boolean (value)) { - priv->ssl = g_value_get_boolean (value); + self->priv->ssl = g_value_get_boolean (value); g_signal_emit (object, signals[MODIFIED], 0); } break; @@ -120,9 +118,8 @@ static void tpaw_irc_server_finalize (GObject *object) { TpawIrcServer *self = TPAW_IRC_SERVER (object); - TpawIrcServerPriv *priv = GET_PRIV (self); - g_free (priv->address); + g_free (self->priv->address); G_OBJECT_CLASS (tpaw_irc_server_parent_class)->finalize (object); } @@ -130,10 +127,8 @@ tpaw_irc_server_finalize (GObject *object) static void tpaw_irc_server_init (TpawIrcServer *self) { - TpawIrcServerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - TPAW_TYPE_IRC_SERVER, TpawIrcServerPriv); - - self->priv = priv; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TPAW_TYPE_IRC_SERVER, + TpawIrcServerPriv); } static void |