* Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
+#include "empathy-roster-window.h"
#include <sys/stat.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <folks/folks.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-chatroom.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-status-presets.h>
-
-#include <libempathy-gtk/empathy-contact-dialogs.h>
-#include <libempathy-gtk/empathy-live-search.h>
-#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
-#include <libempathy-gtk/empathy-contact-search-dialog.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-gtk-enum-types.h>
-#include <libempathy-gtk/empathy-individual-dialogs.h>
-#include <libempathy-gtk/empathy-individual-store-manager.h>
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-new-call-dialog.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#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-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-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/* Flashing delay for icons (milliseconds). */
#define FLASH_TIMEOUT 500
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;
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,
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
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)
{
}
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);
display_page_no_account (EmpathyRosterWindow *self)
{
display_page_message (self,
- _("You need to setup an account to see contacts here."), TRUE, FALSE);
+ _("You need to set up an account to see contacts here."),
+ PAGE_MESSAGE_FLAG_ACCOUNTS);
}
static void
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");
+ account = g_object_get_data (G_OBJECT (infobar), "account");
- empathy_accounts_dialog_show_application (
- gtk_widget_get_screen (GTK_WIDGET (button)),
- account, FALSE, FALSE);
-
- 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 ("<b>%s</b>\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);
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;
- }
-
- error_message = empathy_account_get_error_message (account, &user_requested);
+ GtkWidget *button;
- 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 ("<b>%s</b>\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 ("<b>%s</b>\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
{
gboolean connected, connecting;
GList *l;
+ GAction *action;
connected = empathy_account_manager_get_accounts_connected (&connecting);
/* 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
gtk_widget_destroy (hbox);
}
+static void set_notebook_page (EmpathyRosterWindow *self);
+
static void
roster_window_connection_changed_cb (TpAccount *account,
guint old_status,
EmpathyRosterWindow *self)
{
roster_window_update_status (self);
+ set_notebook_page (self);
if (current == TP_CONNECTION_STATUS_DISCONNECTED &&
reason != TP_CONNECTION_STATUS_REASON_REQUESTED)
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,
{
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
}
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
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
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 (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, empathy_chatroom_get_name (chatroom)))
{
- g_menu_remove (self->priv->rooms_section, i);
- break;
+ 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 (tp_strdiff (tmp, account_path))
+ {
+ g_free (tmp);
+ continue;
+ }
+
+ g_menu_remove (self->priv->rooms_section, i);
+ g_free (tmp);
+ break;
}
chatrooms = empathy_chatroom_manager_get_chatrooms (
{
display_page_message (self,
_("You need to enable one of your accounts to see contacts here."),
- TRUE, FALSE);
+ PAGE_MESSAGE_FLAG_ACCOUNTS);
}
else
{
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);
}
}
{
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;
+ }
- accounts = tp_account_manager_get_valid_accounts (
+ 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);
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
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,
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);
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",
set_notebook_page (self);
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
}
void
{ "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 },
g_type_class_add_private (object_class, sizeof (EmpathyRosterWindowPriv));
}
-static void
-show_contacts_loading (EmpathyRosterWindow *self)
-{
- display_page_message (self, NULL, FALSE, TRUE);
-
- 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
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,
EMPATHY_INDIVIDUAL_FEATURE_LOG |
EMPATHY_INDIVIDUAL_FEATURE_SMS |
EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE |
- EMPATHY_INDIVIDUAL_FEATURE_REMOVE;
+ 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
* 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);
GParamSpec *spec,
EmpathyRosterWindow *self)
{
- if (empathy_roster_view_is_empty (view))
- {
- if (empathy_roster_view_is_searching (self->priv->view))
- {
- display_page_message (self, _("No match found"), FALSE, FALSE);
- }
- }
- else
+ set_notebook_page (self);
+
+ if (!empathy_roster_view_is_empty (view))
{
- display_page_contact_list (self);
gtk_widget_grab_focus (GTK_WIDGET (self->priv->view));
/* The store is being filled, it will be done after an idle cb.
FolksIndividual *individual,
gboolean keyboard_mode,
GtkTooltip *tooltip,
- gpointer user_data)
+ EmpathyRosterWindow *self)
{
- EmpathyRosterWindow *self = user_data;
-
if (self->priv->tooltip_widget == NULL)
{
self->priv->tooltip_widget = empathy_individual_widget_new (individual,
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)
+{
+ 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
+view_drag_data_received_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection,
+ guint info,
+ guint time_,
+ EmpathyRosterWindow *self)
+{
+ gboolean success = FALSE;
+
+ if (selection == NULL)
+ goto out;
+
+ if (info == DND_DRAG_TYPE_URI_LIST)
+ {
+ const gchar *path;
+ FolksIndividual *individual;
+ EmpathyContact *contact;
+
+ 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
empathy_roster_window_init (EmpathyRosterWindow *self)
{
GtkWidget *sw;
gchar *filename;
GtkWidget *search_vbox;
+ GtkWidget *header_bar;
+ GtkWidget *new_conversation_button;
+ GtkWidget *image;
+ guint i;
+ EmpathyRosterModel *model;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowPriv);
/* 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,
"balance_vbox", &self->priv->balance_vbox,
"errors_vbox", &self->priv->errors_vbox,
"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);
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);
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);
- }
+ 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 (self->priv->individual_manager));
+ 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);
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);
- empathy_roster_view_set_individual_tooltip_cb (self->priv->view,
- individual_tooltip_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 (
+ 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));
+ TPAW_LIVE_SEARCH (self->priv->search_bar));
gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar,
FALSE, TRUE, 0);
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->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->view, "show-groups",
G_SETTINGS_BIND_GET);
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 *
projects / empathy.git / blobdiff