From cee3717ee97bfd4a3a116c4dd4d49a8d25c5c8d1 Mon Sep 17 00:00:00 2001 From: Cosimo Alfarano Date: Fri, 12 Feb 2010 15:54:59 +0000 Subject: Fix prop's getters/setters and flags --- telepathy-logger/channel.c | 12 ++++++------ telepathy-logger/contact.c | 20 +++++++++++--------- telepathy-logger/log-entry-text.c | 23 ++++++++++++----------- telepathy-logger/log-entry.c | 36 ++++++++++++++++-------------------- telepathy-logger/log-store-empathy.c | 12 ++++++------ telepathy-logger/observer.c | 5 ++--- 6 files changed, 53 insertions(+), 55 deletions(-) diff --git a/telepathy-logger/channel.c b/telepathy-logger/channel.c index 36b947c..e3b9813 100644 --- a/telepathy-logger/channel.c +++ b/telepathy-logger/channel.c @@ -61,7 +61,7 @@ enum }; static void -get_prop (GObject *object, +tpl_observer_get_property (GObject *object, guint param_id, GValue *value, GParamSpec *pspec) @@ -80,7 +80,7 @@ get_prop (GObject *object, } static void -set_prop (GObject *object, +tpl_observer_set_property (GObject *object, guint param_id, const GValue *value, GParamSpec *pspec) @@ -123,8 +123,8 @@ tpl_channel_class_init (TplChannelClass *klass) object_class->dispose = tpl_channel_dispose; object_class->finalize = tpl_channel_finalize; - object_class->get_property = get_prop; - object_class->set_property = set_prop; + object_class->get_property = tpl_observer_get_property; + object_class->set_property = tpl_observer_set_property; klass->call_when_ready_protected = call_when_ready_protected; @@ -135,8 +135,8 @@ tpl_channel_class_init (TplChannelClass *klass) */ param_spec = g_param_spec_object ("account", "Account", "TpAccount instance associated with TplChannel", - TP_TYPE_ACCOUNT, G_PARAM_READABLE | G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + TP_TYPE_ACCOUNT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ACCOUNT, param_spec); g_type_class_add_private (object_class, sizeof (TplChannelPriv)); diff --git a/telepathy-logger/contact.c b/telepathy-logger/contact.c index 8258eaa..6b008b3 100644 --- a/telepathy-logger/contact.c +++ b/telepathy-logger/contact.c @@ -87,7 +87,9 @@ tpl_contact_dispose (GObject *obj) static void -tpl_contact_get_prop (GObject *object, guint param_id, GValue *value, +tpl_contact_get_property (GObject *object, + guint param_id, + GValue *value, GParamSpec *pspec) { TplContactPriv *priv = GET_PRIV (object); @@ -117,7 +119,7 @@ tpl_contact_get_prop (GObject *object, guint param_id, GValue *value, static void -tpl_contact_set_prop (GObject *object, guint param_id, const GValue *value, +tpl_contact_set_property (GObject *object, guint param_id, const GValue *value, GParamSpec *pspec) { TplContact *self = TPL_CONTACT (object); @@ -154,8 +156,8 @@ static void tpl_contact_class_init (TplContactClass *klass) object_class->finalize = tpl_contact_finalize; object_class->dispose = tpl_contact_dispose; - object_class->get_property = tpl_contact_get_prop; - object_class->set_property = tpl_contact_set_prop; + object_class->get_property = tpl_contact_get_property; + object_class->set_property = tpl_contact_set_property; /** * TplContact:identifier: @@ -166,7 +168,7 @@ static void tpl_contact_class_init (TplContactClass *klass) "Identifier", "The contact's identifier", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_IDENTIFIER, param_spec); /** @@ -178,7 +180,7 @@ static void tpl_contact_class_init (TplContactClass *klass) "Alias", "The contact's alias", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ALIAS, param_spec); /** @@ -190,7 +192,7 @@ static void tpl_contact_class_init (TplContactClass *klass) "PresenceStatus", "The contact's presence status string", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ALIAS, param_spec); /** @@ -202,7 +204,7 @@ static void tpl_contact_class_init (TplContactClass *klass) "PresenceMessage", "The contact's presence message", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ALIAS, param_spec); /** @@ -214,7 +216,7 @@ static void tpl_contact_class_init (TplContactClass *klass) "AvatarToken", "The contact's avatar's token", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ALIAS, param_spec); g_type_class_add_private (object_class, sizeof (TplContactPriv)); diff --git a/telepathy-logger/log-entry-text.c b/telepathy-logger/log-entry-text.c index 24d838a..d3cc79a 100644 --- a/telepathy-logger/log-entry-text.c +++ b/telepathy-logger/log-entry-text.c @@ -43,8 +43,7 @@ struct _TplLogEntryTextPriv enum { - PROP0, - PROP_MESSAGE_TYPE, + PROP_MESSAGE_TYPE = 1, PROP_MESSAGE, PROP_TPL_CHANNEL_TEXT }; @@ -77,7 +76,9 @@ tpl_log_entry_text_finalize (GObject * obj) static void -tpl_log_entry_text_get_prop (GObject *object, guint param_id, GValue *value, +tpl_log_entry_text_get_prop (GObject *object, + guint param_id, + GValue *value, GParamSpec *pspec) { TplLogEntryTextPriv *priv = GET_PRIV (object); @@ -96,12 +97,14 @@ tpl_log_entry_text_get_prop (GObject *object, guint param_id, GValue *value, default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; - }; + } } static void -tpl_log_entry_text_set_prop (GObject *object, guint param_id, const GValue *value, +tpl_log_entry_text_set_prop (GObject *object, + guint param_id, + const GValue *value, GParamSpec *pspec) { TplLogEntryText *self = TPL_LOG_ENTRY_TEXT (object); @@ -138,22 +141,20 @@ static void tpl_log_entry_text_class_init (TplLogEntryTextClass * klass) param_spec = g_param_spec_uint ("message-type", "MessageType", "The message type for a Text log entry", - 0, G_MAXUINT32, TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + 0, G_MAXUINT32, TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL, G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_MESSAGE_TYPE, param_spec); param_spec = g_param_spec_string ("message", "Message", "The text message of the log entry", - NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_MESSAGE, param_spec); param_spec = g_param_spec_object ("tpl-channel-text", "TplChannelText", "The TplChannelText instance associated with the log entry, if any", - TPL_TYPE_CHANNEL_TEXT, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + TPL_TYPE_CHANNEL_TEXT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_TPL_CHANNEL_TEXT, param_spec); g_type_class_add_private (object_class, sizeof (TplLogEntryTextPriv)); diff --git a/telepathy-logger/log-entry.c b/telepathy-logger/log-entry.c index 984c9d4..e25fde1 100644 --- a/telepathy-logger/log-entry.c +++ b/telepathy-logger/log-entry.c @@ -59,8 +59,7 @@ struct _TplLogEntryPriv }; enum { - PROP0, - PROP_TIMESTAMP, + PROP_TIMESTAMP = 1, PROP_SIGNAL_TYPE, PROP_LOG_ID, PROP_DIRECTION, @@ -98,7 +97,7 @@ tpl_log_entry_dispose (GObject *obj) static void -get_prop (GObject *object, +tpl_log_entry_get_property (GObject *object, guint param_id, GValue *value, GParamSpec *pspec) @@ -136,7 +135,7 @@ get_prop (GObject *object, static void -set_prop (GObject *object, +tpl_log_entry_set_property (GObject *object, guint param_id, const GValue *value, GParamSpec *pspec) @@ -181,56 +180,53 @@ tpl_log_entry_class_init (TplLogEntryClass *klass) /* to be used by subclasses */ object_class->finalize = tpl_log_entry_finalize; object_class->dispose = tpl_log_entry_dispose; - object_class->get_property = get_prop; - object_class->set_property = set_prop; + object_class->get_property = tpl_log_entry_get_property; + object_class->set_property = tpl_log_entry_set_property; param_spec = g_param_spec_uint ("timestamp", "Timestamp", - "The timestamp (time_t) for the log entry", - 0, G_MAXUINT32, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + "The timestamp (gint64) for the log entry", + 0, G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_TIMESTAMP, param_spec); param_spec = g_param_spec_uint ("signal-type", "SignalType", "The signal type which caused the log entry", - 0, G_MAXUINT32, TPL_LOG_ENTRY_SIGNAL_NONE, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + 0, G_MAXUINT32, TPL_LOG_ENTRY_SIGNAL_NONE, G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_SIGNAL_TYPE, param_spec); param_spec = g_param_spec_uint ("log-id", "LogId", "Log identification number: the triple LogId+AccountName+ChatId is unique", - 0, G_MAXUINT32, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + 0, G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_LOG_ID, param_spec); param_spec = g_param_spec_uint ("direction", "Direction", "The direction of the log entry (in/out)", - 0, G_MAXUINT32, TPL_LOG_ENTRY_DIRECTION_NONE, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + 0, G_MAXUINT32, TPL_LOG_ENTRY_DIRECTION_NONE, G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_DIRECTION, param_spec); param_spec = g_param_spec_string ("chat-id", "ChatId", "The chat id relative to the log entry's account name", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_CHAT_ID, param_spec); param_spec = g_param_spec_object ("sender", "Sender", "TplContact instance who originated the log entry", - TPL_TYPE_CONTACT, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + TPL_TYPE_CONTACT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_SENDER, param_spec); param_spec = g_param_spec_object ("receiver", "Receiver", "TplContact instance destination for the log entry", - TPL_TYPE_CONTACT, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + TPL_TYPE_CONTACT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_RECEIVER, param_spec); g_type_class_add_private (object_class, sizeof (TplLogEntryPriv)); diff --git a/telepathy-logger/log-store-empathy.c b/telepathy-logger/log-store-empathy.c index 167c720..f861032 100644 --- a/telepathy-logger/log-store-empathy.c +++ b/telepathy-logger/log-store-empathy.c @@ -81,9 +81,9 @@ enum { }; static void log_store_iface_init (gpointer g_iface, gpointer iface_data); -static void get_prop (GObject *object, guint param_id, GValue *value, +static void tpl_log_store_get_property (GObject *object, guint param_id, GValue *value, GParamSpec *pspec); -static void set_prop (GObject *object, guint param_id, const GValue *value, +static void tpl_log_store_set_property (GObject *object, guint param_id, const GValue *value, GParamSpec *pspec); static const gchar *log_store_empathy_get_name (TplLogStore *self); static void log_store_empathy_set_name (TplLogStore *self, const gchar *data); @@ -140,7 +140,7 @@ log_store_empathy_finalize (GObject *object) static void -get_prop (GObject *object, +tpl_log_store_get_property (GObject *object, guint param_id, GValue *value, GParamSpec *pspec) @@ -168,7 +168,7 @@ get_prop (GObject *object, static void -set_prop (GObject *object, +tpl_log_store_set_property (GObject *object, guint param_id, const GValue *value, GParamSpec *pspec) @@ -204,8 +204,8 @@ tpl_log_store_empathy_class_init (TplLogStoreEmpathyClass *klass) object_class->finalize = log_store_empathy_finalize; object_class->dispose = log_store_empathy_dispose; - object_class->get_property = get_prop; - object_class->set_property = set_prop; + object_class->get_property = tpl_log_store_get_property; + object_class->set_property = tpl_log_store_set_property; /** * TplLogStoreEmpathy:name: diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c index 42b8368..0427b41 100644 --- a/telepathy-logger/observer.c +++ b/telepathy-logger/observer.c @@ -270,7 +270,7 @@ got_tpl_channel_text_ready_cb (GObject *obj, static void -get_prop (GObject *self, +tpl_observer_get_property (GObject *self, guint property_id, GValue *value, GParamSpec *pspec) @@ -338,6 +338,7 @@ tpl_observer_class_init (TplObserverClass *klass) object_class->constructor = tpl_observer_constructor; object_class->finalize = tpl_observer_finalize; object_class->dispose = tpl_observer_dispose; + object_class->get_property = tpl_observer_get_property; /* D-Bus properties are exposed as GObject properties through the * TpDBusPropertiesMixin properties on the Client interface */ @@ -365,8 +366,6 @@ tpl_observer_class_init (TplObserverClass *klass) {NULL} }; - object_class->get_property = get_prop; - /** * TplObserver:interfaces: * -- cgit v1.2.1