empathy r1248 - trunk/libempathy-gtk
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r1248 - trunk/libempathy-gtk
- Date: Tue, 15 Jul 2008 14:00:43 +0000 (UTC)
Author: xclaesse
Date: Tue Jul 15 14:00:43 2008
New Revision: 1248
URL: http://svn.gnome.org/viewvc/empathy?rev=1248&view=rev
Log:
Activate the event when clicking on the contact list.
Modified:
trunk/libempathy-gtk/empathy-contact-list-view.c
Modified: trunk/libempathy-gtk/empathy-contact-list-view.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-list-view.c (original)
+++ trunk/libempathy-gtk/empathy-contact-list-view.c Tue Jul 15 14:00:43 2008
@@ -671,21 +671,36 @@
GtkTreeModel *model;
GtkTreeIter iter;
- if (!(priv->contact_features & EMPATHY_CONTACT_FEATURE_CHAT)) {
- return;
- }
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-
+ model = GTK_TREE_MODEL (priv->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) {
+ if (!contact) {
+ return;
+ }
+
+ if (priv->event_manager) {
+ 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;
+ }
+ }
+ }
+
+ if (priv->contact_features & EMPATHY_CONTACT_FEATURE_CHAT) {
empathy_dispatcher_chat_with_contact (contact);
- g_object_unref (contact);
}
+
+OUT:
+ g_object_unref (contact);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]