*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* Authors: Xavier Claessens <xclaesse@gmail.com>
* Martyn Russell <martyn@imendio.com>
#include <libxml/parser.h>
#include <libxml/tree.h>
+#include <telepathy-glib/interfaces.h>
+
#include "empathy-tp-chat.h"
#include "empathy-chatroom-manager.h"
#include "empathy-account-manager.h"
continue;
}
- account_id = mc_account_get_unique_name (empathy_chatroom_get_account (chatroom));
+ account_id = empathy_account_get_unique_name (
+ empathy_chatroom_get_account (chatroom));
node = xmlNewChild (root, NULL, "chatroom", NULL);
xmlNewTextChild (node, NULL, "name", empathy_chatroom_get_name (chatroom));
{
EmpathyChatroomManagerPriv *priv;
EmpathyChatroom *chatroom;
- McAccount *account;
+ EmpathyAccount *account;
xmlNodePtr child;
gchar *str;
gchar *name;
xmlFree (str);
}
- account = mc_account_lookup (account_id);
+ account = empathy_account_manager_lookup (priv->account_manager, account_id);
if (!account) {
g_free (name);
g_free (room);
if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME)) {
g_warning ("Failed to validate file:'%s'", filename);
- xmlFreeDoc(doc);
+ xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
return FALSE;
}
DEBUG ("Parsed %d chatrooms", g_list_length (priv->chatrooms));
- xmlFreeDoc(doc);
+ xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
return TRUE;
/* Set the default file path */
gchar *dir;
- dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+ dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
return FALSE;
}
+static void
+chatroom_manager_remove_link (EmpathyChatroomManager *manager,
+ GList *l)
+{
+ EmpathyChatroomManagerPriv *priv;
+ EmpathyChatroom *chatroom;
+
+ priv = GET_PRIV (manager);
+
+ chatroom = l->data;
+
+ if (empathy_chatroom_is_favorite (chatroom))
+ reset_save_timeout (manager);
+
+ priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
+
+ g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, chatroom);
+ g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb, manager);
+
+ g_object_unref (chatroom);
+}
+
void
empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
EmpathyChatroom *chatroom)
if (this_chatroom == chatroom ||
empathy_chatroom_equal (chatroom, this_chatroom))
{
- priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
- if (empathy_chatroom_is_favorite (chatroom))
- reset_save_timeout (manager);
-
- g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, this_chatroom);
- g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
- manager);
-
- g_object_unref (this_chatroom);
+ chatroom_manager_remove_link (manager, l);
break;
}
}
EmpathyChatroom *
empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
- McAccount *account,
+ EmpathyAccount *account,
const gchar *room)
{
EmpathyChatroomManagerPriv *priv;
GList *l;
g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
g_return_val_if_fail (room != NULL, NULL);
priv = GET_PRIV (manager);
for (l = priv->chatrooms; l; l = l->next) {
EmpathyChatroom *chatroom;
- McAccount *this_account;
+ EmpathyAccount *this_account;
const gchar *this_room;
chatroom = l->data;
GList *
empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
- McAccount *account)
+ EmpathyAccount *account)
{
EmpathyChatroomManagerPriv *priv;
GList *chatrooms, *l;
guint
empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager,
- McAccount *account)
+ EmpathyAccount *account)
{
EmpathyChatroomManagerPriv *priv;
GList *l;
continue;
empathy_chatroom_set_tp_chat (chatroom, NULL);
+
if (!empathy_chatroom_is_favorite (chatroom))
{
/* Remove the chatroom from the list, unless it's in the list of
* favourites..
* FIXME this policy should probably not be in libempathy */
- empathy_chatroom_manager_remove (manager, chatroom);
+ chatroom_manager_remove_link (manager, l);
}
+
+ break;
}
}
const gchar *roomname;
GQuark channel_type;
TpHandleType handle_type;
- McAccount *account;
+ EmpathyAccount *account;
TpConnection *connection;
channel_type = empathy_dispatch_operation_get_channel_type_id (operation);