diff options
| -rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.c | 33 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.h | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 3 |
3 files changed, 6 insertions, 32 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 7618eaee9..bdac016e4 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -93,7 +93,6 @@ enum { enum { PROP_0, - PROP_CONTACT_FACTORY, PROP_ACCOUNT }; @@ -123,10 +122,6 @@ empathy_avatar_chooser_get_property (GObject *object, EmpathyAvatarChooserPriv *priv = GET_PRIV (object); switch (param_id) { - case PROP_CONTACT_FACTORY: - g_assert (priv->contact_factory != NULL); - g_value_set_object (value, priv->contact_factory); - break; case PROP_ACCOUNT: g_value_set_object (value, priv->account); break; @@ -143,16 +138,8 @@ empathy_avatar_chooser_set_property (GObject *object, GParamSpec *pspec) { EmpathyAvatarChooser *self = EMPATHY_AVATAR_CHOOSER (object); - EmpathyAvatarChooserPriv *priv = GET_PRIV (self); switch (param_id) { - case PROP_CONTACT_FACTORY: - priv->contact_factory = g_value_get_object (value); - - g_assert (priv->contact_factory != NULL); - g_object_ref (priv->contact_factory); - - break; case PROP_ACCOUNT: avatar_chooser_set_account (self, g_value_get_object (value)); break; @@ -181,18 +168,6 @@ empathy_avatar_chooser_class_init (EmpathyAvatarChooserClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - param_spec = g_param_spec_object ("contact-factory", - "EmpathyContactFactory instance", - "EmpathyContactFactory instance " - "(may not be NULL)", - EMPATHY_TYPE_CONTACT_FACTORY, - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - g_object_class_install_property (object_class, - PROP_CONTACT_FACTORY, - param_spec); - param_spec = g_param_spec_object ("account", "McAccount", "McAccount whose avatar should be " @@ -236,6 +211,8 @@ empathy_avatar_chooser_init (EmpathyAvatarChooser *chooser) G_CALLBACK (avatar_chooser_clicked_cb), chooser); + priv->contact_factory = empathy_contact_factory_new (); + empathy_avatar_chooser_set (chooser, NULL); } @@ -888,11 +865,9 @@ avatar_chooser_clicked_cb (GtkWidget *button, } GtkWidget * -empathy_avatar_chooser_new (EmpathyContactFactory *contact_factory) +empathy_avatar_chooser_new () { - return g_object_new (EMPATHY_TYPE_AVATAR_CHOOSER, - "contact-factory", contact_factory, - NULL); + return g_object_new (EMPATHY_TYPE_AVATAR_CHOOSER, NULL); } /* FIXME: when the avatar passed to this function actually can be relied upon to diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h index 1e1b2e090..754e19447 100644 --- a/libempathy-gtk/empathy-avatar-chooser.h +++ b/libempathy-gtk/empathy-avatar-chooser.h @@ -50,7 +50,7 @@ struct _EmpathyAvatarChooserClass { }; GType empathy_avatar_chooser_get_type (void); -GtkWidget *empathy_avatar_chooser_new (EmpathyContactFactory *contact_factory); +GtkWidget *empathy_avatar_chooser_new (void); void empathy_avatar_chooser_set (EmpathyAvatarChooser *chooser, EmpathyAvatar *avatar); void empathy_avatar_chooser_get_image_data (EmpathyAvatarChooser *chooser, diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index d0b13ea79..9f1eb964f 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -499,8 +499,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information) { if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_AVATAR) { - information->widget_avatar = empathy_avatar_chooser_new ( - information->factory); + information->widget_avatar = empathy_avatar_chooser_new (); g_signal_connect (information->widget_avatar, "changed", G_CALLBACK (contact_widget_avatar_changed_cb), information); |