X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-roster-window.c;h=e874fb533b26e062273d068d7a07670927514b6f;hp=cea6ac5f825e06e352d131a96b6bcdcbe10b1128;hb=ba536b64debb3d818b95a88aa3309211a867e1be;hpb=96020e16337fe47fe35d88db9fb2503bc213b86e diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index cea6ac5f..e874fb53 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -21,59 +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 - +#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 @@ -104,6 +93,8 @@ G_DEFINE_TYPE (EmpathyRosterWindow, empathy_roster_window, GTK_TYPE_APPLICATION_ struct _EmpathyRosterWindowPriv { EmpathyRosterView *view; TpAccountManager *account_manager; + EmpathyChatManager *chat_manager; + EmpathyThemeManager *theme_manager; EmpathyChatroomManager *chatroom_manager; EmpathyEventManager *event_manager; EmpathySoundManager *sound_mgr; @@ -126,8 +117,11 @@ struct _EmpathyRosterWindowPriv { 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; @@ -343,6 +337,14 @@ roster_window_load_events_idle_cb (gpointer user_data) return FALSE; } +static void +hide_search_bar (EmpathyRosterWindow *roster_window) +{ + 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); +} + static void individual_activated_cb (EmpathyRosterView *self, FolksIndividual *individual, @@ -361,16 +363,21 @@ individual_activated_cb (EmpathyRosterView *self, empathy_chat_with_contact (contact, gtk_get_current_event_time ()); g_object_unref (contact); + + /* 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) { - EmpathyEvent *event = user_data; - empathy_event_activate (event); + + /* Hide the search-bar upon an event activation */ + hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data)); } static void @@ -395,14 +402,56 @@ button_online_clicked_cb (GtkButton *button, 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, @@ -431,6 +480,14 @@ display_page_message (EmpathyRosterWindow *self, (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); @@ -440,7 +497,7 @@ static void display_page_no_account (EmpathyRosterWindow *self) { display_page_message (self, - _("You need to setup an account to see contacts here."), + _("You need to set up an account to see contacts here."), PAGE_MESSAGE_FLAG_ACCOUNTS); } @@ -478,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_name (account), - tp_account_get_protocol_name (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); @@ -580,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_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"); - 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); - - 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; + GtkWidget *button; - if (!tp_strdiff (TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED, - tp_account_get_detailed_error (account, NULL))) - { - roster_window_upgrade_software_error (self, account); - return; - } - - error_message = empathy_account_get_error_message (account, &user_requested); - - if (user_requested) - return; + 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); - 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 @@ -763,6 +775,7 @@ roster_window_update_status (EmpathyRosterWindow *self) { gboolean connected, connecting; GList *l; + GAction *action; connected = empathy_account_manager_get_accounts_connected (&connecting); @@ -781,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 @@ -927,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, @@ -937,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) @@ -1019,6 +1039,8 @@ empathy_roster_window_finalize (GObject *window) 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); @@ -1035,16 +1057,30 @@ empathy_roster_window_finalize (GObject *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, @@ -1052,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 @@ -1238,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 @@ -1258,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 @@ -1304,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 ( @@ -1470,6 +1548,25 @@ roster_window_help_contents_cb (GSimpleAction *action, empathy_url_show (GTK_WIDGET (self), "help:empathy"); } +static void +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)); +} + +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, @@ -1590,8 +1687,26 @@ set_notebook_page (EmpathyRosterWindow *self) GList *accounts; guint len; TpConnectionPresenceType presence; + gboolean connected, connecting; - accounts = tp_account_manager_get_valid_accounts ( + 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_dup_valid_accounts ( self->priv->account_manager); len = g_list_length (accounts); @@ -1635,8 +1750,13 @@ set_notebook_page (EmpathyRosterWindow *self) } else { - display_page_message (self, _("No online contacts"), - PAGE_MESSAGE_FLAG_NONE); + 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; } @@ -1644,7 +1764,7 @@ set_notebook_page (EmpathyRosterWindow *self) display_page_contact_list (self); out: - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); } static void @@ -1703,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, @@ -1720,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); @@ -1730,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", @@ -1739,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 @@ -1787,12 +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_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, @@ -1860,27 +1999,11 @@ empathy_roster_window_class_init (EmpathyRosterWindowClass *klass) g_type_class_add_private (object_class, sizeof (EmpathyRosterWindowPriv)); } -static void -show_contacts_loading (EmpathyRosterWindow *self) -{ - display_page_message (self, NULL, PAGE_MESSAGE_FLAG_SPINNER); - - gtk_spinner_start (GTK_SPINNER (self->priv->spinner_loading)); -} - -static void -hide_contacts_loading (EmpathyRosterWindow *self) -{ - gtk_spinner_stop (GTK_SPINNER (self->priv->spinner_loading)); - - set_notebook_page (self); -} - static void contacts_loaded_cb (EmpathyIndividualManager *manager, EmpathyRosterWindow *self) { - hide_contacts_loading (self); + set_notebook_page (self); } static void @@ -1910,8 +2033,18 @@ menu_deactivate_cb (GtkMenuShell *menushell, 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, @@ -1928,7 +2061,8 @@ popup_individual_menu_cb (EmpathyRosterView *view, EMPATHY_INDIVIDUAL_FEATURE_REMOVE | EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER; - menu = empathy_individual_menu_new (individual, features, NULL); + 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 @@ -1938,6 +2072,8 @@ popup_individual_menu_cb (EmpathyRosterView *view, * 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); @@ -2072,22 +2208,22 @@ view_drag_motion_cb (GtkWidget *widget, { /* Check if contact supports FT */ FolksIndividual *individual; - GtkWidget *child; + GtkListBoxRow *row; individual = empathy_roster_view_get_individual_at_y (self->priv->view, - y, &child); + y, &row); if (individual == NULL) goto no_hl; if (!individual_supports_ft (individual)) goto no_hl; - egg_list_box_drag_highlight_widget (EGG_LIST_BOX (widget), child); + gtk_list_box_drag_highlight_row (GTK_LIST_BOX (widget), row); return FALSE; } no_hl: - egg_list_box_drag_unhighlight_widget (EGG_LIST_BOX (widget)); + gtk_list_box_drag_unhighlight_row (GTK_LIST_BOX (widget)); return FALSE; } @@ -2159,13 +2295,34 @@ 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 empathy_roster_window_init (EmpathyRosterWindow *self) { GtkBuilder *gui; GtkWidget *sw; gchar *filename; - GtkWidget *search_vbox; + GtkWidget *header_bar; + GtkWidget *new_conversation_button; + GtkWidget *image; + GtkWidget *chat_vbox; guint i; EmpathyRosterModel *model; @@ -2188,27 +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); @@ -2225,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); @@ -2271,24 +2448,18 @@ empathy_roster_window_init (EmpathyRosterWindow *self) model = EMPATHY_ROSTER_MODEL (empathy_roster_model_manager_new (self->priv->individual_manager)); - if (!empathy_individual_manager_get_contacts_loaded ( - self->priv->individual_manager)) - { - show_contacts_loading (self); - - tp_g_signal_connect_object (self->priv->individual_manager, - "contacts-loaded", G_CALLBACK (contacts_loaded_cb), self, 0); - } + 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)); + g_object_unref (model); gtk_widget_show (GTK_WIDGET (self->priv->view)); - egg_list_box_add_to_scrolled (EGG_LIST_BOX (self->priv->view), - GTK_SCROLLED_WINDOW (sw)); + 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); @@ -2318,12 +2489,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) gtk_widget_set_has_tooltip (GTK_WIDGET (self->priv->view), TRUE); /* Set up search bar */ - self->priv->search_bar = empathy_live_search_new ( + self->priv->search_bar = tpaw_live_search_new ( GTK_WIDGET (self->priv->view)); empathy_roster_view_set_live_search (self->priv->view, - EMPATHY_LIVE_SEARCH (self->priv->search_bar)); - gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar, - FALSE, TRUE, 0); + TPAW_LIVE_SEARCH (self->priv->search_bar)); g_signal_connect_swapped (self, "map", G_CALLBACK (gtk_widget_grab_focus), self->priv->view); @@ -2335,9 +2504,16 @@ 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); @@ -2350,13 +2526,15 @@ empathy_roster_window_init (EmpathyRosterWindow *self) 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_object_set (G_OBJECT (self->priv->view), + "show-offline", TRUE, + "show-groups", FALSE, + NULL); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE, - self->priv->view, "show-offline", - G_SETTINGS_BIND_GET); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_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", G_SETTINGS_BIND_GET); @@ -2365,6 +2543,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) 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 *