aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2010-12-07 19:10:15 +0800
committerJonny Lamb <jonnylamb@gnome.org>2011-01-26 21:30:37 +0800
commit4b5a64796f740656f689d6289ad608788a85d35b (patch)
treea2d8a2bfc1c06613537d169edb629e7c00a351df
parent4ba3f6143c754159d00ce5c058ff6621b8ea59fc (diff)
downloadgsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.tar
gsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.tar.gz
gsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.tar.bz2
gsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.tar.lz
gsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.tar.xz
gsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.tar.zst
gsoc2013-empathy-4b5a64796f740656f689d6289ad608788a85d35b.zip
password-dialog: stop using GET_PRIV
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
-rw-r--r--libempathy-gtk/empathy-password-dialog.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index aebd8f6bc..3c514ee82 100644
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -30,8 +30,6 @@
G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
GTK_TYPE_MESSAGE_DIALOG)
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPasswordDialog);
-
enum {
PROP_HANDLER = 1,
@@ -55,7 +53,7 @@ empathy_password_dialog_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- EmpathyPasswordDialogPriv *priv = GET_PRIV (object);
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (object)->priv;
switch (property_id)
{
@@ -74,7 +72,7 @@ empathy_password_dialog_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyPasswordDialogPriv *priv = GET_PRIV (object);
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (object)->priv;
switch (property_id)
{
@@ -91,7 +89,7 @@ empathy_password_dialog_set_property (GObject *object,
static void
empathy_password_dialog_dispose (GObject *object)
{
- EmpathyPasswordDialogPriv *priv = GET_PRIV (object);
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (object)->priv;
if (priv->dispose_run)
return;
@@ -108,7 +106,7 @@ password_dialog_response_cb (GtkDialog *dialog,
gint response,
gpointer user_data)
{
- EmpathyPasswordDialogPriv *priv = GET_PRIV (user_data);
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
if (response == GTK_RESPONSE_OK)
{
@@ -150,7 +148,7 @@ password_dialog_grab_keyboard (GtkWidget *widget,
GdkEvent *event,
gpointer user_data)
{
- EmpathyPasswordDialogPriv *priv = GET_PRIV (user_data);
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
if (!priv->grabbing)
{
@@ -171,7 +169,7 @@ password_dialog_ungrab_keyboard (GtkWidget *widget,
GdkEvent *event,
gpointer user_data)
{
- EmpathyPasswordDialogPriv *priv = GET_PRIV (user_data);
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
if (priv->grabbing)
{
@@ -215,7 +213,7 @@ empathy_password_dialog_constructed (GObject *object)
gchar *text;
dialog = EMPATHY_PASSWORD_DIALOG (object);
- priv = GET_PRIV (dialog);
+ priv = dialog->priv;
g_assert (priv->handler != NULL);