local-xmpp-assistant-widget: increase row-spacing

[empathy.git] / libempathy / empathy-chatroom.c

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 147fca0a997e75621ec602c7e9e5fa9f0991af55..5238af361e4e606c0bf911c74b675082b22df54b 100644 (file)
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -31,7 +31,7 @@
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
 typedef struct {
-       McAccount *account;
+       TpAccount *account;
        gchar     *room;
        gchar     *name;
        gboolean   auto_connect;
@@ -41,6 +41,7 @@ typedef struct {
        guint members_count;
        gboolean invite_only;
        gboolean need_password;
+       gboolean always_urgent;
 } EmpathyChatroomPriv;
 
 
@@ -65,7 +66,8 @@ enum {
        PROP_SUBJECT,
        PROP_MEMBERS_COUNT,
        PROP_NEED_PASSWORD,
-       PROP_INVITE_ONLY
+       PROP_INVITE_ONLY,
+       PROP_ALWAYS_URGENT,
 };
 
 G_DEFINE_TYPE (EmpathyChatroom, empathy_chatroom, G_TYPE_OBJECT);
@@ -84,7 +86,7 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass)
                                         g_param_spec_object ("account",
                                                              "Chatroom Account",
                                                              "The account associated with an chatroom",
-                                                             MC_TYPE_ACCOUNT,
+                                                             TP_TYPE_ACCOUNT,
                                                              G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class,
@@ -120,6 +122,14 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass)
                                                               G_PARAM_READWRITE |
                                                               G_PARAM_CONSTRUCT));
 
+       g_object_class_install_property (object_class,
+                                        PROP_ALWAYS_URGENT,
+                                        g_param_spec_boolean ("always_urgent",
+                                                              "Always Urgent",
+                                                              "TRUE if every message should be considered urgent",
+                                                              FALSE,
+                                                              G_PARAM_READWRITE));
+
        g_object_class_install_property (object_class,
                                         PROP_TP_CHAT,
                                         g_param_spec_object ("tp-chat",
@@ -203,6 +213,7 @@ chatroom_finalize (GObject *object)
        g_object_unref (priv->account);
        g_free (priv->room);
        g_free (priv->name);
+       g_free (priv->subject);
 
        (G_OBJECT_CLASS (empathy_chatroom_parent_class)->finalize) (object);
 }
@@ -233,6 +244,9 @@ chatroom_get_property (GObject    *object,
        case PROP_FAVORITE:
                g_value_set_boolean (value, priv->favorite);
                break;
+       case PROP_ALWAYS_URGENT:
+               g_value_set_boolean (value, priv->always_urgent);
+               break;
        case PROP_TP_CHAT:
                g_value_set_object (value, priv->tp_chat);
                break;
@@ -260,10 +274,6 @@ chatroom_set_property (GObject      *object,
                       const GValue *value,
                       GParamSpec   *pspec)
 {
-       EmpathyChatroomPriv *priv;
-
-       priv = GET_PRIV (object);
-
        switch (param_id) {
        case PROP_ACCOUNT:
                empathy_chatroom_set_account (EMPATHY_CHATROOM (object),
@@ -285,6 +295,10 @@ chatroom_set_property (GObject      *object,
                empathy_chatroom_set_favorite (EMPATHY_CHATROOM (object),
                                               g_value_get_boolean (value));
                break;
+       case PROP_ALWAYS_URGENT:
+               empathy_chatroom_set_always_urgent (EMPATHY_CHATROOM (object),
+                                              g_value_get_boolean (value));
+               break;
        case PROP_TP_CHAT:
                empathy_chatroom_set_tp_chat (EMPATHY_CHATROOM (object),
                                              g_value_get_object (value));
@@ -312,22 +326,19 @@ chatroom_set_property (GObject      *object,
 }
 
 EmpathyChatroom *
-empathy_chatroom_new (McAccount *account)
+empathy_chatroom_new (TpAccount *account)
 {
-       g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
-
        return g_object_new (EMPATHY_TYPE_CHATROOM,
                             "account", account,
                             NULL);
 }
 
 EmpathyChatroom *
-empathy_chatroom_new_full (McAccount   *account,
+empathy_chatroom_new_full (TpAccount *account,
                          const gchar *room,
                          const gchar *name,
                          gboolean     auto_connect)
 {
-       g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
        g_return_val_if_fail (room != NULL, NULL);
 
        return g_object_new (EMPATHY_TYPE_CHATROOM,
@@ -338,7 +349,7 @@ empathy_chatroom_new_full (McAccount   *account,
                             NULL);
 }
 
-McAccount *
+TpAccount *
 empathy_chatroom_get_account (EmpathyChatroom *chatroom)
 {
        EmpathyChatroomPriv *priv;
@@ -351,12 +362,11 @@ empathy_chatroom_get_account (EmpathyChatroom *chatroom)
 
 void
 empathy_chatroom_set_account (EmpathyChatroom *chatroom,
-                            McAccount      *account)
+                            TpAccount *account)
 {
        EmpathyChatroomPriv *priv;
 
        g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
-       g_return_if_fail (MC_IS_ACCOUNT (account));
 
        priv = GET_PRIV (chatroom);
 
@@ -470,8 +480,8 @@ gboolean
 empathy_chatroom_equal (gconstpointer v1,
                       gconstpointer v2)
 {
-       McAccount   *account_a;
-       McAccount   *account_b;
+       TpAccount *account_a;
+       TpAccount *account_b;
        const gchar *room_a;
        const gchar *room_b;
 
@@ -484,8 +494,7 @@ empathy_chatroom_equal (gconstpointer v1,
        room_a = empathy_chatroom_get_room (EMPATHY_CHATROOM (v1));
        room_b = empathy_chatroom_get_room (EMPATHY_CHATROOM (v2));
 
-       return empathy_account_equal (account_a, account_b) &&
-              !tp_strdiff (room_a, room_b);
+       return account_a == account_b && !tp_strdiff (room_a, room_b);
 }
 
 EmpathyTpChat *
@@ -668,3 +677,32 @@ empathy_chatroom_set_favorite (EmpathyChatroom *chatroom,
        g_object_notify (G_OBJECT (chatroom), "favorite");
 }
 
+gboolean
+empathy_chatroom_is_always_urgent (EmpathyChatroom *chatroom)
+{
+       EmpathyChatroomPriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
+
+       priv = GET_PRIV (chatroom);
+
+       return priv->always_urgent;
+}
+
+void
+empathy_chatroom_set_always_urgent (EmpathyChatroom *chatroom,
+                              gboolean         always_urgent)
+{
+       EmpathyChatroomPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+
+       priv = GET_PRIV (chatroom);
+
+       if (priv->always_urgent == always_urgent)
+               return;
+
+       priv->always_urgent = always_urgent;
+       g_object_notify (G_OBJECT (chatroom), "always_urgent");
+}
+