]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-contact-list-view.c
Remove check on GTK version, we depend on >= 2.14.0 now.
[empathy.git] / libempathy-gtk / empathy-contact-list-view.c
index 4760b425360c228833f06c7037ca93626ffea105..6cb8b7e8c51ecbbcebd92d45f96ba40a7d8ced56 100644 (file)
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #include <libmissioncontrol/mc-account.h>
 
+#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-contact-factory.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-contact-groups.h>
@@ -46,7 +47,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 +54,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
 
-/* 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 +65,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 {
@@ -122,151 +116,16 @@ 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;
-
-
-       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);
-}
-
-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)
+contact_list_view_tooltip_destroy_cb (GtkWidget              *widget,
+                                     EmpathyContactListView *view)
 {
        EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       FlashForeachData            data;
-
-       if (!event->contact) {
-               return;
+       
+       if (priv->tooltip_widget) {
+               DEBUG ("Tooltip destroyed");
+               priv->tooltip_widget = NULL;
+               g_object_unref (widget);
        }
-
-       data.on = FALSE;
-       data.event = event;
-       gtk_tree_model_foreach (GTK_TREE_MODEL (priv->store),
-                               contact_list_view_flash_foreach,
-                               &data);
 }
 
 static gboolean
@@ -282,16 +141,19 @@ contact_list_view_query_tooltip_cb (EmpathyContactListView *view,
        GtkTreeModel               *model;
        GtkTreeIter                 iter;
        GtkTreePath                *path;
+       static gint                 running = 0;
+       gboolean                    ret = FALSE;
 
-       /* FIXME: We need GTK version >= 2.12.10. See GNOME bug #504087 */
-       if (gtk_check_version (2, 12, 10)) {
+       /* Avoid an infinite loop. See GNOME bug #574377 */
+       if (running > 0) {
                return FALSE;
        }
+       running++;
 
        if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (view), &x, &y,
                                                keyboard_mode,
                                                &model, &path, &iter)) {
-               return FALSE;
+               goto OUT;
        }
 
        gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (view), tooltip, path);
@@ -301,24 +163,29 @@ contact_list_view_query_tooltip_cb (EmpathyContactListView *view,
                            EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
                            -1);
        if (!contact) {
-               return FALSE;
+               goto OUT;
        }
 
        if (!priv->tooltip_widget) {
                priv->tooltip_widget = empathy_contact_widget_new (contact,
-                       EMPATHY_CONTACT_WIDGET_EDIT_NONE);
-               g_object_add_weak_pointer (G_OBJECT (priv->tooltip_widget),
-                                          (gpointer) &priv->tooltip_widget);
+                       EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP);
+               g_object_ref (priv->tooltip_widget);
+               g_signal_connect (priv->tooltip_widget, "destroy",
+                                 G_CALLBACK (contact_list_view_tooltip_destroy_cb),
+                                 view);
        } else {
                empathy_contact_widget_set_contact (priv->tooltip_widget,
                                                    contact);
        }
 
        gtk_tooltip_set_custom (tooltip, priv->tooltip_widget);
+       ret = TRUE;
 
        g_object_unref (contact);
+OUT:
+       running--;
 
-       return TRUE;
+       return ret;
 }
 
 static void
@@ -353,7 +220,7 @@ contact_list_view_drag_data_received (GtkWidget         *widget,
                id);
 
        strv = g_strsplit (id, "/", 2);
-       factory = empathy_contact_factory_new ();
+       factory = empathy_contact_factory_dup_singleton ();
        account = mc_account_lookup (strv[0]);
        if (account) {
                contact = empathy_contact_factory_get_from_id (factory,
@@ -661,46 +528,30 @@ contact_list_view_key_press_event_cb (EmpathyContactListView *view,
 }
 
 static void
-contact_list_view_row_activated_cb (EmpathyContactListView *view,
-                                   GtkTreePath            *path,
-                                   GtkTreeViewColumn      *col,
-                                   gpointer                user_data)
+contact_list_view_row_activated (GtkTreeView       *view,
+                                GtkTreePath       *path,
+                                GtkTreeViewColumn *column)
 {
        EmpathyContactListViewPriv *priv = GET_PRIV (view);
        EmpathyContact             *contact;
        GtkTreeModel               *model;
        GtkTreeIter                 iter;
 
+       if (!(priv->contact_features & EMPATHY_CONTACT_FEATURE_CHAT)) {
+               return;
+       }
+
        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) {
-               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);
+       if (contact) {
+               DEBUG ("Starting a chat");
+               empathy_dispatcher_chat_with_contact (contact, NULL, NULL);
+               g_object_unref (contact);
        }
-
-OUT:
-       g_object_unref (contact);
 }
 
 static void
@@ -727,7 +578,11 @@ contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell,
                            -1);
 
        if (contact) {
-               empathy_dispatcher_call_with_contact (contact);
+               EmpathyCallFactory *factory;
+
+               factory = empathy_call_factory_get ();
+               empathy_call_factory_new_call (factory, contact);
+
                g_object_unref (contact);
        }
 }
@@ -948,7 +803,7 @@ contact_list_view_row_has_child_toggled_cb (GtkTreeModel          *model,
                            EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
                            -1);
 
-       if (!is_group || G_STR_EMPTY (name)) {
+       if (!is_group || EMP_STR_EMPTY (name)) {
                g_free (name);
                return;
        }
@@ -1125,40 +980,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
@@ -1171,15 +992,8 @@ contact_list_view_finalize (GObject *object)
        if (priv->store) {
                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);
+       if (priv->tooltip_widget) {
+               gtk_widget_destroy (priv->tooltip_widget);
        }
 
        G_OBJECT_CLASS (empathy_contact_list_view_parent_class)->finalize (object);
@@ -1240,8 +1054,9 @@ contact_list_view_set_property (GObject      *object,
 static void
 empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
 {
-       GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+       GObjectClass     *object_class = G_OBJECT_CLASS (klass);
+       GtkWidgetClass   *widget_class = GTK_WIDGET_CLASS (klass);
+       GtkTreeViewClass *tree_view_class = GTK_TREE_VIEW_CLASS (klass);
 
        object_class->finalize = contact_list_view_finalize;
        object_class->get_property = contact_list_view_get_property;
@@ -1252,12 +1067,13 @@ empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
        widget_class->drag_begin         = contact_list_view_drag_begin;
        widget_class->drag_data_get      = contact_list_view_drag_data_get;
        widget_class->drag_end           = contact_list_view_drag_end;
-       /* FIXME: noticed but when you drag the row over the treeview
-        * fast, it seems to stop redrawing itself, if we don't
-        * connect this signal, all is fine.
-        */
        widget_class->drag_motion        = contact_list_view_drag_motion;
 
+       /* We use the class method to let user of this widget to connect to
+        * the signal and stop emission of the signal so the default handler
+        * won't be called. */
+       tree_view_class->row_activated = contact_list_view_row_activated;
+
        signals[DRAG_CONTACT_RECEIVED] =
                g_signal_new ("drag-contact-received",
                              G_OBJECT_CLASS_TYPE (klass),
@@ -1316,9 +1132,6 @@ empathy_contact_list_view_init (EmpathyContactListView *view)
        g_signal_connect (view, "key-press-event",
                          G_CALLBACK (contact_list_view_key_press_event_cb),
                          NULL);
-       g_signal_connect (view, "row-activated",
-                         G_CALLBACK (contact_list_view_row_activated_cb),
-                         NULL);
        g_signal_connect (view, "row-expanded",
                          G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
                          GINT_TO_POINTER (TRUE));
@@ -1403,31 +1216,22 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
 
 static gboolean
 contact_list_view_remove_dialog_show (GtkWindow   *parent, 
-                                     const gchar *window_title, 
-                                     const gchar *text)
+                                     const gchar *message, 
+                                     const gchar *secondary_text)
 {
-       GtkWidget *dialog, *label, *image, *hbox;
+       GtkWidget *dialog;
        gboolean res;
        
-       dialog = gtk_dialog_new_with_buttons (window_title, parent,
-                                             GTK_DIALOG_MODAL,
-                                             GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
-                                             GTK_STOCK_DELETE, GTK_RESPONSE_YES,
-                                             NULL);
-       gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
-        
-       label = gtk_label_new (text);
-       image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+       dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+                                        "%s", message);
+       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                               GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+                               GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+                               NULL);
+       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                 "%s", secondary_text);
         
-       hbox = gtk_hbox_new (FALSE, 5);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-       gtk_box_pack_start_defaults (GTK_BOX (hbox), image);
-       gtk_box_pack_start_defaults (GTK_BOX (hbox), label);     
-       gtk_box_pack_start_defaults (GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);
-
-       gtk_widget_show (image);
-       gtk_widget_show (label);
-       gtk_widget_show (hbox);
        gtk_widget_show (dialog);
         
        res = gtk_dialog_run (GTK_DIALOG (dialog));