diff options
| author | Marco Barisione <marco@barisione.org> | 2007-08-08 03:03:19 +0800 |
|---|---|---|
| committer | Marco Barisione <mbari@src.gnome.org> | 2007-08-08 03:03:19 +0800 |
| commit | 2d366a83ee60c3c10395900498499e9ff081f3a2 (patch) | |
| tree | b402c16c3a9643cd05acf33802750d1accdb7930 /libempathy/empathy-contact.c | |
| parent | 57acf434c3ac37946f2a2d249eafd02a0130d75d (diff) | |
| download | gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.gz gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.bz2 gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.lz gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.xz gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.zst gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.zip | |
Remove empathy-marshal-main.c and include empathy-marshal.h from
2007-08-07 Marco Barisione <marco@barisione.org>
* libempathy/Makefile.am:
* libempathy/empathy-marshal-main.c: Remove empathy-marshal-main.c and
include empathy-marshal.h from empathy-marshal.c.
* libempathy/Makefile.am:
* libempathy-gtk/Makefile.am: Generate files for enum types with
glib-mkenums.
* libempathy/empathy-contact.c:
* libempathy/empathy-idle.c:
* libempathy/empathy-message.c:
* libempathy/empathy-presence.c:
* libempathy-gtk/empathy-main-window.c:
* libempathy-gtk/empathy-preferences.c:
* doc/libempathy-gtk/libempathy-gtk.types:
* doc/libempathy-gtk/tmpl/empathy-contact-list-store.sgml: Use
g_param_spec_enum() and g_param_spec_flags() instead of
g_param_spec_(u)int.
Fixes bug #462465.
* libempathy-gtk/empathy-contact-list-store.c:
* libempathy-gtk/empathy-contact-list-store.h: Remove
empathy_contact_list_store_sort_get_type() as it's now auto-generated
by glib-mkenums.
svn path=/trunk/; revision=234
Diffstat (limited to 'libempathy/empathy-contact.c')
| -rw-r--r-- | libempathy/empathy-contact.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 774a18f77..d3935ad6c 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -30,6 +30,7 @@ #include "empathy-contact.h" #include "empathy-utils.h" #include "empathy-debug.h" +#include "empathy-enum-types.h" #define DEBUG_DOMAIN "Contact" @@ -163,13 +164,12 @@ contact_class_init (EmpathyContactClass *class) g_object_class_install_property (object_class, PROP_SUBSCRIPTION, - g_param_spec_int ("subscription", - "Contact Subscription", - "The subscription status of the contact", - EMPATHY_SUBSCRIPTION_NONE, - EMPATHY_SUBSCRIPTION_BOTH, - EMPATHY_SUBSCRIPTION_NONE, - G_PARAM_READWRITE)); + g_param_spec_flags ("subscription", + "Contact Subscription", + "The subscription status of the contact", + EMPATHY_TYPE_SUBSCRIPTION, + EMPATHY_SUBSCRIPTION_NONE, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, @@ -261,7 +261,7 @@ contact_get_property (GObject *object, g_value_set_pointer (value, priv->groups); break; case PROP_SUBSCRIPTION: - g_value_set_int (value, priv->subscription); + g_value_set_flags (value, priv->subscription); break; case PROP_HANDLE: g_value_set_uint (value, priv->handle); @@ -312,7 +312,7 @@ contact_set_property (GObject *object, break; case PROP_SUBSCRIPTION: empathy_contact_set_subscription (EMPATHY_CONTACT (object), - g_value_get_int (value)); + g_value_get_flags (value)); break; case PROP_HANDLE: empathy_contact_set_handle (EMPATHY_CONTACT (object), |