X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-roster-window.c;h=b70332de238c9a8fc26e0fb0b3976d286afc4636;hp=5b9842dccc3fc84ef9b22de563af898c18c39ad6;hb=15aa6a83ff96fad9f959762f2b57646f9e735cd1;hpb=bf821168dfb8c2e835cdf57a1c313841ee0dd763 diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 5b9842dc..b70332de 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -21,58 +21,48 @@ * Danielle Madeley */ -#include +#include "config.h" +#include "empathy-roster-window.h" #include -#include -#include #include +#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include "empathy-about-dialog.h" #include "empathy-accounts-dialog.h" #include "empathy-call-observer.h" #include "empathy-chat-manager.h" -#include "empathy-roster-window.h" -#include "empathy-preferences.h" -#include "empathy-about-dialog.h" -#include "empathy-debug-window.h" -#include "empathy-new-chatroom-dialog.h" +#include "empathy-chat-window.h" +#include "empathy-chatroom-manager.h" #include "empathy-chatrooms-window.h" +#include "empathy-client-factory.h" +#include "empathy-contact-blocking-dialog.h" +#include "empathy-contact-search-dialog.h" #include "empathy-event-manager.h" #include "empathy-ft-manager.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-gsettings.h" +#include "empathy-gtk-enum-types.h" +#include "empathy-individual-dialogs.h" +#include "empathy-log-window.h" +#include "empathy-new-call-dialog.h" +#include "empathy-new-chatroom-dialog.h" +#include "empathy-new-message-dialog.h" +#include "empathy-preferences.h" +#include "empathy-presence-chooser.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-status-presets.h" +#include "empathy-theme-manager.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 @@ -101,9 +91,10 @@ enum G_DEFINE_TYPE (EmpathyRosterWindow, empathy_roster_window, GTK_TYPE_APPLICATION_WINDOW) struct _EmpathyRosterWindowPriv { - EmpathyIndividualStore *individual_store; - EmpathyIndividualView *individual_view; + EmpathyRosterView *view; TpAccountManager *account_manager; + EmpathyChatManager *chat_manager; + EmpathyThemeManager *theme_manager; EmpathyChatroomManager *chatroom_manager; EmpathyEventManager *event_manager; EmpathySoundManager *sound_mgr; @@ -111,10 +102,8 @@ struct _EmpathyRosterWindowPriv { EmpathyIndividualManager *individual_manager; guint flash_timeout_id; gboolean flash_on; - gboolean empty; GSettings *gsettings_ui; - GSettings *gsettings_contacts; GtkWidget *preferences; GtkWidget *main_vbox; @@ -127,7 +116,12 @@ struct _EmpathyRosterWindowPriv { GtkWidget *notebook; GtkWidget *no_entry_label; GtkWidget *button_account_settings; + GtkWidget *button_online; + GtkWidget *button_show_offline; + GtkWidget *button_add_contact; GtkWidget *spinner_loading; + GtkWidget *tooltip_widget; + GtkWidget *chat_window; GMenu *menumodel; GMenu *rooms_section; @@ -152,136 +146,6 @@ struct _EmpathyRosterWindowPriv { gboolean shell_running; }; -static void -roster_window_flash_stop (EmpathyRosterWindow *self) -{ - if (self->priv->flash_timeout_id == 0) - return; - - DEBUG ("Stop flashing"); - g_source_remove (self->priv->flash_timeout_id); - self->priv->flash_timeout_id = 0; - self->priv->flash_on = FALSE; -} - -typedef struct -{ - EmpathyEvent *event; - gboolean on; - EmpathyRosterWindow *self; -} FlashForeachData; - -static gboolean -roster_window_flash_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - FlashForeachData *data = (FlashForeachData *) user_data; - FolksIndividual *individual; - EmpathyContact *contact; - const gchar *icon_name; - GtkTreePath *parent_path = NULL; - GtkTreeIter parent_iter; - GdkPixbuf *pixbuf = NULL; - - gtk_tree_model_get (model, iter, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, - -1); - - if (individual == NULL) - return FALSE; - - contact = empathy_contact_dup_from_folks_individual (individual); - if (contact != data->event->contact) - goto out; - - if (data->on) - { - icon_name = data->event->icon_name; - pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - } - else - { - pixbuf = empathy_individual_store_get_individual_status_icon ( - data->self->priv->individual_store, - individual); - if (pixbuf != NULL) - g_object_ref (pixbuf); - } - - gtk_tree_store_set (GTK_TREE_STORE (model), iter, - EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf, - -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 != NULL) - { - gtk_tree_model_row_changed (model, parent_path, &parent_iter); - gtk_tree_path_free (parent_path); - } - -out: - g_object_unref (individual); - tp_clear_object (&contact); - tp_clear_object (&pixbuf); - - return FALSE; -} - -static gboolean -roster_window_flash_cb (EmpathyRosterWindow *self) -{ - GtkTreeModel *model; - GSList *events, *l; - gboolean found_event = FALSE; - FlashForeachData data; - - self->priv->flash_on = !self->priv->flash_on; - data.on = self->priv->flash_on; - model = GTK_TREE_MODEL (self->priv->individual_store); - - events = empathy_event_manager_get_events (self->priv->event_manager); - for (l = events; l; l = l->next) - { - data.event = l->data; - data.self = self; - if (!data.event->contact || !data.event->must_ack) - continue; - - found_event = TRUE; - gtk_tree_model_foreach (model, - roster_window_flash_foreach, - &data); - } - - if (!found_event) - roster_window_flash_stop (self); - - return TRUE; -} - -static void -roster_window_flash_start (EmpathyRosterWindow *self) -{ - if (self->priv->flash_timeout_id != 0) - return; - - DEBUG ("Start flashing"); - self->priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT, - (GSourceFunc) roster_window_flash_cb, self); - - roster_window_flash_cb (self); -} - static void roster_window_remove_auth (EmpathyRosterWindow *self, EmpathyEvent *event) @@ -406,81 +270,16 @@ roster_window_auth_display (EmpathyRosterWindow *self, g_hash_table_insert (self->priv->auths, event, info_bar); } -static void -modify_event_count (GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyEvent *event, - gboolean increase) -{ - FolksIndividual *individual; - EmpathyContact *contact; - guint count; - - gtk_tree_model_get (model, iter, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, - EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, &count, - -1); - - if (individual == NULL) - return; - - increase ? count++ : count--; - - contact = empathy_contact_dup_from_folks_individual (individual); - if (contact == event->contact) - gtk_tree_store_set (GTK_TREE_STORE (model), iter, - EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, count, -1); - - tp_clear_object (&contact); - g_object_unref (individual); -} - -static gboolean -increase_event_count_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - EmpathyEvent *event = user_data; - - modify_event_count (model, iter, event, TRUE); - - return FALSE; -} - -static void -increase_event_count (EmpathyRosterWindow *self, - EmpathyEvent *event) -{ - GtkTreeModel *model; - - model = GTK_TREE_MODEL (self->priv->individual_store); - - gtk_tree_model_foreach (model, increase_event_count_foreach, event); -} - -static gboolean -decrease_event_count_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - EmpathyEvent *event = user_data; - - modify_event_count (model, iter, event, FALSE); - - return FALSE; -} - -static void -decrease_event_count (EmpathyRosterWindow *self, - EmpathyEvent *event) +static FolksIndividual * +ensure_individual_for_event (EmpathyEvent *event) { - GtkTreeModel *model; + TpContact *contact; - model = GTK_TREE_MODEL (self->priv->individual_store); + contact = empathy_contact_get_tp_contact (event->contact); + if (contact == NULL) + return NULL; - gtk_tree_model_foreach (model, decrease_event_count_foreach, event); + return empathy_ensure_individual_from_tp_contact (contact); } static void @@ -490,9 +289,16 @@ roster_window_event_added_cb (EmpathyEventManager *manager, { if (event->contact) { - increase_event_count (self, event); + FolksIndividual *individual; - roster_window_flash_start (self); + individual = ensure_individual_for_event (event); + if (individual == NULL) + return; + + event->roster_view_id = empathy_roster_view_add_event (self->priv->view, + individual, event->icon_name, event); + + g_object_unref (individual); } else if (event->type == EMPATHY_EVENT_TYPE_AUTH) { @@ -505,26 +311,13 @@ roster_window_event_removed_cb (EmpathyEventManager *manager, EmpathyEvent *event, EmpathyRosterWindow *self) { - FlashForeachData data; - if (event->type == EMPATHY_EVENT_TYPE_AUTH) { roster_window_remove_auth (self, event); return; } - if (!event->contact) - return; - - decrease_event_count (self, event); - - data.on = FALSE; - data.event = event; - data.self = self; - - gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->individual_store), - roster_window_flash_foreach, - &data); + empathy_roster_view_remove_event (self->priv->view, event->roster_view_id); } static gboolean @@ -545,51 +338,46 @@ roster_window_load_events_idle_cb (gpointer user_data) } static void -roster_window_row_activated_cb (EmpathyIndividualView *view, - GtkTreePath *path, - GtkTreeViewColumn *col, - EmpathyRosterWindow *self) +hide_search_bar (EmpathyRosterWindow *roster_window) { - EmpathyContact *contact = NULL; - FolksIndividual *individual; - GtkTreeModel *model; - GtkTreeIter iter; - GSList *events, *l; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->individual_view)); - gtk_tree_model_get_iter (model, &iter, path); + if (TPAW_IS_LIVE_SEARCH (roster_window->priv->search_bar) && + gtk_widget_is_visible (roster_window->priv->search_bar)) + gtk_widget_hide (roster_window->priv->search_bar); +} - gtk_tree_model_get (model, &iter, EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, - &individual, -1); +static void +individual_activated_cb (EmpathyRosterView *self, + FolksIndividual *individual, + gpointer user_data) +{ + EmpathyContact *contact; - if (individual != NULL) - contact = empathy_contact_dup_from_folks_individual (individual); + contact = empathy_contact_dup_best_for_action (individual, + EMPATHY_ACTION_CHAT); if (contact == NULL) - goto OUT; + return; - /* If the contact has an event activate it, otherwise the - * default handler of row-activated will be called. */ - events = empathy_event_manager_get_events (self->priv->event_manager); - for (l = events; l; l = l->next) - { - EmpathyEvent *event = l->data; + DEBUG ("Starting a chat"); - if (event->contact == contact) - { - DEBUG ("Activate event"); - empathy_event_activate (event); - - /* We don't want the default handler of this signal - * (e.g. open a chat) */ - g_signal_stop_emission_by_name (view, "row-activated"); - break; - } - } + empathy_chat_with_contact (contact, gtk_get_current_event_time ()); g_object_unref (contact); -OUT: - tp_clear_object (&individual); + + /* Hide the search-bar upon hitting "Enter" on an individual */ + hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data)); +} + +static void +event_activated_cb (EmpathyRosterView *self, + FolksIndividual *individual, + EmpathyEvent *event, + gpointer user_data) +{ + empathy_event_activate (event); + + /* Hide the search-bar upon an event activation */ + hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data)); } static void @@ -600,11 +388,74 @@ button_account_settings_clicked_cb (GtkButton *button, NULL, FALSE, FALSE); } +static void +button_online_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + EmpathyPresenceManager *mgr; + + mgr = empathy_presence_manager_dup_singleton (); + + empathy_presence_manager_set_state (mgr, + TP_CONNECTION_PRESENCE_TYPE_AVAILABLE); + + g_object_unref (mgr); +} + +static void +button_show_offline_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + g_settings_set_boolean (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_OFFLINE, TRUE); +} + +static void +button_add_contact_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + empathy_new_individual_dialog_show (GTK_WINDOW (self)); +} + +typedef enum +{ + PAGE_MESSAGE_FLAG_NONE = 0, + PAGE_MESSAGE_FLAG_ACCOUNTS = 1 << 0, + PAGE_MESSAGE_FLAG_SPINNER = 1 << 2, + PAGE_MESSAGE_FLAG_ONLINE = 1 << 3, + PAGE_MESSAGE_FLAG_SHOW_OFFLINE = 1 << 4, + PAGE_MESSAGE_FLAG_ADD_CONTACT = 1 << 5, +} PageMessageFlags; + +static gboolean +can_add_contact (EmpathyRosterWindow *self) +{ + GList *accounts, *l; + gboolean result = FALSE; + + accounts = tp_account_manager_dup_valid_accounts ( + self->priv->account_manager); + for (l = accounts; l != NULL && !result; l = g_list_next (l)) + { + TpAccount *account = TP_ACCOUNT (l->data); + TpConnection *conn; + + conn = tp_account_get_connection (account); + if (conn == NULL) + continue; + + if (tp_connection_get_can_change_contact_list (conn)) + result = TRUE; + } + + g_list_free_full (accounts, g_object_unref); + return result; +} + static void display_page_message (EmpathyRosterWindow *self, const gchar *msg, - gboolean display_accounts_button, - gboolean display_spinner) + PageMessageFlags flags) { if (msg != NULL) { @@ -624,9 +475,19 @@ display_page_message (EmpathyRosterWindow *self, } gtk_widget_set_visible (self->priv->button_account_settings, - display_accounts_button); + (flags & PAGE_MESSAGE_FLAG_ACCOUNTS) != 0); gtk_widget_set_visible (self->priv->spinner_loading, - display_spinner); + (flags & PAGE_MESSAGE_FLAG_SPINNER) != 0); + gtk_widget_set_visible (self->priv->button_online, + (flags & PAGE_MESSAGE_FLAG_ONLINE) != 0); + gtk_widget_set_visible (self->priv->button_show_offline, + (flags & PAGE_MESSAGE_FLAG_SHOW_OFFLINE) != 0); + gtk_widget_set_visible (self->priv->button_add_contact, + (flags & PAGE_MESSAGE_FLAG_ADD_CONTACT) != 0); + + if ((flags & PAGE_MESSAGE_FLAG_ADD_CONTACT) != 0) + gtk_widget_set_sensitive (self->priv->button_add_contact, + can_add_contact (self)); gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), PAGE_MESSAGE); @@ -636,25 +497,8 @@ static void display_page_no_account (EmpathyRosterWindow *self) { display_page_message (self, - _("You need to setup an account to see contacts here."), TRUE, FALSE); -} - -static void -roster_window_row_deleted_cb (GtkTreeModel *model, - GtkTreePath *path, - EmpathyRosterWindow *self) -{ - GtkTreeIter help_iter; - - if (!gtk_tree_model_get_iter_first (model, &help_iter)) - { - self->priv->empty = TRUE; - - if (empathy_individual_view_is_searching (self->priv->individual_view)) - { - display_page_message (self, _("No match found"), FALSE, FALSE); - } - } + _("You need to set up an account to see contacts here."), + PAGE_MESSAGE_FLAG_ACCOUNTS); } static void @@ -669,27 +513,6 @@ display_page_contact_list (EmpathyRosterWindow *self) PAGE_CONTACT_LIST); } -static void -roster_window_row_inserted_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - EmpathyRosterWindow *self) -{ - if (self->priv->empty) - { - self->priv->empty = FALSE; - - display_page_contact_list (self); - gtk_widget_grab_focus (GTK_WIDGET (self->priv->individual_view)); - - /* The store is being filled, it will be done after an idle cb. - * So we can then get events. If we do that too soon, event's - * contact is not yet in the store and it won't get marked as - * having events. */ - g_idle_add (roster_window_load_events_idle_cb, self); - } -} - static void roster_window_remove_error (EmpathyRosterWindow *self, TpAccount *account) @@ -712,99 +535,77 @@ roster_window_account_disabled_cb (TpAccountManager *manager, roster_window_remove_error (self, account); } -static void -roster_window_error_retry_clicked_cb (GtkButton *button, - EmpathyRosterWindow *self) +typedef enum { - TpAccount *account; - - account = g_object_get_data (G_OBJECT (button), "account"); - tp_account_reconnect_async (account, NULL, NULL); - - roster_window_remove_error (self, account); -} + ERROR_RESPONSE_RETRY, + ERROR_RESPONSE_EDIT, + ERROR_RESPONSE_CLOSE, + ERROR_RESPONSE_UPGRADE, +} ErrorResponse; static void -roster_window_error_edit_clicked_cb (GtkButton *button, +roster_window_error_response_cb (GtkInfoBar *infobar, + gint response_id, EmpathyRosterWindow *self) { TpAccount *account; - account = g_object_get_data (G_OBJECT (button), "account"); - - empathy_accounts_dialog_show_application ( - gtk_widget_get_screen (GTK_WIDGET (button)), - account, FALSE, FALSE); + account = g_object_get_data (G_OBJECT (infobar), "account"); - roster_window_remove_error (self, account); -} + switch (response_id) + { + case ERROR_RESPONSE_RETRY: + tp_account_reconnect_async (account, NULL, NULL); + break; -static void -roster_window_error_close_clicked_cb (GtkButton *button, - EmpathyRosterWindow *self) -{ - TpAccount *account; + case ERROR_RESPONSE_EDIT: + empathy_accounts_dialog_show_application ( + gtk_widget_get_screen (GTK_WIDGET (infobar)), + account, FALSE, FALSE); + break; - account = g_object_get_data (G_OBJECT (button), "account"); - roster_window_remove_error (self, account); -} + case ERROR_RESPONSE_CLOSE: + break; -static void -roster_window_error_upgrade_sw_clicked_cb (GtkButton *button, - EmpathyRosterWindow *self) -{ - TpAccount *account; - GtkWidget *dialog; + case ERROR_RESPONSE_UPGRADE: + { + GtkWidget *dialog; - account = g_object_get_data (G_OBJECT (button), "account"); - roster_window_remove_error (self, account); + dialog = gtk_message_dialog_new (GTK_WINDOW (self), + GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + _("Sorry, %s accounts can’t be used until your %s software is updated."), + tp_account_get_protocol_name (account), + tp_account_get_protocol_name (account)); - dialog = gtk_message_dialog_new (GTK_WINDOW (self), - GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("Sorry, %s accounts can’t be used until your %s software is updated."), - tp_account_get_protocol (account), - tp_account_get_protocol (account)); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + dialog); - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + gtk_widget_show (dialog); + } + } - gtk_widget_show (dialog); + roster_window_remove_error (self, account); } -static void -roster_window_upgrade_software_error (EmpathyRosterWindow *self, - TpAccount *account) +static GtkWidget * +roster_window_error_create_info_bar (EmpathyRosterWindow *self, + TpAccount *account, + GtkMessageType message_type, + const gchar *message_markup) { GtkWidget *info_bar; GtkWidget *content_area; + GtkWidget *action_area; GtkWidget *label; GtkWidget *image; - GtkWidget *upgrade_button; - GtkWidget *close_button; - GtkWidget *action_area; - GtkWidget *action_grid; - gchar *str; const gchar *icon_name; - const gchar *error_message; - gboolean user_requested; - - error_message = - empathy_account_get_error_message (account, &user_requested); - - if (user_requested) - return; - - str = g_markup_printf_escaped ("%s\n%s", - tp_account_get_display_name (account), - error_message); /* If there are other errors, remove them */ roster_window_remove_error (self, account); info_bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR); + gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), message_type); gtk_widget_set_no_show_all (info_bar, TRUE); gtk_box_pack_start (GTK_BOX (self->priv->errors_vbox), info_bar, FALSE, TRUE, 0); @@ -814,182 +615,159 @@ roster_window_upgrade_software_error (EmpathyRosterWindow *self, image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_widget_show (image); - label = gtk_label_new (str); + label = gtk_label_new (message_markup); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_widget_show (label); - g_free (str); content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); - image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); - upgrade_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (upgrade_button), image); - gtk_widget_set_tooltip_text (upgrade_button, _("Update software...")); - gtk_widget_show (upgrade_button); - - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); - close_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_widget_set_tooltip_text (close_button, _("Close")); - gtk_widget_show (close_button); - - action_grid = gtk_grid_new (); - gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2); - gtk_widget_show (action_grid); - action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); - - gtk_grid_attach (GTK_GRID (action_grid), upgrade_button, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1); + gtk_orientable_set_orientation (GTK_ORIENTABLE (action_area), + GTK_ORIENTATION_HORIZONTAL); + gtk_style_context_add_class (gtk_widget_get_style_context (action_area), + "empathy-roster-window-error-button"); - g_object_set_data (G_OBJECT (info_bar), "label", label); g_object_set_data_full (G_OBJECT (info_bar), "account", g_object_ref (account), g_object_unref); - g_object_set_data_full (G_OBJECT (upgrade_button), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (close_button), - "account", g_object_ref (account), - g_object_unref); - g_signal_connect (upgrade_button, "clicked", - G_CALLBACK (roster_window_error_upgrade_sw_clicked_cb), self); - g_signal_connect (close_button, "clicked", - G_CALLBACK (roster_window_error_close_clicked_cb), self); + g_signal_connect (info_bar, "response", + G_CALLBACK (roster_window_error_response_cb), self); - gtk_widget_set_tooltip_text (self->priv->errors_vbox, error_message); gtk_widget_show (self->priv->errors_vbox); g_hash_table_insert (self->priv->errors, g_object_ref (account), info_bar); + + return info_bar; } static void -roster_window_error_display (EmpathyRosterWindow *self, - TpAccount *account) +roster_window_error_add_stock_button (GtkInfoBar *info_bar, + const gchar *stock_id, + const gchar *tooltip, + ErrorResponse response_id) { - GtkWidget *info_bar; - GtkWidget *content_area; - GtkWidget *label; GtkWidget *image; - GtkWidget *retry_button; - GtkWidget *edit_button; - GtkWidget *close_button; - GtkWidget *action_area; - GtkWidget *action_grid; - gchar *str; - const gchar *icon_name; - const gchar *error_message; - gboolean user_requested; - - if (!tp_strdiff (TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED, - tp_account_get_detailed_error (account, NULL))) - { - roster_window_upgrade_software_error (self, account); - return; - } + GtkWidget *button; - error_message = empathy_account_get_error_message (account, &user_requested); + image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); + button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (button), image); + gtk_widget_set_tooltip_text (button, tooltip); + gtk_widget_show (button); - if (user_requested) - return; - - str = g_markup_printf_escaped ("%s\n%s", - tp_account_get_display_name (account), error_message); + gtk_info_bar_add_action_widget (info_bar, button, response_id); +} - info_bar = g_hash_table_lookup (self->priv->errors, account); - if (info_bar) - { - label = g_object_get_data (G_OBJECT (info_bar), "label"); +#ifdef HAVE_UOA +static const gchar * +uoa_account_display_string (TpAccount *account) +{ + const gchar *service; - /* Just set the latest error and return */ - gtk_label_set_markup (GTK_LABEL (label), str); - g_free (str); + service = tp_account_get_service (account); - return; - } + /* Use well known service name, if available */ + if (!tp_strdiff (service, "windows-live")) + return _("Windows Live"); + else if (!tp_strdiff (service, "google-talk")) + return _("Google Talk"); + else if (!tp_strdiff (service, "facebook")) + return _("Facebook"); - info_bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR); + return tp_account_get_display_name (account); +} - gtk_widget_set_no_show_all (info_bar, TRUE); - gtk_box_pack_start (GTK_BOX (self->priv->errors_vbox), info_bar, FALSE, TRUE, 0); - gtk_widget_show (info_bar); +static void +roster_window_uoa_auth_error (EmpathyRosterWindow *self, + TpAccount *account) +{ + GtkWidget *info_bar; + GtkWidget *image; + GtkWidget *button; + gchar *str; - icon_name = tp_account_get_icon_name (account); - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_widget_show (image); + /* translators: %s is an account name like 'Facebook' or 'Google Talk' */ + str = g_strdup_printf (_("%s account requires authorisation"), + uoa_account_display_string (account)); - label = gtk_label_new (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_show (label); + info_bar = roster_window_error_create_info_bar (self, account, + GTK_MESSAGE_OTHER, str); g_free (str); - content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); - - image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); - retry_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (retry_button), image); - gtk_widget_set_tooltip_text (retry_button, _("Reconnect")); - gtk_widget_show (retry_button); + image = gtk_image_new_from_icon_name ("credentials-preferences", + GTK_ICON_SIZE_BUTTON); + button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (button), image); + gtk_widget_set_tooltip_text (button, _("Online Accounts")); + gtk_widget_show (button); - image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON); - edit_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (edit_button), image); - gtk_widget_set_tooltip_text (edit_button, _("Edit Account")); - gtk_widget_show (edit_button); + gtk_info_bar_add_action_widget (GTK_INFO_BAR (info_bar), button, + ERROR_RESPONSE_EDIT); +} +#endif - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); - close_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_widget_set_tooltip_text (close_button, _("Close")); - gtk_widget_show (close_button); +static void +roster_window_error_display (EmpathyRosterWindow *self, + TpAccount *account) +{ + const gchar *error_message; + gboolean user_requested; + GtkWidget *info_bar; + gchar *str; - action_grid = gtk_grid_new (); - gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2); - gtk_widget_show (action_grid); + error_message = + empathy_account_get_error_message (account, &user_requested); - action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); + if (user_requested) + return; - gtk_grid_attach (GTK_GRID (action_grid), retry_button, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), edit_button, 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), close_button, 2, 0, 1, 1); +#ifdef HAVE_UOA + if (!tp_strdiff (TP_ERROR_STR_AUTHENTICATION_FAILED, + tp_account_get_detailed_error (account, NULL)) && + !tp_strdiff (tp_account_get_storage_provider (account), + EMPATHY_UOA_PROVIDER)) + { + roster_window_uoa_auth_error (self, account); + return; + } +#endif - g_object_set_data (G_OBJECT (info_bar), "label", label); - g_object_set_data_full (G_OBJECT (info_bar), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (edit_button), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (close_button), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (retry_button), - "account", g_object_ref (account), - g_object_unref); + str = g_markup_printf_escaped ("%s\n%s", + tp_account_get_display_name (account), error_message); - g_signal_connect (edit_button, "clicked", - G_CALLBACK (roster_window_error_edit_clicked_cb), self); - g_signal_connect (close_button, "clicked", - G_CALLBACK (roster_window_error_close_clicked_cb), self); - g_signal_connect (retry_button, "clicked", - G_CALLBACK (roster_window_error_retry_clicked_cb), self); + info_bar = roster_window_error_create_info_bar (self, account, + GTK_MESSAGE_ERROR, str); + g_free (str); gtk_widget_set_tooltip_text (self->priv->errors_vbox, error_message); - gtk_widget_show (self->priv->errors_vbox); - g_hash_table_insert (self->priv->errors, g_object_ref (account), info_bar); + if (!tp_strdiff (TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED, + tp_account_get_detailed_error (account, NULL))) + { + roster_window_error_add_stock_button (GTK_INFO_BAR (info_bar), + GTK_STOCK_REFRESH, _("Update software…"), + ERROR_RESPONSE_RETRY); + } + else + { + roster_window_error_add_stock_button (GTK_INFO_BAR (info_bar), + GTK_STOCK_REFRESH, _("Reconnect"), + ERROR_RESPONSE_RETRY); + + roster_window_error_add_stock_button (GTK_INFO_BAR (info_bar), + GTK_STOCK_EDIT, _("Edit Account"), + ERROR_RESPONSE_EDIT); + } + + roster_window_error_add_stock_button (GTK_INFO_BAR (info_bar), + GTK_STOCK_CLOSE, _("Close"), + ERROR_RESPONSE_CLOSE); } static void @@ -997,6 +775,7 @@ roster_window_update_status (EmpathyRosterWindow *self) { gboolean connected, connecting; GList *l; + GAction *action; connected = empathy_account_manager_get_accounts_connected (&connecting); @@ -1015,6 +794,10 @@ roster_window_update_status (EmpathyRosterWindow *self) /* Update widgets sensibility */ for (l = self->priv->actions_connected; l; l = l->next) g_simple_action_set_enabled (l->data, connected); + + action = g_action_map_lookup_action (G_ACTION_MAP (self), "chat_add_contact"); + if (!can_add_contact (self)) + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE); } static void @@ -1161,6 +944,8 @@ roster_window_remove_balance_action (EmpathyRosterWindow *self, gtk_widget_destroy (hbox); } +static void set_notebook_page (EmpathyRosterWindow *self); + static void roster_window_connection_changed_cb (TpAccount *account, guint old_status, @@ -1171,6 +956,7 @@ roster_window_connection_changed_cb (TpAccount *account, EmpathyRosterWindow *self) { roster_window_update_status (self); + set_notebook_page (self); if (current == TP_CONNECTION_STATUS_DISCONNECTED && reason != TP_CONNECTION_STATUS_REASON_REQUESTED) @@ -1240,7 +1026,6 @@ empathy_roster_window_finalize (GObject *window) g_list_free (self->priv->actions_connected); g_object_unref (self->priv->account_manager); - g_object_unref (self->priv->individual_store); g_object_unref (self->priv->sound_mgr); g_hash_table_unref (self->priv->errors); g_hash_table_unref (self->priv->auths); @@ -1252,38 +1037,50 @@ empathy_roster_window_finalize (GObject *window) g_hash_table_unref (self->priv->status_changed_handlers); - g_signal_handlers_disconnect_by_func (self->priv->event_manager, - roster_window_event_added_cb, self); - g_signal_handlers_disconnect_by_func (self->priv->event_manager, - roster_window_event_removed_cb, self); - g_object_unref (self->priv->call_observer); g_object_unref (self->priv->event_manager); + g_object_unref (self->priv->chat_manager); + g_object_unref (self->priv->theme_manager); g_object_unref (self->priv->chatroom_manager); g_object_unref (self->priv->gsettings_ui); - g_object_unref (self->priv->gsettings_contacts); g_object_unref (self->priv->individual_manager); g_object_unref (self->priv->menumodel); g_object_unref (self->priv->rooms_section); + g_clear_object (&self->priv->tooltip_widget); + G_OBJECT_CLASS (empathy_roster_window_parent_class)->finalize (window); } static gboolean roster_window_key_press_event_cb (GtkWidget *window, GdkEventKey *event, - gpointer user_data) + EmpathyRosterWindow *self) { if (event->keyval == GDK_KEY_T && event->state & GDK_SHIFT_MASK && event->state & GDK_CONTROL_MASK) empathy_chat_manager_call_undo_closed_chat (); + if (event->keyval == GDK_KEY_f + && event->state & GDK_CONTROL_MASK) + gtk_widget_show (self->priv->search_bar); + return FALSE; } +static void +unprepare_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GtkWidget *self = user_data; + + gtk_widget_destroy (self); +} + static void roster_window_chat_quit_cb (GSimpleAction *action, GVariant *parameter, @@ -1291,7 +1088,14 @@ roster_window_chat_quit_cb (GSimpleAction *action, { EmpathyRosterWindow *self = user_data; - gtk_widget_destroy (GTK_WIDGET (self)); + /* Destroying the window will make us leave the main loop and so exit the + * process. Before doing so we want to unprepare the individual manager. + * Just hide the window now and actually destroy it once Folks is done. + */ + gtk_widget_hide (GTK_WIDGET (self)); + + empathy_individual_manager_unprepare_async (self->priv->individual_manager, + unprepare_cb, self); } static void @@ -1356,16 +1160,6 @@ roster_window_view_show_ft_manager (GSimpleAction *action, empathy_ft_manager_show (); } -static void -roster_window_edit_search_contacts_cb (GSimpleAction *action, - GVariant *parameter, - gpointer user_data) -{ - EmpathyRosterWindow *self = user_data; - - empathy_individual_view_start_search (self->priv->individual_view); -} - static void join_chatroom (EmpathyChatroom *chatroom, gint64 timestamp) @@ -1487,19 +1281,43 @@ roster_window_favorite_chatroom_join (EmpathyChatroom *chatroom) } static void -roster_window_favorite_chatroom_menu_activate_cb (GAction *action, +roster_window_join_chatroom_menu_activate_cb (GSimpleAction *action, GVariant *parameter, - EmpathyChatroom *chatroom) + gpointer user_data) { + EmpathyRosterWindow *self = user_data; + const gchar *room, *path; + EmpathyClientFactory *factory; + TpAccount *account; + GError *error = NULL; + EmpathyChatroom *chatroom; + + g_variant_get (parameter, "(&s&s)", &room, &path); + + factory = empathy_client_factory_dup (); + + account = tp_simple_client_factory_ensure_account ( + TP_SIMPLE_CLIENT_FACTORY (factory), path, NULL, &error); + if (account == NULL) + { + DEBUG ("Failed to get account '%s': %s", path, error->message); + g_error_free (error); + goto out; + } + + chatroom = empathy_chatroom_manager_find (self->priv->chatroom_manager, + account, room); + if (chatroom == NULL) + { + DEBUG ("Failed to get chatroom '%s' on '%s'", + room, path); + goto out; + } + roster_window_favorite_chatroom_join (chatroom); -} -static gchar * -dup_join_action_name (EmpathyChatroom *chatroom, - gboolean prefix) -{ - return g_strconcat (prefix ? "win." : "", "join-", - empathy_chatroom_get_name (chatroom), NULL); +out: + g_object_unref (factory); } static void @@ -1507,35 +1325,26 @@ roster_window_favorite_chatroom_menu_add (EmpathyRosterWindow *self, EmpathyChatroom *chatroom) { GMenuItem *item; - const gchar *name, *account_name; - gchar *label, *action_name; - GAction *action; + const gchar *name, *account_name, *account_path; + TpAccount *account; + gchar *label; + + account = empathy_chatroom_get_account (chatroom); name = empathy_chatroom_get_name (chatroom); - account_name = tp_account_get_display_name ( - empathy_chatroom_get_account (chatroom)); + account_name = tp_account_get_display_name (account); + account_path = tp_proxy_get_object_path (account); label = g_strdup_printf ("%s (%s)", name, account_name); - action_name = dup_join_action_name (chatroom, FALSE); - - action = (GAction *) g_simple_action_new (action_name, NULL); - g_free (action_name); - - g_signal_connect (action, "activate", - G_CALLBACK (roster_window_favorite_chatroom_menu_activate_cb), - chatroom); - - g_action_map_add_action (G_ACTION_MAP (self), action); - - action_name = dup_join_action_name (chatroom, TRUE); - item = g_menu_item_new (label, action_name); + item = g_menu_item_new (label, NULL); + g_menu_item_set_action_and_target (item, "win.join", "(ss)", + name, account_path); g_menu_item_set_attribute (item, "room-name", "s", name); + g_menu_item_set_attribute (item, "account-path", "s", account_path); g_menu_append_item (self->priv->rooms_section, item); g_free (label); - g_free (action_name); - g_object_unref (action); } static void @@ -1553,26 +1362,46 @@ roster_window_favorite_chatroom_menu_removed_cb ( EmpathyRosterWindow *self) { GList *chatrooms; - gchar *act; - gint i; + guint i, n; + TpAccount *account; + const gchar *account_path; - act = dup_join_action_name (chatroom, TRUE); + account = empathy_chatroom_get_account (chatroom); + account_path = tp_proxy_get_object_path (account); - g_action_map_remove_action (G_ACTION_MAP (self), act); + n = g_menu_model_get_n_items (G_MENU_MODEL (self->priv->rooms_section)); - for (i = 0; i < g_menu_model_get_n_items ( - G_MENU_MODEL (self->priv->rooms_section)); i++) + for (i = 0; i < n; i++) { - const gchar *name; + gchar *tmp; + + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "room-name", "s", &tmp)) + continue; + + if (tp_strdiff (tmp, empathy_chatroom_get_name (chatroom))) + { + g_free (tmp); + continue; + } + + g_free (tmp); + + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "account-path", "s", &tmp)) + continue; - if (g_menu_model_get_item_attribute ( - G_MENU_MODEL (self->priv->rooms_section), i, "room-name", - "s", &name) - && !tp_strdiff (name, empathy_chatroom_get_name (chatroom))) + if (tp_strdiff (tmp, account_path)) { - g_menu_remove (self->priv->rooms_section, i); - break; + g_free (tmp); + continue; } + + g_menu_remove (self->priv->rooms_section, i); + g_free (tmp); + break; } chatrooms = empathy_chatroom_manager_get_chatrooms ( @@ -1710,23 +1539,34 @@ roster_window_help_about_cb (GSimpleAction *action, } static void -roster_window_help_debug_cb (GSimpleAction *action, +roster_window_help_contents_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - empathy_launch_program (BIN_DIR, "empathy-debugger", NULL); + EmpathyRosterWindow *self = user_data; + + empathy_url_show (GTK_WIDGET (self), "help:empathy"); } static void -roster_window_help_contents_cb (GSimpleAction *action, +next_tab_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { EmpathyRosterWindow *self = user_data; + empathy_chat_window_next_tab (EMPATHY_CHAT_WINDOW (self->priv->chat_window)); +} - empathy_url_show (GTK_WIDGET (self), "help:empathy"); +static void +prev_tab_cb (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + EmpathyRosterWindow *self = user_data; + empathy_chat_window_prev_tab (EMPATHY_CHAT_WINDOW (self->priv->chat_window)); } + static gboolean roster_window_throbber_button_press_event_cb (GtkWidget *throbber, GdkEventButton *event, @@ -1811,7 +1651,7 @@ display_page_account_not_enabled (EmpathyRosterWindow *self, { display_page_message (self, _("You need to enable one of your accounts to see contacts here."), - TRUE, FALSE); + PAGE_MESSAGE_FLAG_ACCOUNTS); } else { @@ -1821,7 +1661,7 @@ display_page_account_not_enabled (EmpathyRosterWindow *self, tmp = g_strdup_printf (_("You need to enable %s to see contacts here."), tp_account_get_display_name (account)); - display_page_message (self, tmp, TRUE, FALSE); + display_page_message (self, tmp, PAGE_MESSAGE_FLAG_ACCOUNTS); g_free (tmp); } } @@ -1846,8 +1686,27 @@ set_notebook_page (EmpathyRosterWindow *self) { GList *accounts; guint len; + TpConnectionPresenceType presence; + gboolean connected, connecting; + + connected = empathy_account_manager_get_accounts_connected (&connecting); + + /* Display the loading page if either: + * - We are fetching contacts from Folks (startup) + * - There is no account connected but at least one is connecting + */ + if (!empathy_individual_manager_get_contacts_loaded ( + self->priv->individual_manager) || + (!connected && connecting)) + { + display_page_message (self, NULL, PAGE_MESSAGE_FLAG_SPINNER); + gtk_spinner_start (GTK_SPINNER (self->priv->spinner_loading)); + return; + } + + gtk_spinner_stop (GTK_SPINNER (self->priv->spinner_loading)); - accounts = tp_account_manager_get_valid_accounts ( + accounts = tp_account_manager_dup_valid_accounts ( self->priv->account_manager); len = g_list_length (accounts); @@ -1871,10 +1730,41 @@ set_notebook_page (EmpathyRosterWindow *self) goto out; } + presence = tp_account_manager_get_most_available_presence ( + self->priv->account_manager, NULL, NULL); + + if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE) + { + display_page_message (self, + _("Change your presence to see contacts here"), + PAGE_MESSAGE_FLAG_ONLINE); + goto out; + } + + if (empathy_roster_view_is_empty (self->priv->view)) + { + if (empathy_roster_view_is_searching (self->priv->view)) + { + display_page_message (self, _("No match found"), + PAGE_MESSAGE_FLAG_NONE); + } + else + { + if (g_settings_get_boolean (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_OFFLINE)) + display_page_message (self, _("You haven't added any contacts yet"), + PAGE_MESSAGE_FLAG_ADD_CONTACT); + else + display_page_message (self, _("No online contacts"), + PAGE_MESSAGE_FLAG_SHOW_OFFLINE); + } + goto out; + } + display_page_contact_list (self); out: - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); } static void @@ -1903,7 +1793,6 @@ roster_window_connection_items_setup (EmpathyRosterWindow *self) "chat_search_contacts", "chat_add_contact", "edit_blocked_contacts", - "edit_search_contacts" }; for (i = 0; i < G_N_ELEMENTS (actions_connected); i++) @@ -1934,6 +1823,14 @@ account_disabled_cb (TpAccountManager *manager, set_notebook_page (self); } +static void +account_removed_cb (TpAccountManager *manager, + TpAccount *account, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); +} + static void account_manager_prepared_cb (GObject *source_object, GAsyncResult *result, @@ -1951,7 +1848,8 @@ account_manager_prepared_cb (GObject *source_object, return; } - accounts = tp_account_manager_get_valid_accounts (self->priv->account_manager); + accounts = tp_account_manager_dup_valid_accounts ( + self->priv->account_manager); for (j = accounts; j != NULL; j = j->next) { TpAccount *account = TP_ACCOUNT (j->data); @@ -1961,6 +1859,8 @@ account_manager_prepared_cb (GObject *source_object, g_signal_connect (manager, "account-validity-changed", G_CALLBACK (roster_window_account_validity_changed_cb), self); + tp_g_signal_connect_object (manager, "account-removed", + G_CALLBACK (account_removed_cb), self, 0); tp_g_signal_connect_object (manager, "account-disabled", G_CALLBACK (account_disabled_cb), self, 0); tp_g_signal_connect_object (manager, "account-enabled", @@ -1970,7 +1870,7 @@ account_manager_prepared_cb (GObject *source_object, set_notebook_page (self); - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); } void @@ -2010,7 +1910,6 @@ static GActionEntry menubar_entries[] = { { "chat_quit", roster_window_chat_quit_cb, NULL, NULL, NULL }, { "edit_accounts", roster_window_edit_accounts_cb, NULL, NULL, NULL }, - { "edit_search_contacts", roster_window_edit_search_contacts_cb, NULL, NULL, NULL }, { "edit_blocked_contacts", roster_window_edit_blocked_contacts_cb, NULL, NULL, NULL }, { "edit_preferences", roster_window_edit_preferences_cb, NULL, NULL, NULL }, @@ -2019,13 +1918,20 @@ static GActionEntry menubar_entries[] = { { "room_join_new", roster_window_room_join_new_cb, NULL, NULL, NULL }, { "room_join_favorites", roster_window_room_join_favorites_cb, NULL, NULL, NULL }, + { "join", roster_window_join_chatroom_menu_activate_cb, "(ss)", NULL, NULL }, { "room_manage_favorites", roster_window_room_manage_favorites_cb, NULL, NULL, NULL }, { "help_contents", roster_window_help_contents_cb, NULL, NULL, NULL }, - { "help_debug", roster_window_help_debug_cb, NULL, NULL, NULL }, { "help_about", roster_window_help_about_cb, NULL, NULL, NULL }, }; +static GActionEntry app_entries[] = +{ + { "tab_next", next_tab_cb, NULL, NULL, NULL }, + { "tab_prev", prev_tab_cb, NULL, NULL, NULL } +}; + + static void empathy_roster_window_set_property (GObject *object, guint property_id, @@ -2094,42 +2000,317 @@ empathy_roster_window_class_init (EmpathyRosterWindowClass *klass) } static void -show_contacts_loading (EmpathyRosterWindow *self) +contacts_loaded_cb (EmpathyIndividualManager *manager, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); +} + +static void +roster_window_setup_actions (EmpathyRosterWindow *self) { - display_page_message (self, NULL, FALSE, TRUE); + GAction *action; + +#define ADD_GSETTINGS_ACTION(schema, key) \ + action = g_settings_create_action (self->priv->gsettings_##schema, \ + EMPATHY_PREFS_##key); \ + g_action_map_add_action (G_ACTION_MAP (self), action); \ + g_object_unref (action); - gtk_spinner_start (GTK_SPINNER (self->priv->spinner_loading)); + ADD_GSETTINGS_ACTION (ui, UI_SHOW_OFFLINE); + +#undef ADD_GSETTINGS_ACTION } static void -hide_contacts_loading (EmpathyRosterWindow *self) +menu_deactivate_cb (GtkMenuShell *menushell, + gpointer user_data) { - gtk_spinner_stop (GTK_SPINNER (self->priv->spinner_loading)); + /* FIXME: we shouldn't have to disconnect the signal (bgo #641327) */ + g_signal_handlers_disconnect_by_func (menushell, + menu_deactivate_cb, user_data); + + gtk_menu_detach (GTK_MENU (menushell)); +} + +static void +menu_item_activated_cb (GtkMenuShell *menushell, + gpointer user_data) +{ + EmpathyRosterWindow *roster_window = EMPATHY_ROSTER_WINDOW (user_data); + + hide_search_bar (roster_window); +} + +static void +popup_individual_menu_cb (EmpathyRosterView *view, + const gchar *active_group, + FolksIndividual *individual, + guint button, + guint time, + gpointer user_data) +{ + GtkWidget *menu; + EmpathyIndividualFeatureFlags features = EMPATHY_INDIVIDUAL_FEATURE_CHAT | + EMPATHY_INDIVIDUAL_FEATURE_CALL | + EMPATHY_INDIVIDUAL_FEATURE_EDIT | + EMPATHY_INDIVIDUAL_FEATURE_INFO | + EMPATHY_INDIVIDUAL_FEATURE_LOG | + EMPATHY_INDIVIDUAL_FEATURE_SMS | + EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE | + EMPATHY_INDIVIDUAL_FEATURE_REMOVE | + EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER; + + menu = empathy_individual_menu_new (individual, active_group, + features, NULL); + + /* menu is initially unowned but gtk_menu_attach_to_widget() takes its + * floating ref. We can either wait for the view to release its ref + * when it is destroyed (when leaving Empathy) or explicitly + * detach the menu when it's not displayed any more. + * We go for the latter as we don't want to keep useless menus in memory + * during the whole lifetime of Empathy. */ + g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivate_cb), + NULL); + g_signal_connect (menu, "menu-item-activated", + G_CALLBACK (menu_item_activated_cb), user_data); + + gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (view), NULL); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time); +} +static void +view_empty_cb (EmpathyRosterView *view, + GParamSpec *spec, + EmpathyRosterWindow *self) +{ set_notebook_page (self); + + if (!empathy_roster_view_is_empty (view)) + { + gtk_widget_grab_focus (GTK_WIDGET (self->priv->view)); + + /* The store is being filled, it will be done after an idle cb. + * So we can then get events. If we do that too soon, event's + * contact is not yet in the store and it won't get marked as + * having events. */ + g_idle_add (roster_window_load_events_idle_cb, self); + } } static void -contacts_loaded_cb (EmpathyIndividualManager *manager, +tooltip_destroy_cb (GtkWidget *widget, + EmpathyRosterWindow *self) +{ + g_clear_object (&self->priv->tooltip_widget); +} + +static gboolean +individual_tooltip_cb (EmpathyRosterView *view, + FolksIndividual *individual, + gboolean keyboard_mode, + GtkTooltip *tooltip, + EmpathyRosterWindow *self) +{ + if (self->priv->tooltip_widget == NULL) + { + self->priv->tooltip_widget = empathy_individual_widget_new (individual, + EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP | + EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION | + EMPATHY_INDIVIDUAL_WIDGET_SHOW_CLIENT_TYPES); + + gtk_container_set_border_width ( + GTK_CONTAINER (self->priv->tooltip_widget), 8); + + g_object_ref (self->priv->tooltip_widget); + + tp_g_signal_connect_object (self->priv->tooltip_widget, "destroy", + G_CALLBACK (tooltip_destroy_cb), self, 0); + + gtk_widget_show (self->priv->tooltip_widget); + } + else + { + empathy_individual_widget_set_individual ( + EMPATHY_INDIVIDUAL_WIDGET (self->priv->tooltip_widget), individual); + } + + gtk_tooltip_set_custom (tooltip, self->priv->tooltip_widget); + + return TRUE; +} + +typedef enum +{ + DND_DRAG_TYPE_INVALID = -1, + DND_DRAG_TYPE_URI_LIST, +} DndDragType; + +#define DRAG_TYPE(T,I) \ + { (gchar *) T, 0, I } + +static const GtkTargetEntry drag_types_dest[] = { + DRAG_TYPE ("text/path-list", DND_DRAG_TYPE_URI_LIST), + DRAG_TYPE ("text/uri-list", DND_DRAG_TYPE_URI_LIST), +}; + +static GdkAtom drag_atoms_dest[G_N_ELEMENTS (drag_types_dest)]; + +static DndDragType +get_drag_type (GtkWidget *widget, + GdkDragContext *context) +{ + GdkAtom target; + guint i; + + target = gtk_drag_dest_find_target (widget, context, NULL); + + for (i = 0; i < G_N_ELEMENTS (drag_atoms_dest); i++) + { + if (target == drag_atoms_dest[i]) + return drag_types_dest[i].info; + } + + return DND_DRAG_TYPE_INVALID; +} + +static gboolean +individual_supports_ft (FolksIndividual *individual) +{ + EmpathyContact *contact; + EmpathyCapabilities caps; + gboolean result; + + contact = empathy_contact_dup_from_folks_individual (individual); + if (contact == NULL) + return FALSE; + + caps = empathy_contact_get_capabilities (contact); + result = (caps & EMPATHY_CAPABILITIES_FT); + + g_object_unref (contact); + return result; +} + +static gboolean +view_drag_motion_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time_, + EmpathyRosterWindow *self) +{ + DndDragType type; + + type = get_drag_type (widget, context); + + if (type == DND_DRAG_TYPE_URI_LIST) + { + /* Check if contact supports FT */ + FolksIndividual *individual; + GtkListBoxRow *row; + + individual = empathy_roster_view_get_individual_at_y (self->priv->view, + y, &row); + if (individual == NULL) + goto no_hl; + + if (!individual_supports_ft (individual)) + goto no_hl; + + gtk_list_box_drag_highlight_row (GTK_LIST_BOX (widget), row); + return FALSE; + } + +no_hl: + gtk_list_box_drag_unhighlight_row (GTK_LIST_BOX (widget)); + return FALSE; +} + +static gboolean +view_drag_drop_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time_, EmpathyRosterWindow *self) { - hide_contacts_loading (self); + DndDragType type; + FolksIndividual *individual; + + type = get_drag_type (widget, context); + if (type == DND_DRAG_TYPE_INVALID) + return FALSE; + + individual = empathy_roster_view_get_individual_at_y (self->priv->view, y, + NULL); + if (individual == NULL) + return FALSE; + + if (!individual_supports_ft (individual)) + return FALSE; + + gtk_drag_get_data (widget, context, + gtk_drag_dest_find_target (widget, context, NULL), time_); + + return TRUE; } static void -roster_window_setup_actions (EmpathyRosterWindow *self) +view_drag_data_received_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection, + guint info, + guint time_, + EmpathyRosterWindow *self) { - GAction *action; + gboolean success = FALSE; -#define ADD_GSETTINGS_ACTION(schema, key) \ - action = g_settings_create_action (self->priv->gsettings_##schema, \ - EMPATHY_PREFS_##key); \ - g_action_map_add_action (G_ACTION_MAP (self), action); \ - g_object_unref (action); + if (selection == NULL) + goto out; - ADD_GSETTINGS_ACTION (ui, UI_SHOW_OFFLINE); + if (info == DND_DRAG_TYPE_URI_LIST) + { + const gchar *path; + FolksIndividual *individual; + EmpathyContact *contact; -#undef ADD_GSETTINGS_ACTION + individual = empathy_roster_view_get_individual_at_y (self->priv->view, + y, NULL); + g_return_if_fail (individual != NULL); + + path = (const gchar *) gtk_selection_data_get_data (selection); + + contact = empathy_contact_dup_from_folks_individual (individual); + empathy_send_file_from_uri_list (contact, path); + + g_object_unref (contact); + + success = TRUE; + } + +out: + gtk_drag_finish (context, success, FALSE, time_); +} + +static void +roster_window_most_available_presence_changed_cb (TpAccountManager *manager, + TpConnectionPresenceType presence, + const gchar *status, + const gchar *message, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); +} + +static void +show_offline_changed_cb (GSettings *settings, + const gchar *key, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); } static void @@ -2138,16 +2319,19 @@ empathy_roster_window_init (EmpathyRosterWindow *self) GtkBuilder *gui; GtkWidget *sw; gchar *filename; - GtkTreeModel *model; - GtkWidget *search_vbox; + GtkWidget *header_bar; + GtkWidget *new_conversation_button; + GtkWidget *image; + GtkWidget *chat_vbox; + guint i; + EmpathyRosterModel *model; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowPriv); - empathy_set_rss_provider (GTK_WIDGET (self)); + empathy_set_css_provider (GTK_WIDGET (self)); self->priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); - self->priv->gsettings_contacts = g_settings_new (EMPATHY_PREFS_CONTACTS_SCHEMA); self->priv->sound_mgr = empathy_sound_manager_dup_singleton (); @@ -2161,26 +2345,43 @@ empathy_roster_window_init (EmpathyRosterWindow *self) /* Set up interface */ filename = empathy_file_lookup ("empathy-roster-window.ui", "src"); - gui = empathy_builder_get_file (filename, + gui = tpaw_builder_get_file (filename, "main_vbox", &self->priv->main_vbox, + "chat_vbox", &chat_vbox, "balance_vbox", &self->priv->balance_vbox, "errors_vbox", &self->priv->errors_vbox, "auth_vbox", &self->priv->auth_vbox, - "search_vbox", &search_vbox, "presence_toolbar", &self->priv->presence_toolbar, "notebook", &self->priv->notebook, "no_entry_label", &self->priv->no_entry_label, "roster_scrolledwindow", &sw, "button_account_settings", &self->priv->button_account_settings, + "button_online", &self->priv->button_online, + "button_show_offline", &self->priv->button_show_offline, + "button_add_contact", &self->priv->button_add_contact, "spinner_loading", &self->priv->spinner_loading, NULL); g_free (filename); + header_bar = gtk_header_bar_new (); + gtk_header_bar_set_title (GTK_HEADER_BAR(header_bar), _("Conversations")); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header_bar), TRUE); + + image = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON); + new_conversation_button = gtk_button_new (); + g_signal_connect (new_conversation_button, "clicked", + G_CALLBACK (roster_window_chat_new_message_cb), self); + gtk_button_set_image (GTK_BUTTON (new_conversation_button), image); + gtk_widget_set_tooltip_text (new_conversation_button, _("New Conversation")); + gtk_window_set_titlebar (GTK_WINDOW (self), header_bar); + gtk_container_add (GTK_CONTAINER (header_bar), new_conversation_button); + gtk_widget_show_all (header_bar); + gtk_container_add (GTK_CONTAINER (self), self->priv->main_vbox); gtk_widget_show (self->priv->main_vbox); g_signal_connect (self, "key-press-event", - G_CALLBACK (roster_window_key_press_event_cb), NULL); + G_CALLBACK (roster_window_key_press_event_cb), self); g_object_unref (gui); @@ -2197,13 +2398,17 @@ empathy_roster_window_init (EmpathyRosterWindow *self) self->priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); + /* set up accelerators */ + g_action_map_add_action_entries (G_ACTION_MAP (self), + app_entries, G_N_ELEMENTS (app_entries), self); + /* set up menus */ g_action_map_add_action_entries (G_ACTION_MAP (self), menubar_entries, G_N_ELEMENTS (menubar_entries), self); roster_window_setup_actions (self); filename = empathy_file_lookup ("empathy-roster-window-menubar.ui", "src"); - gui = empathy_builder_get_file (filename, + gui = tpaw_builder_get_file (filename, "appmenu", &self->priv->menumodel, "rooms", &self->priv->rooms_section, NULL); @@ -2239,74 +2444,58 @@ empathy_roster_window_init (EmpathyRosterWindow *self) self->priv->throbber, FALSE, TRUE, 0); - /* XXX: this class is designed to live for the duration of the program, - * so it's got a race condition between its signal handlers and its - * finalization. The class is planned to be removed, so we won't fix - * this before then. */ self->priv->individual_manager = empathy_individual_manager_dup_singleton (); - if (!empathy_individual_manager_get_contacts_loaded ( - self->priv->individual_manager)) - { - show_contacts_loading (self); + model = EMPATHY_ROSTER_MODEL (empathy_roster_model_manager_new (self->priv->individual_manager)); + + tp_g_signal_connect_object (self->priv->individual_manager, + "contacts-loaded", G_CALLBACK (contacts_loaded_cb), self, 0); + + self->priv->view = EMPATHY_ROSTER_VIEW ( + empathy_roster_view_new (model)); - tp_g_signal_connect_object (self->priv->individual_manager, - "contacts-loaded", G_CALLBACK (contacts_loaded_cb), self, 0); - } - self->priv->individual_store = EMPATHY_INDIVIDUAL_STORE ( - empathy_individual_store_manager_new (self->priv->individual_manager)); - - /* For the moment, we disallow Persona drops onto the roster contact list - * (e.g. from things such as the EmpathyPersonaView in the linking dialogue). - * No code is hooked up to do anything on a Persona drop, so allowing them - * would achieve nothing except confusion. */ - self->priv->individual_view = empathy_individual_view_new ( - self->priv->individual_store, - /* EmpathyIndividualViewFeatureFlags */ - EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_SAVE | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_RENAME | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_REMOVE | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_CHANGE | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_TOOLTIP | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_CALL | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_FILE_DROP, - /* EmpathyIndividualFeatureFlags */ - EMPATHY_INDIVIDUAL_FEATURE_CHAT | - EMPATHY_INDIVIDUAL_FEATURE_CALL | - EMPATHY_INDIVIDUAL_FEATURE_EDIT | - EMPATHY_INDIVIDUAL_FEATURE_INFO | - EMPATHY_INDIVIDUAL_FEATURE_LOG | - EMPATHY_INDIVIDUAL_FEATURE_SMS | - EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE); - - gtk_widget_show (GTK_WIDGET (self->priv->individual_view)); - gtk_container_add (GTK_CONTAINER (sw), - GTK_WIDGET (self->priv->individual_view)); - g_signal_connect (self->priv->individual_view, "row-activated", - G_CALLBACK (roster_window_row_activated_cb), self); + g_object_unref (model); + + gtk_widget_show (GTK_WIDGET (self->priv->view)); + + gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (self->priv->view)); + + g_signal_connect (self->priv->view, "individual-activated", + G_CALLBACK (individual_activated_cb), self); + g_signal_connect (self->priv->view, "event-activated", + G_CALLBACK (event_activated_cb), self); + g_signal_connect (self->priv->view, "popup-individual-menu", + G_CALLBACK (popup_individual_menu_cb), self); + g_signal_connect (self->priv->view, "notify::empty", + G_CALLBACK (view_empty_cb), self); + g_signal_connect (self->priv->view, "individual-tooltip", + G_CALLBACK (individual_tooltip_cb), self); + + /* DnD - destination */ + gtk_drag_dest_set (GTK_WIDGET (self->priv->view), GTK_DEST_DEFAULT_MOTION, + drag_types_dest, G_N_ELEMENTS (drag_types_dest), GDK_ACTION_COPY); + + for (i = 0; i < G_N_ELEMENTS (drag_types_dest); ++i) + drag_atoms_dest[i] = gdk_atom_intern (drag_types_dest[i].target, FALSE); + + g_signal_connect (self->priv->view, "drag-motion", + G_CALLBACK (view_drag_motion_cb), self); + g_signal_connect (self->priv->view, "drag-drop", + G_CALLBACK (view_drag_drop_cb), self); + g_signal_connect (self->priv->view, "drag-data-received", + G_CALLBACK (view_drag_data_received_cb), self); + + gtk_widget_set_has_tooltip (GTK_WIDGET (self->priv->view), TRUE); /* Set up search bar */ - self->priv->search_bar = empathy_live_search_new ( - GTK_WIDGET (self->priv->individual_view)); - empathy_individual_view_set_live_search (self->priv->individual_view, - EMPATHY_LIVE_SEARCH (self->priv->search_bar)); - gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar, - FALSE, TRUE, 0); + self->priv->search_bar = tpaw_live_search_new ( + GTK_WIDGET (self->priv->view)); + empathy_roster_view_set_live_search (self->priv->view, + TPAW_LIVE_SEARCH (self->priv->search_bar)); g_signal_connect_swapped (self, "map", - G_CALLBACK (gtk_widget_grab_focus), self->priv->individual_view); - - /* Connect to proper signals to check if contact list is empty or not */ - model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->individual_view)); - self->priv->empty = TRUE; - g_signal_connect (model, "row-inserted", - G_CALLBACK (roster_window_row_inserted_cb), self); - g_signal_connect (model, "row-deleted", - G_CALLBACK (roster_window_row_deleted_cb), self); + G_CALLBACK (gtk_widget_grab_focus), self->priv->view); /* Load user-defined accelerators. */ roster_window_accels_load (); @@ -2315,38 +2504,40 @@ empathy_roster_window_init (EmpathyRosterWindow *self) /* Set window size. */ empathy_geometry_bind (GTK_WINDOW (self), GEOMETRY_NAME); + self->priv->chat_window = GTK_WIDGET (empathy_chat_window_new ()); + gtk_widget_show (GTK_WIDGET (self->priv->chat_window) ); + gtk_box_pack_start (GTK_BOX (chat_vbox), self->priv->chat_window, TRUE, TRUE, 0); + /* Enable event handling */ self->priv->call_observer = empathy_call_observer_dup_singleton (); self->priv->event_manager = empathy_event_manager_dup_singleton (); + self->priv->chat_manager = empathy_chat_manager_dup_singleton (); + + self->priv->theme_manager = empathy_theme_manager_dup_singleton (); + + tp_g_signal_connect_object (self->priv->event_manager, "event-added", + G_CALLBACK (roster_window_event_added_cb), self, 0); + tp_g_signal_connect_object (self->priv->event_manager, "event-removed", + G_CALLBACK (roster_window_event_removed_cb), self, 0); - g_signal_connect (self->priv->event_manager, "event-added", - G_CALLBACK (roster_window_event_added_cb), self); - g_signal_connect (self->priv->event_manager, "event-removed", - G_CALLBACK (roster_window_event_removed_cb), self); g_signal_connect (self->priv->account_manager, "account-validity-changed", G_CALLBACK (roster_window_account_validity_changed_cb), self); g_signal_connect (self->priv->account_manager, "account-removed", G_CALLBACK (roster_window_account_removed_cb), self); g_signal_connect (self->priv->account_manager, "account-disabled", G_CALLBACK (roster_window_account_disabled_cb), self); + g_signal_connect (self->priv->account_manager, + "most-available-presence-changed", + G_CALLBACK (roster_window_most_available_presence_changed_cb), self); g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE, - self->priv->individual_view, "show-offline", - G_SETTINGS_BIND_GET); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_PROTOCOLS, - self->priv->individual_store, "show-protocols", - G_SETTINGS_BIND_GET); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - self->priv->individual_store, "is-compact", - G_SETTINGS_BIND_GET); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_AVATARS, - self->priv->individual_store, "show-avatars", - G_SETTINGS_BIND_GET); - g_settings_bind (self->priv->gsettings_contacts, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - self->priv->individual_store, "sort-criterium", + self->priv->view, "show-offline", G_SETTINGS_BIND_GET); + tp_g_signal_connect_object (self->priv->gsettings_ui, + "changed::" EMPATHY_PREFS_UI_SHOW_OFFLINE, + G_CALLBACK (show_offline_changed_cb), self, 0); g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_GROUPS, - self->priv->individual_store, "show-groups", + self->priv->view, "show-groups", G_SETTINGS_BIND_GET); g_settings_bind (self->priv->gsettings_ui, "show-balance-in-roster", self->priv->balance_vbox, "visible", @@ -2354,6 +2545,12 @@ empathy_roster_window_init (EmpathyRosterWindow *self) g_signal_connect (self->priv->button_account_settings, "clicked", G_CALLBACK (button_account_settings_clicked_cb), self); + g_signal_connect (self->priv->button_online, "clicked", + G_CALLBACK (button_online_clicked_cb), self); + g_signal_connect (self->priv->button_show_offline, "clicked", + G_CALLBACK (button_show_offline_clicked_cb), self); + g_signal_connect (self->priv->button_add_contact, "clicked", + G_CALLBACK (button_add_contact_clicked_cb), self); } GtkWidget *