auto-connect implies favorite

svn path=/trunk/; revision=1539

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 5c25de3ca4cfb60d58709a5732d8d4a13d2177ef..ac81af2529d0052ceb1d97018c60b78f7434bc8a 100644 (file)
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -226,6 +226,11 @@ chatroom_set_property (GObject      *object,
                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_CHANNEL:
     if (priv->tp_channel != NULL)
@@ -387,6 +392,12 @@ 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), "auto-connect");
 }