From: Xavier Claessens Date: Tue, 15 Jul 2008 14:00:50 +0000 (+0000) Subject: Move the event manager to src/ X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f014e7c05ae05ec40926e8fdc4e7cd69bcf3359a;hp=d61ca0ae4fb4aa4e469655407e8697b41a9ce5ef Move the event manager to src/ svn path=/trunk/; revision=1253 --- diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 1317cc7a..6909fe00 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -47,8 +47,7 @@ libempathy_gtk_la_SOURCES = \ empathy-smiley-manager.c \ empathy-cell-renderer-text.c \ empathy-spell.c \ - empathy-contact-menu.c \ - empathy-event-manager.c + empathy-contact-menu.c # do not distribute generated files nodist_libempathy_gtk_la_SOURCES =\ @@ -95,8 +94,7 @@ libempathy_gtk_headers = \ empathy-smiley-manager.h \ empathy-cell-renderer-text.h \ empathy-spell.h \ - empathy-contact-menu.h \ - empathy-event-manager.h + empathy-contact-menu.h libempathy_gtk_includedir = $(includedir)/libempathy-gtk/ libempathy_gtk_include_HEADERS = \ diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 662138ef..dd3dc54a 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -46,7 +46,6 @@ #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" #include "empathy-cell-renderer-activatable.h" -#include "empathy-event-manager.h" #include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.h" #include "empathy-gtk-marshal.h" @@ -54,9 +53,6 @@ #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include -/* Flashing delay for icons (milliseconds). */ -#define FLASH_TIMEOUT 500 - /* Active users are those which have recently changed state * (e.g. online, offline or from normal to a busy state). */ @@ -68,9 +64,6 @@ typedef struct { EmpathyContactListFeatureFlags list_features; EmpathyContactFeatureFlags contact_features; GtkWidget *tooltip_widget; - EmpathyEventManager *event_manager; - guint flash_timeout_id; - gboolean flash_on; } EmpathyContactListViewPriv; typedef struct { @@ -121,157 +114,6 @@ static guint signals[LAST_SIGNAL]; G_DEFINE_TYPE (EmpathyContactListView, empathy_contact_list_view, GTK_TYPE_TREE_VIEW); -static void -contact_list_view_flash_stop (EmpathyContactListView *view) -{ - EmpathyContactListViewPriv *priv = GET_PRIV (view); - - if (priv->flash_timeout_id == 0) { - return; - } - - DEBUG ("Stop flashing"); - g_source_remove (priv->flash_timeout_id); - priv->flash_timeout_id = 0; - priv->flash_on = FALSE; -} - -typedef struct { - EmpathyEvent *event; - gboolean on; -} FlashForeachData; - -static gboolean -contact_list_view_flash_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - FlashForeachData *data = (FlashForeachData*) user_data; - EmpathyContact *contact; - const gchar *icon_name; - GtkTreePath *parent_path = NULL; - GtkTreeIter parent_iter; - - /* To be used with gtk_tree_model_foreach, update the status icon - * of the contact to show the event icon (on=TRUE) or the presence - * (on=FALSE) */ - gtk_tree_model_get (model, iter, - EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, - -1); - - if (contact != data->event->contact) { - if (contact) { - g_object_unref (contact); - } - return FALSE; - } - - if (data->on) { - icon_name = data->event->icon_name; - } else { - icon_name = empathy_icon_name_for_contact (contact); - } - - gtk_tree_store_set (GTK_TREE_STORE (model), iter, - EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, icon_name, - -1); - - /* To make sure the parent is shown correctly, we emit - * the row-changed signal on the parent so it prompts - * it to be refreshed by the filter func. - */ - if (gtk_tree_model_iter_parent (model, &parent_iter, iter)) { - parent_path = gtk_tree_model_get_path (model, &parent_iter); - } - if (parent_path) { - gtk_tree_model_row_changed (model, parent_path, &parent_iter); - gtk_tree_path_free (parent_path); - } - - g_object_unref (contact); - - return FALSE; -} - -static gboolean -contact_list_view_flash_cb (EmpathyContactListView *view) -{ - EmpathyContactListViewPriv *priv = GET_PRIV (view); - GtkTreeModel *model; - GSList *events, *l; - gboolean found_event = FALSE; - FlashForeachData data; - - priv->flash_on = !priv->flash_on; - data.on = priv->flash_on; - model = GTK_TREE_MODEL (priv->store); - - events = empathy_event_manager_get_events (priv->event_manager); - for (l = events; l; l = l->next) { - data.event = l->data; - if (!data.event->contact) { - continue; - } - - found_event = TRUE; - gtk_tree_model_foreach (model, - contact_list_view_flash_foreach, - &data); - } - - if (!found_event) { - contact_list_view_flash_stop (view); - } - - return TRUE; -} - -static void -contact_list_view_flash_start (EmpathyContactListView *view) -{ - EmpathyContactListViewPriv *priv = GET_PRIV (view); - - if (priv->flash_timeout_id != 0) { - return; - } - - DEBUG ("Start flashing"); - priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT, - (GSourceFunc) contact_list_view_flash_cb, - view); - contact_list_view_flash_cb (view); -} - -static void -contact_list_view_event_added_cb (EmpathyEventManager *manager, - EmpathyEvent *event, - EmpathyContactListView *view) -{ - if (event->contact) { - contact_list_view_flash_start (view); - } -} - -static void -contact_list_view_event_removed_cb (EmpathyEventManager *manager, - EmpathyEvent *event, - EmpathyContactListView *view) -{ - EmpathyContactListViewPriv *priv = GET_PRIV (view); - FlashForeachData data; - - if (!event->contact) { - return; - } - - data.on = FALSE; - data.event = event; - gtk_tree_model_foreach (GTK_TREE_MODEL (priv->store), - contact_list_view_flash_foreach, - &data); -} - static gboolean contact_list_view_query_tooltip_cb (EmpathyContactListView *view, gint x, @@ -684,27 +526,11 @@ contact_list_view_row_activated_cb (EmpathyContactListView *view, return; } - /* If the contact has an event, activate it */ - if (priv->contact_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EVENTS) { - GSList *events, *l; - - events = empathy_event_manager_get_events (priv->event_manager); - for (l = events; l; l = l->next) { - EmpathyEvent *event = l->data; - - if (event->contact == contact) { - empathy_event_activate (event); - goto OUT; - } - } - } - /* There is no event for the contact, default action is starting a chat */ if (priv->contact_features & EMPATHY_CONTACT_FEATURE_CHAT) { empathy_dispatcher_chat_with_contact (contact); } -OUT: g_object_unref (contact); } @@ -1130,40 +956,6 @@ contact_list_view_set_list_features (EmpathyContactListView *view, /* Update has-tooltip */ has_tooltip = (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP) != 0; gtk_widget_set_has_tooltip (GTK_WIDGET (view), has_tooltip); - - /* Enable event handling if needed */ - if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EVENTS && - !priv->event_manager) { - GSList *l; - - priv->event_manager = empathy_event_manager_new (); - g_signal_connect (priv->event_manager, "event-added", - G_CALLBACK (contact_list_view_event_added_cb), - view); - g_signal_connect (priv->event_manager, "event-removed", - G_CALLBACK (contact_list_view_event_removed_cb), - view); - - l = empathy_event_manager_get_events (priv->event_manager); - while (l) { - contact_list_view_event_added_cb (priv->event_manager, - l->data, view); - l = l->next; - } - } - - /* Disable event handling if needed */ - if (!(features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EVENTS) && - priv->event_manager) { - g_signal_handlers_disconnect_by_func (priv->event_manager, - contact_list_view_event_added_cb, - view); - g_signal_handlers_disconnect_by_func (priv->event_manager, - contact_list_view_event_removed_cb, - view); - g_object_unref (priv->event_manager); - priv->event_manager = NULL; - } } static void @@ -1177,16 +969,6 @@ contact_list_view_finalize (GObject *object) g_object_unref (priv->store); } - if (priv->event_manager) { - g_signal_handlers_disconnect_by_func (priv->event_manager, - contact_list_view_event_added_cb, - object); - g_signal_handlers_disconnect_by_func (priv->event_manager, - contact_list_view_event_removed_cb, - object); - g_object_unref (priv->event_manager); - } - G_OBJECT_CLASS (empathy_contact_list_view_parent_class)->finalize (object); } diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h index e7d7769b..82990d64 100644 --- a/libempathy-gtk/empathy-contact-list-view.h +++ b/libempathy-gtk/empathy-contact-list-view.h @@ -54,8 +54,7 @@ typedef enum { EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP = 1 << 4, EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG = 1 << 5, EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP = 1 << 6, - EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EVENTS = 1 << 7, - EMPATHY_CONTACT_LIST_FEATURE_ALL = (1 << 8) - 1, + EMPATHY_CONTACT_LIST_FEATURE_ALL = (1 << 7) - 1, } EmpathyContactListFeatureFlags; struct _EmpathyContactListView { diff --git a/libempathy-gtk/empathy-event-manager.c b/libempathy-gtk/empathy-event-manager.c deleted file mode 100644 index 9d299709..00000000 --- a/libempathy-gtk/empathy-event-manager.c +++ /dev/null @@ -1,470 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - */ - -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include "empathy-event-manager.h" -#include "empathy-images.h" -#include "empathy-contact-dialogs.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager) -typedef struct { - EmpathyDispatcher *dispatcher; - EmpathyContactManager *contact_manager; - GSList *events; -} EmpathyEventManagerPriv; - -typedef struct _EventPriv EventPriv; -typedef void (*EventFunc) (EventPriv *event); - -struct _EventPriv { - EmpathyEvent public; - TpChannel *channel; - EmpathyEventManager *manager; - EventFunc func; - gpointer user_data; -}; - -enum { - EVENT_ADDED, - EVENT_REMOVED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -G_DEFINE_TYPE (EmpathyEventManager, empathy_event_manager, G_TYPE_OBJECT); - -static void event_remove (EventPriv *event); - -static void -event_free (EventPriv *event) -{ - g_free (event->public.icon_name); - g_free (event->public.message); - - if (event->public.contact) { - g_object_unref (event->public.contact); - } - - if (event->channel) { - g_signal_handlers_disconnect_by_func (event->channel, - event_remove, - event); - g_object_unref (event->channel); - } - g_slice_free (EventPriv, event); -} - -static void -event_remove (EventPriv *event) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (event->manager); - - DEBUG ("Removing event %p", event); - priv->events = g_slist_remove (priv->events, event); - g_signal_emit (event->manager, signals[EVENT_REMOVED], 0, event); - event_free (event); -} - -static void -event_manager_add (EmpathyEventManager *manager, - EmpathyContact *contact, - const gchar *icon_name, - const gchar *message, - TpChannel *channel, - EventFunc func, - gpointer user_data) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - EventPriv *event; - - event = g_slice_new0 (EventPriv); - event->public.contact = contact ? g_object_ref (contact) : NULL; - event->public.icon_name = g_strdup (icon_name); - event->public.message = g_strdup (message); - event->manager = manager; - event->func = func; - event->user_data = user_data; - - if (channel) { - event->channel = g_object_ref (channel); - g_signal_connect_swapped (channel, "invalidated", - G_CALLBACK (event_remove), - event); - } - - DEBUG ("Adding event %p", event); - priv->events = g_slist_prepend (priv->events, event); - g_signal_emit (event->manager, signals[EVENT_ADDED], 0, event); -} - -static void -event_channel_process_func (EventPriv *event) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (event->manager); - - /* This will emit "dispatch-channel" and the event will be removed - * in the callback of that signal, no need to remove the event here. */ - empathy_dispatcher_channel_process (priv->dispatcher, event->channel); -} - -static gboolean -event_manager_chat_unref_idle (gpointer user_data) -{ - g_object_unref (user_data); - return FALSE; -} - -static void -event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, - EmpathyMessage *message, - EmpathyEventManager *manager) -{ - EmpathyContact *sender; - gchar *msg; - TpChannel *channel; - - g_idle_add (event_manager_chat_unref_idle, tp_chat); - g_signal_handlers_disconnect_by_func (tp_chat, - event_manager_chat_message_received_cb, - manager); - - sender = empathy_message_get_sender (message); - msg = g_strdup_printf (_("New message from %s:\n%s"), - empathy_contact_get_name (sender), - empathy_message_get_body (message)); - - channel = empathy_tp_chat_get_channel (tp_chat); - event_manager_add (manager, sender, EMPATHY_IMAGE_NEW_MESSAGE, msg, - channel, event_channel_process_func, NULL); - - g_free (msg); -} - -static void -event_manager_filter_channel_cb (EmpathyDispatcher *dispatcher, - TpChannel *channel, - EmpathyEventManager *manager) -{ - gchar *channel_type; - - g_object_get (channel, "channel-type", &channel_type, NULL); - if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { - EmpathyTpChat *tp_chat; - - tp_chat = empathy_tp_chat_new (channel); - g_signal_connect (tp_chat, "message-received", - G_CALLBACK (event_manager_chat_message_received_cb), - manager); - } - else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) { - EmpathyTpGroup *tp_group; - EmpathyContact *contact; - gchar *msg; - - tp_group = empathy_tp_group_new (channel); - empathy_run_until_ready (tp_group); - empathy_tp_group_get_invitation (tp_group, &contact); - empathy_contact_run_until_ready (contact, - EMPATHY_CONTACT_READY_NAME, - NULL); - - msg = g_strdup_printf (_("Incoming call from %s"), - empathy_contact_get_name (contact)); - - event_manager_add (manager, contact, EMPATHY_IMAGE_VOIP, msg, - channel, event_channel_process_func, NULL); - - g_free (msg); - g_object_unref (contact); - g_object_unref (tp_group); - } - - g_free (channel_type); -} - -static void -event_manager_dispatch_channel_cb (EmpathyDispatcher *dispatcher, - TpChannel *channel, - EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - GSList *l; - - for (l = priv->events; l; l = l->next) { - EventPriv *event = l->data; - - if (event->channel && - empathy_proxy_equal (channel, event->channel)) { - event_remove (event); - break; - } - } -} - -static void -event_tube_process_func (EventPriv *event) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (event->manager); - EmpathyDispatcherTube *tube = (EmpathyDispatcherTube*) event->user_data; - - if (tube->activatable) { - empathy_dispatcher_tube_process (priv->dispatcher, tube); - } else { - GtkWidget *dialog; - gchar *str; - - /* Tell the user that the tube can't be handled */ - str = g_strdup_printf (_("%s offered you an invitation, but " - "you don't have the needed external " - "application to handle it."), - empathy_contact_get_name (tube->initiator)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - "%s", str); - gtk_window_set_title (GTK_WINDOW (dialog), - _("Invitation Error")); - g_free (str); - - gtk_widget_show (dialog); - g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - NULL); - } - - empathy_dispatcher_tube_unref (tube); - event_remove (event); -} - -static void -event_manager_filter_tube_cb (EmpathyDispatcher *dispatcher, - EmpathyDispatcherTube *tube, - EmpathyEventManager *manager) -{ - const gchar *icon_name; - gchar *msg; - - empathy_contact_run_until_ready (tube->initiator, - EMPATHY_CONTACT_READY_NAME, NULL); - - if (tube->activatable) { - icon_name = GTK_STOCK_EXECUTE; - msg = g_strdup_printf (_("%s is offering you an invitation. An external " - "application will be started to handle it."), - empathy_contact_get_name (tube->initiator)); - } else { - icon_name = GTK_STOCK_DIALOG_ERROR; - msg = g_strdup_printf (_("%s is offering you an invitation, but " - "you don't have the needed external " - "application to handle it."), - empathy_contact_get_name (tube->initiator)); - } - - event_manager_add (manager, tube->initiator, icon_name, msg, - tube->channel, event_tube_process_func, - empathy_dispatcher_tube_ref (tube)); - - g_free (msg); -} - -static void -event_pending_subscribe_func (EventPriv *event) -{ - empathy_subscription_dialog_show (event->public.contact, NULL); - event_remove (event); -} - -static void -event_manager_pendings_changed_cb (EmpathyContactList *list, - EmpathyContact *contact, - EmpathyContact *actor, - guint reason, - gchar *message, - gboolean is_pending, - EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - GString *str; - - if (!is_pending) { - GSList *l; - - for (l = priv->events; l; l = l->next) { - EventPriv *event = l->data; - - if (event->public.contact == contact && - event->func == event_pending_subscribe_func) { - event_remove (event); - break; - } - } - - return; - } - - empathy_contact_run_until_ready (contact, - EMPATHY_CONTACT_READY_NAME, - NULL); - - str = g_string_new (NULL); - g_string_printf (str, _("Subscription requested by %s"), - empathy_contact_get_name (contact)); - if (!G_STR_EMPTY (message)) { - g_string_append_printf (str, _("\nMessage: %s"), message); - } - - event_manager_add (manager, contact, GTK_STOCK_DIALOG_QUESTION, str->str, - NULL, event_pending_subscribe_func, NULL); - - g_string_free (str, TRUE); -} - -static void -event_manager_finalize (GObject *object) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (object); - - g_slist_foreach (priv->events, (GFunc) event_free, NULL); - g_slist_free (priv->events); - g_object_unref (priv->contact_manager); - g_object_unref (priv->dispatcher); -} - -static void -empathy_event_manager_class_init (EmpathyEventManagerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = event_manager_finalize; - - signals[EVENT_ADDED] = - g_signal_new ("event-added", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, G_TYPE_POINTER); - - signals[EVENT_REMOVED] = - g_signal_new ("event-removed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, G_TYPE_POINTER); - - g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv)); -} - -static void -empathy_event_manager_init (EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, - EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerPriv); - - manager->priv = priv; - - priv->dispatcher = empathy_dispatcher_new (); - priv->contact_manager = empathy_contact_manager_new (); - g_signal_connect (priv->dispatcher, "filter-channel", - G_CALLBACK (event_manager_filter_channel_cb), - manager); - g_signal_connect (priv->dispatcher, "dispatch-channel", - G_CALLBACK (event_manager_dispatch_channel_cb), - manager); - g_signal_connect (priv->dispatcher, "filter-tube", - G_CALLBACK (event_manager_filter_tube_cb), - manager); - g_signal_connect (priv->contact_manager, "pendings-changed", - G_CALLBACK (event_manager_pendings_changed_cb), - manager); -} - -EmpathyEventManager * -empathy_event_manager_new (void) -{ - static EmpathyEventManager *manager = NULL; - - if (!manager) { - manager = g_object_new (EMPATHY_TYPE_EVENT_MANAGER, NULL); - g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager); - } else { - g_object_ref (manager); - } - - return manager; -} - -GSList * -empathy_event_manager_get_events (EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - - g_return_val_if_fail (EMPATHY_IS_EVENT_MANAGER (manager), NULL); - - return priv->events; -} - -EmpathyEvent * -empathy_event_manager_get_top_event (EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - - g_return_val_if_fail (EMPATHY_IS_EVENT_MANAGER (manager), NULL); - - return priv->events ? priv->events->data : NULL; -} - -void -empathy_event_activate (EmpathyEvent *event_public) -{ - EventPriv *event = (EventPriv*) event_public; - - g_return_if_fail (event_public != NULL); - - if (event->func) { - event->func (event); - } else { - event_remove (event); - } -} - diff --git a/libempathy-gtk/empathy-event-manager.h b/libempathy-gtk/empathy-event-manager.h deleted file mode 100644 index 89cb74d6..00000000 --- a/libempathy-gtk/empathy-event-manager.h +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - */ - -#ifndef __EMPATHY_EVENT_MANAGER_H__ -#define __EMPATHY_EVENT_MANAGER_H__ - -#include -#include - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_EVENT_MANAGER (empathy_event_manager_get_type ()) -#define EMPATHY_EVENT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManager)) -#define EMPATHY_EVENT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerClass)) -#define EMPATHY_IS_EVENT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_EVENT_MANAGER)) -#define EMPATHY_IS_EVENT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_EVENT_MANAGER)) -#define EMPATHY_EVENT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerClass)) - -typedef struct _EmpathyEventManager EmpathyEventManager; -typedef struct _EmpathyEventManagerClass EmpathyEventManagerClass; - -struct _EmpathyEventManager { - GObject parent; - gpointer priv; -}; - -struct _EmpathyEventManagerClass { - GObjectClass parent_class; -}; - -typedef struct { - EmpathyContact *contact; - gchar *icon_name; - gchar *message; -} EmpathyEvent; - -GType empathy_event_manager_get_type (void) G_GNUC_CONST; -EmpathyEventManager *empathy_event_manager_new (void); -EmpathyEvent * empathy_event_manager_get_top_event (EmpathyEventManager *manager); -GSList * empathy_event_manager_get_events (EmpathyEventManager *manager); -void empathy_event_activate (EmpathyEvent *event); - -G_END_DECLS - -#endif /* __EMPATHY_EVENT_MANAGER_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index 5e41a529..d6dbc522 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,7 @@ bin_PROGRAMS = \ empathy_SOURCES = \ empathy.c \ bacon-message-connection.c bacon-message-connection.h \ + ephy-spinner.c ephy-spinner.h \ empathy-chat-window.c empathy-chat-window.h \ empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \ empathy-status-icon.c empathy-status-icon.h \ @@ -31,8 +32,8 @@ empathy_SOURCES = \ empathy-main-window.c empathy-main-window.h \ empathy-preferences.c empathy-preferences.h \ empathy-call-window.c empathy-call-window.h \ - ephy-spinner.c ephy-spinner.h \ - empathy-accounts-dialog.c empathy-accounts-dialog.h + empathy-accounts-dialog.c empathy-accounts-dialog.h \ + empathy-event-manager.c empathy-event-manager.h empathy_accounts_SOURCES = empathy-accounts.c \ empathy-accounts-dialog.c empathy-accounts-dialog.h diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c new file mode 100644 index 00000000..0404f5d7 --- /dev/null +++ b/src/empathy-event-manager.c @@ -0,0 +1,470 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Copyright (C) 2007-2008 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Xavier Claessens + */ + +#include + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "empathy-event-manager.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER +#include + +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager) +typedef struct { + EmpathyDispatcher *dispatcher; + EmpathyContactManager *contact_manager; + GSList *events; +} EmpathyEventManagerPriv; + +typedef struct _EventPriv EventPriv; +typedef void (*EventFunc) (EventPriv *event); + +struct _EventPriv { + EmpathyEvent public; + TpChannel *channel; + EmpathyEventManager *manager; + EventFunc func; + gpointer user_data; +}; + +enum { + EVENT_ADDED, + EVENT_REMOVED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +G_DEFINE_TYPE (EmpathyEventManager, empathy_event_manager, G_TYPE_OBJECT); + +static void event_remove (EventPriv *event); + +static void +event_free (EventPriv *event) +{ + g_free (event->public.icon_name); + g_free (event->public.message); + + if (event->public.contact) { + g_object_unref (event->public.contact); + } + + if (event->channel) { + g_signal_handlers_disconnect_by_func (event->channel, + event_remove, + event); + g_object_unref (event->channel); + } + g_slice_free (EventPriv, event); +} + +static void +event_remove (EventPriv *event) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (event->manager); + + DEBUG ("Removing event %p", event); + priv->events = g_slist_remove (priv->events, event); + g_signal_emit (event->manager, signals[EVENT_REMOVED], 0, event); + event_free (event); +} + +static void +event_manager_add (EmpathyEventManager *manager, + EmpathyContact *contact, + const gchar *icon_name, + const gchar *message, + TpChannel *channel, + EventFunc func, + gpointer user_data) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (manager); + EventPriv *event; + + event = g_slice_new0 (EventPriv); + event->public.contact = contact ? g_object_ref (contact) : NULL; + event->public.icon_name = g_strdup (icon_name); + event->public.message = g_strdup (message); + event->manager = manager; + event->func = func; + event->user_data = user_data; + + if (channel) { + event->channel = g_object_ref (channel); + g_signal_connect_swapped (channel, "invalidated", + G_CALLBACK (event_remove), + event); + } + + DEBUG ("Adding event %p", event); + priv->events = g_slist_prepend (priv->events, event); + g_signal_emit (event->manager, signals[EVENT_ADDED], 0, event); +} + +static void +event_channel_process_func (EventPriv *event) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (event->manager); + + /* This will emit "dispatch-channel" and the event will be removed + * in the callback of that signal, no need to remove the event here. */ + empathy_dispatcher_channel_process (priv->dispatcher, event->channel); +} + +static gboolean +event_manager_chat_unref_idle (gpointer user_data) +{ + g_object_unref (user_data); + return FALSE; +} + +static void +event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, + EmpathyMessage *message, + EmpathyEventManager *manager) +{ + EmpathyContact *sender; + gchar *msg; + TpChannel *channel; + + g_idle_add (event_manager_chat_unref_idle, tp_chat); + g_signal_handlers_disconnect_by_func (tp_chat, + event_manager_chat_message_received_cb, + manager); + + sender = empathy_message_get_sender (message); + msg = g_strdup_printf (_("New message from %s:\n%s"), + empathy_contact_get_name (sender), + empathy_message_get_body (message)); + + channel = empathy_tp_chat_get_channel (tp_chat); + event_manager_add (manager, sender, EMPATHY_IMAGE_NEW_MESSAGE, msg, + channel, event_channel_process_func, NULL); + + g_free (msg); +} + +static void +event_manager_filter_channel_cb (EmpathyDispatcher *dispatcher, + TpChannel *channel, + EmpathyEventManager *manager) +{ + gchar *channel_type; + + g_object_get (channel, "channel-type", &channel_type, NULL); + if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { + EmpathyTpChat *tp_chat; + + tp_chat = empathy_tp_chat_new (channel); + g_signal_connect (tp_chat, "message-received", + G_CALLBACK (event_manager_chat_message_received_cb), + manager); + } + else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) { + EmpathyTpGroup *tp_group; + EmpathyContact *contact; + gchar *msg; + + tp_group = empathy_tp_group_new (channel); + empathy_run_until_ready (tp_group); + empathy_tp_group_get_invitation (tp_group, &contact); + empathy_contact_run_until_ready (contact, + EMPATHY_CONTACT_READY_NAME, + NULL); + + msg = g_strdup_printf (_("Incoming call from %s"), + empathy_contact_get_name (contact)); + + event_manager_add (manager, contact, EMPATHY_IMAGE_VOIP, msg, + channel, event_channel_process_func, NULL); + + g_free (msg); + g_object_unref (contact); + g_object_unref (tp_group); + } + + g_free (channel_type); +} + +static void +event_manager_dispatch_channel_cb (EmpathyDispatcher *dispatcher, + TpChannel *channel, + EmpathyEventManager *manager) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (manager); + GSList *l; + + for (l = priv->events; l; l = l->next) { + EventPriv *event = l->data; + + if (event->channel && + empathy_proxy_equal (channel, event->channel)) { + event_remove (event); + break; + } + } +} + +static void +event_tube_process_func (EventPriv *event) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (event->manager); + EmpathyDispatcherTube *tube = (EmpathyDispatcherTube*) event->user_data; + + if (tube->activatable) { + empathy_dispatcher_tube_process (priv->dispatcher, tube); + } else { + GtkWidget *dialog; + gchar *str; + + /* Tell the user that the tube can't be handled */ + str = g_strdup_printf (_("%s offered you an invitation, but " + "you don't have the needed external " + "application to handle it."), + empathy_contact_get_name (tube->initiator)); + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "%s", str); + gtk_window_set_title (GTK_WINDOW (dialog), + _("Invitation Error")); + g_free (str); + + gtk_widget_show (dialog); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); + } + + empathy_dispatcher_tube_unref (tube); + event_remove (event); +} + +static void +event_manager_filter_tube_cb (EmpathyDispatcher *dispatcher, + EmpathyDispatcherTube *tube, + EmpathyEventManager *manager) +{ + const gchar *icon_name; + gchar *msg; + + empathy_contact_run_until_ready (tube->initiator, + EMPATHY_CONTACT_READY_NAME, NULL); + + if (tube->activatable) { + icon_name = GTK_STOCK_EXECUTE; + msg = g_strdup_printf (_("%s is offering you an invitation. An external " + "application will be started to handle it."), + empathy_contact_get_name (tube->initiator)); + } else { + icon_name = GTK_STOCK_DIALOG_ERROR; + msg = g_strdup_printf (_("%s is offering you an invitation, but " + "you don't have the needed external " + "application to handle it."), + empathy_contact_get_name (tube->initiator)); + } + + event_manager_add (manager, tube->initiator, icon_name, msg, + tube->channel, event_tube_process_func, + empathy_dispatcher_tube_ref (tube)); + + g_free (msg); +} + +static void +event_pending_subscribe_func (EventPriv *event) +{ + empathy_subscription_dialog_show (event->public.contact, NULL); + event_remove (event); +} + +static void +event_manager_pendings_changed_cb (EmpathyContactList *list, + EmpathyContact *contact, + EmpathyContact *actor, + guint reason, + gchar *message, + gboolean is_pending, + EmpathyEventManager *manager) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (manager); + GString *str; + + if (!is_pending) { + GSList *l; + + for (l = priv->events; l; l = l->next) { + EventPriv *event = l->data; + + if (event->public.contact == contact && + event->func == event_pending_subscribe_func) { + event_remove (event); + break; + } + } + + return; + } + + empathy_contact_run_until_ready (contact, + EMPATHY_CONTACT_READY_NAME, + NULL); + + str = g_string_new (NULL); + g_string_printf (str, _("Subscription requested by %s"), + empathy_contact_get_name (contact)); + if (!G_STR_EMPTY (message)) { + g_string_append_printf (str, _("\nMessage: %s"), message); + } + + event_manager_add (manager, contact, GTK_STOCK_DIALOG_QUESTION, str->str, + NULL, event_pending_subscribe_func, NULL); + + g_string_free (str, TRUE); +} + +static void +event_manager_finalize (GObject *object) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (object); + + g_slist_foreach (priv->events, (GFunc) event_free, NULL); + g_slist_free (priv->events); + g_object_unref (priv->contact_manager); + g_object_unref (priv->dispatcher); +} + +static void +empathy_event_manager_class_init (EmpathyEventManagerClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = event_manager_finalize; + + signals[EVENT_ADDED] = + g_signal_new ("event-added", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, G_TYPE_POINTER); + + signals[EVENT_REMOVED] = + g_signal_new ("event-removed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, G_TYPE_POINTER); + + g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv)); +} + +static void +empathy_event_manager_init (EmpathyEventManager *manager) +{ + EmpathyEventManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, + EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerPriv); + + manager->priv = priv; + + priv->dispatcher = empathy_dispatcher_new (); + priv->contact_manager = empathy_contact_manager_new (); + g_signal_connect (priv->dispatcher, "filter-channel", + G_CALLBACK (event_manager_filter_channel_cb), + manager); + g_signal_connect (priv->dispatcher, "dispatch-channel", + G_CALLBACK (event_manager_dispatch_channel_cb), + manager); + g_signal_connect (priv->dispatcher, "filter-tube", + G_CALLBACK (event_manager_filter_tube_cb), + manager); + g_signal_connect (priv->contact_manager, "pendings-changed", + G_CALLBACK (event_manager_pendings_changed_cb), + manager); +} + +EmpathyEventManager * +empathy_event_manager_new (void) +{ + static EmpathyEventManager *manager = NULL; + + if (!manager) { + manager = g_object_new (EMPATHY_TYPE_EVENT_MANAGER, NULL); + g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager); + } else { + g_object_ref (manager); + } + + return manager; +} + +GSList * +empathy_event_manager_get_events (EmpathyEventManager *manager) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (manager); + + g_return_val_if_fail (EMPATHY_IS_EVENT_MANAGER (manager), NULL); + + return priv->events; +} + +EmpathyEvent * +empathy_event_manager_get_top_event (EmpathyEventManager *manager) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (manager); + + g_return_val_if_fail (EMPATHY_IS_EVENT_MANAGER (manager), NULL); + + return priv->events ? priv->events->data : NULL; +} + +void +empathy_event_activate (EmpathyEvent *event_public) +{ + EventPriv *event = (EventPriv*) event_public; + + g_return_if_fail (event_public != NULL); + + if (event->func) { + event->func (event); + } else { + event_remove (event); + } +} + diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h new file mode 100644 index 00000000..89cb74d6 --- /dev/null +++ b/src/empathy-event-manager.h @@ -0,0 +1,65 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Copyright (C) 2007-2008 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Xavier Claessens + */ + +#ifndef __EMPATHY_EVENT_MANAGER_H__ +#define __EMPATHY_EVENT_MANAGER_H__ + +#include +#include + +#include + +G_BEGIN_DECLS + +#define EMPATHY_TYPE_EVENT_MANAGER (empathy_event_manager_get_type ()) +#define EMPATHY_EVENT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManager)) +#define EMPATHY_EVENT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerClass)) +#define EMPATHY_IS_EVENT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_EVENT_MANAGER)) +#define EMPATHY_IS_EVENT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_EVENT_MANAGER)) +#define EMPATHY_EVENT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerClass)) + +typedef struct _EmpathyEventManager EmpathyEventManager; +typedef struct _EmpathyEventManagerClass EmpathyEventManagerClass; + +struct _EmpathyEventManager { + GObject parent; + gpointer priv; +}; + +struct _EmpathyEventManagerClass { + GObjectClass parent_class; +}; + +typedef struct { + EmpathyContact *contact; + gchar *icon_name; + gchar *message; +} EmpathyEvent; + +GType empathy_event_manager_get_type (void) G_GNUC_CONST; +EmpathyEventManager *empathy_event_manager_new (void); +EmpathyEvent * empathy_event_manager_get_top_event (EmpathyEventManager *manager); +GSList * empathy_event_manager_get_events (EmpathyEventManager *manager); +void empathy_event_activate (EmpathyEvent *event); + +G_END_DECLS + +#endif /* __EMPATHY_EVENT_MANAGER_H__ */ diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 156d2e7c..577f45bb 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -55,10 +55,14 @@ #include "empathy-about-dialog.h" #include "empathy-new-chatroom-dialog.h" #include "empathy-chatrooms-window.h" +#include "empathy-event-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include +/* Flashing delay for icons (milliseconds). */ +#define FLASH_TIMEOUT 500 + /* Minimum width of roster window if something goes wrong. */ #define MIN_WIDTH 50 @@ -73,6 +77,9 @@ typedef struct { EmpathyContactListStore *list_store; MissionControl *mc; EmpathyChatroomManager *chatroom_manager; + EmpathyEventManager *event_manager; + guint flash_timeout_id; + gboolean flash_on; gpointer token; GtkWidget *window; @@ -172,6 +179,187 @@ static void main_window_notify_sort_criterium_cb (EmpathyConf const gchar *key, EmpathyMainWindow *window); +static void +main_window_flash_stop (EmpathyMainWindow *window) +{ + if (window->flash_timeout_id == 0) { + return; + } + + DEBUG ("Stop flashing"); + g_source_remove (window->flash_timeout_id); + window->flash_timeout_id = 0; + window->flash_on = FALSE; +} + +typedef struct { + EmpathyEvent *event; + gboolean on; +} FlashForeachData; + +static gboolean +main_window_flash_foreach (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + FlashForeachData *data = (FlashForeachData*) user_data; + EmpathyContact *contact; + const gchar *icon_name; + GtkTreePath *parent_path = NULL; + GtkTreeIter parent_iter; + + /* To be used with gtk_tree_model_foreach, update the status icon + * of the contact to show the event icon (on=TRUE) or the presence + * (on=FALSE) */ + gtk_tree_model_get (model, iter, + EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, + -1); + + if (contact != data->event->contact) { + if (contact) { + g_object_unref (contact); + } + return FALSE; + } + + if (data->on) { + icon_name = data->event->icon_name; + } else { + icon_name = empathy_icon_name_for_contact (contact); + } + + gtk_tree_store_set (GTK_TREE_STORE (model), iter, + EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, icon_name, + -1); + + /* To make sure the parent is shown correctly, we emit + * the row-changed signal on the parent so it prompts + * it to be refreshed by the filter func. + */ + if (gtk_tree_model_iter_parent (model, &parent_iter, iter)) { + parent_path = gtk_tree_model_get_path (model, &parent_iter); + } + if (parent_path) { + gtk_tree_model_row_changed (model, parent_path, &parent_iter); + gtk_tree_path_free (parent_path); + } + + g_object_unref (contact); + + return FALSE; +} + +static gboolean +main_window_flash_cb (EmpathyMainWindow *window) +{ + GtkTreeModel *model; + GSList *events, *l; + gboolean found_event = FALSE; + FlashForeachData data; + + window->flash_on = !window->flash_on; + data.on = window->flash_on; + model = GTK_TREE_MODEL (window->list_store); + + events = empathy_event_manager_get_events (window->event_manager); + for (l = events; l; l = l->next) { + data.event = l->data; + if (!data.event->contact) { + continue; + } + + found_event = TRUE; + gtk_tree_model_foreach (model, + main_window_flash_foreach, + &data); + } + + if (!found_event) { + main_window_flash_stop (window); + } + + return TRUE; +} + +static void +main_window_flash_start (EmpathyMainWindow *window) +{ + + if (window->flash_timeout_id != 0) { + return; + } + + DEBUG ("Start flashing"); + window->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT, + (GSourceFunc) main_window_flash_cb, + window); + main_window_flash_cb (window); +} + +static void +main_window_event_added_cb (EmpathyEventManager *manager, + EmpathyEvent *event, + EmpathyMainWindow *window) +{ + if (event->contact) { + main_window_flash_start (window); + } +} + +static void +main_window_event_removed_cb (EmpathyEventManager *manager, + EmpathyEvent *event, + EmpathyMainWindow *window) +{ + FlashForeachData data; + + if (!event->contact) { + return; + } + + data.on = FALSE; + data.event = event; + gtk_tree_model_foreach (GTK_TREE_MODEL (window->list_store), + main_window_flash_foreach, + &data); +} + +static void +main_window_row_activated_cb (EmpathyContactListView *view, + GtkTreePath *path, + GtkTreeViewColumn *col, + EmpathyMainWindow *window) +{ + EmpathyContact *contact; + GtkTreeModel *model; + GtkTreeIter iter; + GSList *events, *l; + + model = GTK_TREE_MODEL (window->list_store); + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, + EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, + -1); + + if (!contact) { + return; + } + + /* If the contact has an event, activate it */ + events = empathy_event_manager_get_events (window->event_manager); + for (l = events; l; l = l->next) { + EmpathyEvent *event = l->data; + + if (event->contact == contact) { + empathy_event_activate (event); + break; + } + } + + g_object_unref (contact); +} + GtkWidget * empathy_main_window_show (void) { @@ -188,6 +376,7 @@ empathy_main_window_show (void) gboolean compact_contact_list; gint x, y, w, h; gchar *filename; + GSList *l; if (window) { empathy_window_present (GTK_WINDOW (window->window), TRUE); @@ -298,6 +487,9 @@ empathy_main_window_show (void) gtk_widget_show (GTK_WIDGET (window->list_view)); gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (window->list_view)); + g_signal_connect (window->list_view, "row-activated", + G_CALLBACK (main_window_row_activated_cb), + window); /* Load user-defined accelerators. */ main_window_accels_load (); @@ -321,8 +513,24 @@ empathy_main_window_show (void) gtk_window_move (GTK_WINDOW (window->window), x, y); } + /* Enable event handling */ + window->event_manager = empathy_event_manager_new (); + g_signal_connect (window->event_manager, "event-added", + G_CALLBACK (main_window_event_added_cb), + window); + g_signal_connect (window->event_manager, "event-removed", + G_CALLBACK (main_window_event_removed_cb), + window); + + l = empathy_event_manager_get_events (window->event_manager); + while (l) { + main_window_event_added_cb (window->event_manager, + l->data, window); + l = l->next; + } + conf = empathy_conf_get (); - + /* Show offline ? */ empathy_conf_get_bool (conf, EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE, @@ -389,6 +597,14 @@ main_window_destroy_cb (GtkWidget *widget, g_object_unref (window->list_store); g_hash_table_destroy (window->errors); + g_signal_handlers_disconnect_by_func (window->event_manager, + main_window_event_added_cb, + window); + g_signal_handlers_disconnect_by_func (window->event_manager, + main_window_event_removed_cb, + window); + g_object_unref (window->event_manager); + g_free (window); } diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index f41d51b5..dfe4bb63 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include "empathy-accounts-dialog.h" #include "empathy-status-icon.h" #include "empathy-preferences.h" +#include "empathy-event-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER #include