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-message.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-message.c')
| -rw-r--r-- | libempathy/empathy-message.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 02103f6ba..ceecd5d55 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -27,6 +27,7 @@ #include <string.h> #include "empathy-message.h" +#include "empathy-enum-types.h" #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_MESSAGE, EmpathyMessagePriv)) @@ -103,13 +104,12 @@ empathy_message_class_init (EmpathyMessageClass *class) g_object_class_install_property (object_class, PROP_TYPE, - g_param_spec_int ("type", - "Message Type", - "The type of message", - EMPATHY_MESSAGE_TYPE_NORMAL, - EMPATHY_MESSAGE_TYPE_LAST, - EMPATHY_MESSAGE_TYPE_NORMAL, - G_PARAM_READWRITE)); + g_param_spec_enum ("type", + "Message Type", + "The type of message", + EMPATHY_TYPE_MESSAGE_TYPE, + EMPATHY_MESSAGE_TYPE_NORMAL, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_SENDER, g_param_spec_object ("sender", @@ -187,7 +187,7 @@ message_get_property (GObject *object, switch (param_id) { case PROP_TYPE: - g_value_set_int (value, priv->type); + g_value_set_enum (value, priv->type); break; case PROP_SENDER: g_value_set_object (value, priv->sender); @@ -217,7 +217,7 @@ message_set_property (GObject *object, switch (param_id) { case PROP_TYPE: empathy_message_set_type (EMPATHY_MESSAGE (object), - g_value_get_int (value)); + g_value_get_enum (value)); break; case PROP_SENDER: empathy_message_set_sender (EMPATHY_MESSAGE (object), |