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-presence.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-presence.c')
| -rw-r--r-- | libempathy/empathy-presence.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/libempathy/empathy-presence.c b/libempathy/empathy-presence.c index 158707a8b..136dce36a 100644 --- a/libempathy/empathy-presence.c +++ b/libempathy/empathy-presence.c @@ -29,6 +29,14 @@ #include "empathy-presence.h" #include "empathy-time.h" +/* FIXME mission-control does not install libmissioncontrol/mc-enum-types.h so + * we have to define MC_TYPE_PRESENCE here. See sf.net bug #1768235, + * https://sf.net/tracker/?func=detail&atid=932444&aid=1768235&group_id=190214 */ +#ifndef MC_TYPE_PRESENCE +GType mc_presence_get_type (void) G_GNUC_CONST; +#define MC_TYPE_PRESENCE (mc_presence_get_type()) +#endif + #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_PRESENCE, EmpathyPresencePriv)) typedef struct _EmpathyPresencePriv EmpathyPresencePriv; @@ -70,13 +78,12 @@ empathy_presence_class_init (EmpathyPresenceClass *class) g_object_class_install_property (object_class, PROP_STATE, - g_param_spec_int ("state", - "Presence State", - "The current state of the presence", - MC_PRESENCE_UNSET, - LAST_MC_PRESENCE, - MC_PRESENCE_AVAILABLE, - G_PARAM_READWRITE)); + g_param_spec_enum ("state", + "Presence State", + "The current state of the presence", + MC_TYPE_PRESENCE, + MC_PRESENCE_AVAILABLE, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_STATUS, g_param_spec_string ("status", @@ -124,7 +131,7 @@ presence_get_property (GObject *object, switch (param_id) { case PROP_STATE: - g_value_set_int (value, priv->state); + g_value_set_enum (value, priv->state); break; case PROP_STATUS: g_value_set_string (value, @@ -147,7 +154,7 @@ presence_set_property (GObject *object, switch (param_id) { case PROP_STATE: - priv->state = g_value_get_int (value); + priv->state = g_value_get_enum (value); break; case PROP_STATUS: empathy_presence_set_status (EMPATHY_PRESENCE (object), |