Add getter and setter for "tp-chat" and "favorite" properties on EmpathyChatroom

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 8ffd8a51e11ce2b4766aaa3099bfb68e49f15662..6575bb9982288dacbba51a346bd562d027484278 100644 (file)
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -111,17 +111,14 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass)
                                                               FALSE,
                                                               G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class,
-      PROP_FAVORITE,
-      g_param_spec_boolean ("favorite",
-        "Favorite",
-        "TRUE if the chatroom is in user's favorite list",
-        FALSE,
-        G_PARAM_READWRITE |
-        G_PARAM_CONSTRUCT |
-        G_PARAM_STATIC_NAME |
-        G_PARAM_STATIC_NICK |
-        G_PARAM_STATIC_BLURB));
+       g_object_class_install_property (object_class,
+                                        PROP_FAVORITE,
+                                        g_param_spec_boolean ("favorite",
+                                                              "Favorite",
+                                                              "TRUE if the chatroom is in user's favorite list",
+                                                              FALSE,
+                                                              G_PARAM_READWRITE |
+                                                              G_PARAM_CONSTRUCT));
 
        g_object_class_install_property (object_class,
                                         PROP_TP_CHAT,
@@ -284,30 +281,14 @@ chatroom_set_property (GObject      *object,
                empathy_chatroom_set_auto_connect (EMPATHY_CHATROOM (object),
                                                  g_value_get_boolean (value));
                break;
-  case PROP_FAVORITE:
-    priv->favorite = g_value_get_boolean (value);
-    if (!priv->favorite)
-      {
-        empathy_chatroom_set_auto_connect (EMPATHY_CHATROOM (object),
-            FALSE);
-      }
-    break;
-       case PROP_TP_CHAT: {
-               GObject *chat = g_value_dup_object (value);
-
-               if (chat == (GObject *) priv->tp_chat)
-                       break;
-
-               g_assert (chat == NULL || priv->tp_chat == NULL);
-
-               if (priv->tp_chat != NULL) {
-                       g_object_unref (priv->tp_chat);
-                       priv->tp_chat = NULL;
-               } else {
-                       priv->tp_chat = EMPATHY_TP_CHAT (chat);
-               }
+       case PROP_FAVORITE:
+               empathy_chatroom_set_favorite (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));
                break;
-       }
   case PROP_SUBJECT:
     empathy_chatroom_set_subject (EMPATHY_CHATROOM (object),
         g_value_get_string (value));
@@ -476,12 +457,11 @@ empathy_chatroom_set_auto_connect (EmpathyChatroom *chatroom,
 
        priv->auto_connect = auto_connect;
 
-  if (priv->auto_connect)
-    {
-      /* auto_connect implies favorite */
-      priv->favorite = TRUE;
-      g_object_notify (G_OBJECT (chatroom), "favorite");
-    }
+       if (priv->auto_connect) {
+               /* auto_connect implies favorite */
+               priv->favorite = TRUE;
+               g_object_notify (G_OBJECT (chatroom), "favorite");
+       }
 
        g_object_notify (G_OBJECT (chatroom), "auto-connect");
 }
@@ -504,12 +484,13 @@ 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 empathy_account_equal (account_a, account_b) &&
+              !tp_strdiff (room_a, room_b);
 }
 
 EmpathyTpChat *
-empathy_chatroom_get_tp_chat (EmpathyChatroom *chatroom) {
+empathy_chatroom_get_tp_chat (EmpathyChatroom *chatroom)
+{
        EmpathyChatroomPriv *priv;
 
        g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), NULL);
@@ -631,3 +612,59 @@ empathy_chatroom_set_invite_only (EmpathyChatroom *chatroom,
   g_object_notify (G_OBJECT (chatroom), "invite-only");
 }
 
+void
+empathy_chatroom_set_tp_chat (EmpathyChatroom *chatroom,
+                             EmpathyTpChat   *tp_chat)
+{
+       EmpathyChatroomPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+       g_return_if_fail (tp_chat == NULL || EMPATHY_IS_TP_CHAT (tp_chat));
+
+       priv = GET_PRIV (chatroom);
+
+       if (priv->tp_chat == tp_chat) {
+               return;
+       }
+
+       if (priv->tp_chat != NULL) {
+               g_object_unref (priv->tp_chat);
+       }
+
+       priv->tp_chat = tp_chat ? g_object_ref (tp_chat) : NULL;
+       g_object_notify (G_OBJECT (chatroom), "tp-chat");
+}
+
+gboolean
+empathy_chatroom_is_favorite (EmpathyChatroom *chatroom)
+{
+       EmpathyChatroomPriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
+
+       priv = GET_PRIV (chatroom);
+
+       return priv->favorite;
+}
+
+void
+empathy_chatroom_set_favorite (EmpathyChatroom *chatroom,
+                              gboolean         favorite)
+{
+       EmpathyChatroomPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+
+       priv = GET_PRIV (chatroom);
+
+       if (priv->favorite == favorite) {
+               return;
+       }
+
+       priv->favorite = favorite;
+       if (!priv->favorite) {
+               empathy_chatroom_set_auto_connect (chatroom, FALSE);
+       }
+       g_object_notify (G_OBJECT (chatroom), "favorite");
+}
+

diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 08e3bc1eb04e383e6771127e833b1479265a396d..560517d489eab78331530bfb698c45f57d375030 100644 (file)
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -84,6 +84,11 @@ void            empathy_chatroom_set_invite_only  (EmpathyChatroom *chatroom,
 gboolean        empathy_chatroom_equal            (gconstpointer    v1,
                                                   gconstpointer    v2);
 EmpathyTpChat * empathy_chatroom_get_tp_chat      (EmpathyChatroom *chatroom);
+void            empathy_chatroom_set_tp_chat      (EmpathyChatroom *chatroom,
+                                                  EmpathyTpChat   *tp_chat);
+gboolean        empathy_chatroom_is_favorite      (EmpathyChatroom *chatroom);
+void            empathy_chatroom_set_favorite     (EmpathyChatroom *chatroom,
+                                                  gboolean         favorite);
 
 G_END_DECLS