*/
#include "config.h"
+#include "empathy-chatroom-manager.h"
-#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-observer.h>
-#include <telepathy-glib/util.h>
-
-#include "empathy-tp-chat.h"
-#include "empathy-chatroom-manager.h"
+#include "empathy-client-factory.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
#define CHATROOMS_XML_FILENAME "chatrooms.xml"
-#define CHATROOMS_DTD_FILENAME "empathy-chatroom-manager.dtd"
+#define CHATROOMS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-chatroom-manager.dtd"
#define SAVE_TIMER 4
static EmpathyChatroomManager *chatroom_manager_singleton = NULL;
/* source id of the autosave timer */
gint save_timer_id;
gboolean ready;
+ GFileMonitor *monitor;
+ gboolean writing;
TpBaseClient *observer;
} EmpathyChatroomManagerPriv;
priv = GET_PRIV (manager);
+ priv->writing = TRUE;
+
doc = xmlNewDoc ((const xmlChar *) "1.0");
root = xmlNewNode (NULL, (const xmlChar *) "chatrooms");
xmlDocSetRootElement (doc, root);
xmlMemoryDump ();
+ priv->writing = FALSE;
return TRUE;
}
priv->chatrooms = g_list_prepend (priv->chatrooms, g_object_ref (chatroom));
- g_signal_connect (chatroom, "notify",
+ /* Watch only those properties which are exported in the save file */
+ g_signal_connect (chatroom, "notify::name",
+ G_CALLBACK (chatroom_changed_cb), self);
+ g_signal_connect (chatroom, "notify::room",
+ G_CALLBACK (chatroom_changed_cb), self);
+ g_signal_connect (chatroom, "notify::account",
+ G_CALLBACK (chatroom_changed_cb), self);
+ g_signal_connect (chatroom, "notify::auto-connect",
+ G_CALLBACK (chatroom_changed_cb), self);
+ g_signal_connect (chatroom, "notify::always_urgent",
+ G_CALLBACK (chatroom_changed_cb), self);
+ g_signal_connect (chatroom, "notify::favorite",
G_CALLBACK (chatroom_changed_cb), self);
}
chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
xmlNodePtr node)
{
- EmpathyChatroomManagerPriv *priv;
- EmpathyChatroom *chatroom;
+ EmpathyChatroom *chatroom = NULL;
TpAccount *account;
xmlNodePtr child;
gchar *str;
gchar *account_id;
gboolean auto_connect;
gboolean always_urgent;
-
- priv = GET_PRIV (manager);
+ EmpathyClientFactory *factory;
+ GError *error = NULL;
/* default values. */
name = NULL;
xmlFree (str);
}
- account = tp_account_manager_ensure_account (priv->account_manager,
- account_id);
+ /* account has to be a valid Account object path */
+ if (!tp_dbus_check_valid_object_path (account_id, NULL) ||
+ !g_str_has_prefix (account_id, TP_ACCOUNT_OBJECT_PATH_BASE))
+ goto out;
+
+ factory = empathy_client_factory_dup ();
+
+ account = tp_simple_client_factory_ensure_account (
+ TP_SIMPLE_CLIENT_FACTORY (factory), account_id, NULL, &error);
+ g_object_unref (factory);
+
if (account == NULL)
{
+ DEBUG ("Failed to create account: %s", error->message);
+ g_error_free (error);
+
g_free (name);
g_free (room);
g_free (account_id);
add_chatroom (manager, chatroom);
g_signal_emit (manager, signals[CHATROOM_ADDED], 0, chatroom);
+out:
g_free (name);
g_free (room);
g_free (account_id);
+ tp_clear_object (&chatroom);
}
static gboolean
return FALSE;
}
- if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME))
+ if (!tpaw_xml_validate_from_resource (doc, CHATROOMS_DTD_RESOURCENAME))
{
g_warning ("Failed to validate file:'%s'", filename);
xmlFreeDoc (doc);
!chatroom_manager_file_parse (manager, priv->file))
return FALSE;
- priv->ready = TRUE;
- g_object_notify (G_OBJECT (manager), "ready");
+ if (!priv->ready)
+ {
+ priv->ready = TRUE;
+ g_object_notify (G_OBJECT (manager), "ready");
+ }
return TRUE;
}
priv = GET_PRIV (object);
tp_clear_object (&priv->observer);
+ tp_clear_object (&priv->monitor);
(G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->dispose) (object);
}
+static void
+clear_chatrooms (EmpathyChatroomManager *self)
+{
+ EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+ GList *l, *tmp;
+
+ tmp = priv->chatrooms;
+
+ /* Unreffing the chatroom may result in destroying the underlying
+ * EmpathyTpChat which will fire the invalidated signal and so make us
+ * re-call this function. We already set priv->chatrooms to NULL so we won't
+ * try to destroy twice the same objects. */
+ priv->chatrooms = NULL;
+
+ for (l = tmp; l != NULL; l = g_list_next (l))
+ {
+ EmpathyChatroom *chatroom = l->data;
+
+ g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
+ self);
+ g_signal_emit (self, signals[CHATROOM_REMOVED], 0, chatroom);
+
+ g_object_unref (chatroom);
+ }
+
+ g_list_free (tmp);
+}
+
static void
chatroom_manager_finalize (GObject *object)
{
EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (object);
EmpathyChatroomManagerPriv *priv;
- GList *l;
priv = GET_PRIV (object);
chatroom_manager_file_save (self);
}
- for (l = priv->chatrooms; l != NULL; l = g_list_next (l))
- {
- EmpathyChatroom *chatroom = l->data;
-
- g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
- self);
+ clear_chatrooms (self);
- g_object_unref (chatroom);
- }
-
- g_list_free (priv->chatrooms);
g_free (priv->file);
(G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->finalize) (object);
}
+static void
+file_changed_cb (GFileMonitor *monitor,
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type,
+ gpointer user_data)
+{
+ EmpathyChatroomManager *self = user_data;
+ EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+
+ if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
+ return;
+
+ if (priv->writing)
+ return;
+
+ DEBUG ("chatrooms file changed; reloading list");
+
+ clear_chatrooms (self);
+ chatroom_manager_get_all (self);
+}
+
static void
account_manager_ready_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (user_data);
+ EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
GError *error = NULL;
+ GFile *file = NULL;
- if (!tp_account_manager_prepare_finish (manager, result, &error))
+ if (!tp_proxy_prepare_finish (manager, result, &error))
{
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
chatroom_manager_get_all (self);
+ /* Set up file monitor */
+ file = g_file_new_for_path (priv->file);
+
+ priv->monitor = g_file_monitor (file, 0, NULL, &error);
+ if (priv->monitor == NULL)
+ {
+ DEBUG ("Failed to create file monitor on %s: %s", priv->file,
+ error->message);
+
+ g_error_free (error);
+ goto out;
+ }
+
+ g_signal_connect (priv->monitor, "changed", G_CALLBACK (file_changed_cb),
+ self);
+
out:
+ tp_clear_object (&file);
g_object_unref (self);
}
EmpathyChatroomManager *self;
EmpathyChatroomManagerPriv *priv;
GError *error = NULL;
- TpDBusDaemon *dbus;
if (chatroom_manager_singleton != NULL)
return g_object_ref (chatroom_manager_singleton);
priv->account_manager = tp_account_manager_dup ();
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
account_manager_ready_cb, g_object_ref (self));
if (priv->file == NULL)
g_free (dir);
}
- dbus = tp_dbus_daemon_dup (&error);
- if (dbus == NULL)
- {
- g_warning ("Failed to get TpDBusDaemon: %s", error->message);
-
- g_error_free (error);
- return obj;
- }
-
/* Setup a room observer */
- priv->observer = tp_simple_observer_new (dbus, TRUE,
+ priv->observer = tp_simple_observer_new_with_am (priv->account_manager, TRUE,
"Empathy.ChatroomManager", TRUE, observe_channels_cb, self, NULL);
- g_object_unref (dbus);
-
tp_base_client_take_observer_filter (priv->observer, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_TEXT,
TP_HANDLE_TYPE_ROOM,
NULL));
- tp_base_client_add_connection_features_varargs (priv->observer,
- TP_CONNECTION_FEATURE_CAPABILITIES, NULL);
-
if (!tp_base_client_register (priv->observer, &error))
{
g_critical ("Failed to register Observer: %s", error->message);
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ g_cclosure_marshal_generic,
G_TYPE_NONE,
1, EMPATHY_TYPE_CHATROOM);
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ g_cclosure_marshal_generic,
G_TYPE_NONE,
1, EMPATHY_TYPE_CHATROOM);
empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
EmpathyChatroom *chatroom)
{
- EmpathyChatroomManagerPriv *priv;
-
g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), FALSE);
g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
- priv = GET_PRIV (manager);
-
/* don't add more than once */
if (!empathy_chatroom_manager_find (manager,
empathy_chatroom_get_account (chatroom),
}
static void
-chatroom_manager_chat_destroyed_cb (EmpathyTpChat *chat,
+chatroom_manager_chat_invalidated_cb (EmpathyTpChat *chat,
+ guint domain,
+ gint code,
+ gchar *message,
gpointer manager)
{
EmpathyChatroomManagerPriv *priv = GET_PRIV (manager);
for (l = channels; l != NULL; l = g_list_next (l))
{
- TpChannel *channel = l->data;
- EmpathyTpChat *tp_chat;
+ EmpathyTpChat *tp_chat = l->data;
const gchar *roomname;
EmpathyChatroom *chatroom;
- if (tp_proxy_get_invalidated (channel) != NULL)
+ if (tp_proxy_get_invalidated ((TpChannel *) tp_chat) != NULL)
+ continue;
+
+ if (!EMPATHY_IS_TP_CHAT (tp_chat))
continue;
- tp_chat = empathy_tp_chat_new (account, channel);
roomname = empathy_tp_chat_get_id (tp_chat);
chatroom = empathy_chatroom_manager_find (self, account, roomname);
}
empathy_chatroom_set_tp_chat (chatroom, tp_chat);
- g_object_unref (tp_chat);
- /* A TpChat is always destroyed as it only gets unreffed after the channel
- * has been invalidated in the dispatcher.. */
- g_signal_connect (tp_chat, "destroy",
- G_CALLBACK (chatroom_manager_chat_destroyed_cb),
+ g_signal_connect (tp_chat, "invalidated",
+ G_CALLBACK (chatroom_manager_chat_invalidated_cb),
self);
}
projects / empathy.git / blobdiff