empathy r748 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r748 - trunk/libempathy
- Date: Tue, 11 Mar 2008 12:22:22 +0000 (GMT)
Author: xclaesse
Date: Tue Mar 11 12:22:22 2008
New Revision: 748
URL: http://svn.gnome.org/viewvc/empathy?rev=748&view=rev
Log:
Ready property on EmpathyContact is not a boolean but flags for each property.
Modified:
trunk/libempathy/empathy-contact.c
trunk/libempathy/empathy-contact.h
Modified: trunk/libempathy/empathy-contact.c
==============================================================================
--- trunk/libempathy/empathy-contact.c (original)
+++ trunk/libempathy/empathy-contact.c Tue Mar 11 12:22:22 2008
@@ -53,7 +53,7 @@
EmpathyCapabilities capabilities;
gboolean is_user;
guint hash;
- gboolean ready;
+ EmpathyContactReady ready;
};
static void empathy_contact_class_init (EmpathyContactClass *class);
@@ -173,11 +173,12 @@
g_object_class_install_property (object_class,
PROP_READY,
- g_param_spec_boolean ("ready",
- "Contact ready",
- "Is contact ready",
- FALSE,
- G_PARAM_READABLE));
+ g_param_spec_flags ("ready",
+ "Contact ready flags",
+ "Flags for ready properties",
+ EMPATHY_TYPE_CONTACT_READY,
+ EMPATHY_CONTACT_READY_NONE,
+ G_PARAM_READABLE));
g_type_class_add_private (object_class, sizeof (EmpathyContactPriv));
}
@@ -251,7 +252,7 @@
g_value_set_boolean (value, priv->is_user);
break;
case PROP_READY:
- g_value_set_boolean (value, priv->ready);
+ g_value_set_flags (value, priv->ready);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -672,8 +673,8 @@
EMPATHY_CAPABILITIES_VIDEO);
}
-gboolean
-empathy_contact_is_ready (EmpathyContact *contact)
+EmpathyContactReady
+empathy_contact_get_ready (EmpathyContact *contact)
{
EmpathyContactPriv *priv;
Modified: trunk/libempathy/empathy-contact.h
==============================================================================
--- trunk/libempathy/empathy-contact.h (original)
+++ trunk/libempathy/empathy-contact.h Tue Mar 11 12:22:22 2008
@@ -60,6 +60,14 @@
EMPATHY_CAPABILITIES_UNKNOWN = 1 << 7
} EmpathyCapabilities;
+typedef enum {
+ EMPATHY_CONTACT_READY_NONE = 0,
+ EMPATHY_CONTACT_READY_ID = 1 << 0,
+ EMPATHY_CONTACT_READY_HANDLE = 1 << 1,
+ EMPATHY_CONTACT_READY_ALIAS = 1 << 2,
+ EMPATHY_CONTACT_READY_ALL = (1 << 3) - 1,
+} EmpathyContactReady;
+
GType empathy_contact_get_type (void) G_GNUC_CONST;
EmpathyContact * empathy_contact_new (McAccount *account);
EmpathyContact * empathy_contact_new_full (McAccount *account,
@@ -89,13 +97,13 @@
EmpathyCapabilities empathy_contact_get_capabilities (EmpathyContact *contact);
void empathy_contact_set_capabilities (EmpathyContact *contact,
EmpathyCapabilities capabilities);
+EmpathyContactReady empathy_contact_get_ready (EmpathyContact *contact);
gboolean empathy_contact_is_user (EmpathyContact *contact);
void empathy_contact_set_is_user (EmpathyContact *contact,
gboolean is_user);
gboolean empathy_contact_is_online (EmpathyContact *contact);
const gchar * empathy_contact_get_status (EmpathyContact *contact);
gboolean empathy_contact_can_voip (EmpathyContact *contact);
-gboolean empathy_contact_is_ready (EmpathyContact *contact);
gboolean empathy_contact_equal (gconstpointer v1,
gconstpointer v2);
guint empathy_contact_hash (gconstpointer key);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]