From: Xavier Claessens Date: Wed, 16 Jan 2008 15:32:30 +0000 (+0000) Subject: Change EMPATHY_AVATAR_CHOOSER_TYPE to EMPATHY_TYPE_AVATAR_CHOOSER X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b2dd9b77af7f4bbc610de71706028dc2b5181c2a Change EMPATHY_AVATAR_CHOOSER_TYPE to EMPATHY_TYPE_AVATAR_CHOOSER svn path=/trunk/; revision=562 --- diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index f9da0dd2..348186a6 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -38,7 +38,7 @@ #define DEBUG_DOMAIN "AvatarChooser" -#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_AVATAR_CHOOSER_TYPE, EmpathyAvatarChooserPriv)) +#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooserPriv)) #define AVATAR_SIZE_SAVE 96 #define AVATAR_SIZE_VIEW 64 @@ -529,7 +529,7 @@ avatar_chooser_clicked_cb (GtkWidget *button, GtkWidget * empathy_avatar_chooser_new (void) { - return g_object_new (EMPATHY_AVATAR_CHOOSER_TYPE, NULL); + return g_object_new (EMPATHY_TYPE_AVATAR_CHOOSER, NULL); } void diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h index 55b804f0..83dea2af 100644 --- a/libempathy-gtk/empathy-avatar-chooser.h +++ b/libempathy-gtk/empathy-avatar-chooser.h @@ -30,11 +30,11 @@ G_BEGIN_DECLS -#define EMPATHY_AVATAR_CHOOSER_TYPE (empathy_avatar_chooser_get_type ()) -#define EMPATHY_AVATAR_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_AVATAR_CHOOSER_TYPE, EmpathyAvatarChooser)) -#define EMPATHY_AVATAR_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_AVATAR_CHOOSER_TYPE, EmpathyAvatarChooserClass)) -#define EMPATHY_IS_AVATAR_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_AVATAR_CHOOSER_TYPE)) -#define EMPATHY_IS_AVATAR_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_AVATAR_CHOOSER_TYPE)) +#define EMPATHY_TYPE_AVATAR_CHOOSER (empathy_avatar_chooser_get_type ()) +#define EMPATHY_AVATAR_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooser)) +#define EMPATHY_AVATAR_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooserClass)) +#define EMPATHY_IS_AVATAR_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER)) +#define EMPATHY_IS_AVATAR_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER)) typedef struct _EmpathyAvatarChooser EmpathyAvatarChooser; typedef struct _EmpathyAvatarChooserClass EmpathyAvatarChooserClass;