* 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 <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-contact-list.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/empathy-tp-contact-factory.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.h>
-#include <libempathy-gtk/empathy-individual-store-manager.h>
-#include <libempathy-gtk/empathy-individual-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-map-view.h"
+#include "empathy-chatroom-manager.h"
#include "empathy-chatrooms-window.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
enum
{
PAGE_CONTACT_LIST = 0,
- PAGE_NO_MATCH
+ PAGE_MESSAGE
};
enum
PROP_SHELL_RUNNING
};
-G_DEFINE_TYPE (EmpathyRosterWindow, empathy_roster_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (EmpathyRosterWindow, empathy_roster_window, GTK_TYPE_APPLICATION_WINDOW)
struct _EmpathyRosterWindowPriv {
- EmpathyIndividualStore *individual_store;
- EmpathyIndividualView *individual_view;
+ EmpathyRosterView *view;
TpAccountManager *account_manager;
EmpathyChatroomManager *chatroom_manager;
EmpathyEventManager *event_manager;
EmpathySoundManager *sound_mgr;
EmpathyCallObserver *call_observer;
+ EmpathyIndividualManager *individual_manager;
guint flash_timeout_id;
gboolean flash_on;
- gboolean empty;
GSettings *gsettings_ui;
- GSettings *gsettings_contacts;
GtkWidget *preferences;
GtkWidget *main_vbox;
GtkWidget *throbber;
- GtkWidget *throbber_tool_item;
GtkWidget *presence_toolbar;
GtkWidget *presence_chooser;
GtkWidget *errors_vbox;
GtkWidget *search_bar;
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;
+
+ GMenu *menumodel;
+ GMenu *rooms_section;
- GtkToggleAction *show_protocols;
- GtkRadioAction *sort_by_name;
- GtkRadioAction *sort_by_status;
- GtkRadioAction *normal_with_avatars;
- GtkRadioAction *normal_size;
- GtkRadioAction *compact_size;
-
- GtkUIManager *ui_manager;
- GtkAction *view_history;
- GtkAction *room_join_favorites;
- GtkWidget *room_menu;
- GtkWidget *room_separator;
- GtkWidget *edit_context;
- GtkWidget *edit_context_separator;
-
- GtkActionGroup *balance_action_group;
- GtkAction *view_balance_show_in_roster;
GtkWidget *balance_vbox;
guint size_timeout_id;
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)
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
{
if (event->contact)
{
- increase_event_count (self, event);
+ FolksIndividual *individual;
+
+ 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);
- roster_window_flash_start (self);
+ g_object_unref (individual);
}
else if (event->type == EMPATHY_EVENT_TYPE_AUTH)
{
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
}
static void
-roster_window_row_activated_cb (EmpathyIndividualView *view,
- GtkTreePath *path,
- GtkTreeViewColumn *col,
- EmpathyRosterWindow *self)
+individual_activated_cb (EmpathyRosterView *self,
+ FolksIndividual *individual,
+ gpointer user_data)
{
- EmpathyContact *contact = NULL;
- FolksIndividual *individual;
- GtkTreeModel *model;
- GtkTreeIter iter;
- GSList *events, *l;
+ EmpathyContact *contact;
+
+ contact = empathy_contact_dup_best_for_action (individual,
+ EMPATHY_ACTION_CHAT);
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->individual_view));
- gtk_tree_model_get_iter (model, &iter, path);
+ if (contact == NULL)
+ return;
- gtk_tree_model_get (model, &iter, EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL,
- &individual, -1);
+ DEBUG ("Starting a chat");
- if (individual != NULL)
- contact = empathy_contact_dup_from_folks_individual (individual);
+ empathy_chat_with_contact (contact, gtk_get_current_event_time ());
- if (contact == NULL)
- goto OUT;
+ g_object_unref (contact);
+}
- /* 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;
+static void
+event_activated_cb (EmpathyRosterView *self,
+ FolksIndividual *individual,
+ EmpathyEvent *event,
+ gpointer user_data)
+{
+ empathy_event_activate (event);
+}
- if (event->contact == contact)
- {
- DEBUG ("Activate event");
- empathy_event_activate (event);
+static void
+button_account_settings_clicked_cb (GtkButton *button,
+ EmpathyRosterWindow *self)
+{
+ empathy_accounts_dialog_show_application (gdk_screen_get_default (),
+ NULL, FALSE, FALSE);
+}
- /* 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;
- }
- }
+static void
+button_online_clicked_cb (GtkButton *button,
+ EmpathyRosterWindow *self)
+{
+ EmpathyPresenceManager *mgr;
- g_object_unref (contact);
-OUT:
- tp_clear_object (&individual);
+ mgr = empathy_presence_manager_dup_singleton ();
+
+ empathy_presence_manager_set_state (mgr,
+ TP_CONNECTION_PRESENCE_TYPE_AVAILABLE);
+
+ g_object_unref (mgr);
}
static void
-roster_window_row_deleted_cb (GtkTreeModel *model,
- GtkTreePath *path,
+button_show_offline_clicked_cb (GtkButton *button,
EmpathyRosterWindow *self)
{
- GtkTreeIter help_iter;
+ g_settings_set_boolean (self->priv->gsettings_ui,
+ EMPATHY_PREFS_UI_SHOW_OFFLINE, TRUE);
+}
- if (!gtk_tree_model_get_iter_first (model, &help_iter))
- {
- self->priv->empty = TRUE;
+static void
+button_add_contact_clicked_cb (GtkButton *button,
+ EmpathyRosterWindow *self)
+{
+ empathy_new_individual_dialog_show (GTK_WINDOW (self));
+}
- if (empathy_individual_view_is_searching (self->priv->individual_view))
- {
- gchar *tmp;
+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;
- tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>",
- _("No match found"));
+static gboolean
+can_add_contact (EmpathyRosterWindow *self)
+{
+ GList *accounts, *l;
+ gboolean result = FALSE;
- gtk_label_set_markup (GTK_LABEL (self->priv->no_entry_label), tmp);
- g_free (tmp);
+ 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;
- gtk_label_set_line_wrap (GTK_LABEL (self->priv->no_entry_label),
- TRUE);
+ conn = tp_account_get_connection (account);
+ if (conn == NULL)
+ continue;
- gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
- PAGE_NO_MATCH);
- }
+ if (tp_connection_get_can_change_contact_list (conn))
+ result = TRUE;
}
+
+ g_list_free_full (accounts, g_object_unref);
+ return result;
}
static void
-roster_window_row_inserted_cb (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- EmpathyRosterWindow *self)
+display_page_message (EmpathyRosterWindow *self,
+ const gchar *msg,
+ PageMessageFlags flags)
{
- if (self->priv->empty)
+ if (msg != NULL)
{
- self->priv->empty = FALSE;
- gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
- PAGE_CONTACT_LIST);
- gtk_widget_grab_focus (GTK_WIDGET (self->priv->individual_view));
+ gchar *tmp;
- /* 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);
+ tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>", msg);
+
+ gtk_label_set_markup (GTK_LABEL (self->priv->no_entry_label), tmp);
+ g_free (tmp);
+
+ gtk_label_set_line_wrap (GTK_LABEL (self->priv->no_entry_label), TRUE);
+ gtk_widget_show (self->priv->no_entry_label);
}
+ else
+ {
+ gtk_widget_hide (self->priv->no_entry_label);
+ }
+
+ gtk_widget_set_visible (self->priv->button_account_settings,
+ (flags & PAGE_MESSAGE_FLAG_ACCOUNTS) != 0);
+ gtk_widget_set_visible (self->priv->spinner_loading,
+ (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);
+}
+
+static void
+display_page_no_account (EmpathyRosterWindow *self)
+{
+ display_page_message (self,
+ _("You need to set up an account to see contacts here."),
+ PAGE_MESSAGE_FLAG_ACCOUNTS);
+}
+
+static void
+display_page_contact_list (EmpathyRosterWindow *self)
+{
+ if (!empathy_individual_manager_get_contacts_loaded (
+ self->priv->individual_manager))
+ /* We'll display the contact list once we're done loading */
+ return;
+
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
+ PAGE_CONTACT_LIST);
}
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");
-
- 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 ("<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_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar));
+ 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");
- 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);
-
- 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);
-
- 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
roster_window_update_status (EmpathyRosterWindow *self)
{
gboolean connected, connecting;
- GList *l, *children;
+ GList *l;
+ GAction *action;
connected = empathy_account_manager_get_accounts_connected (&connecting);
if (connecting)
{
gtk_spinner_start (GTK_SPINNER (self->priv->throbber));
- gtk_widget_show (self->priv->throbber_tool_item);
+ gtk_widget_show (self->priv->throbber);
}
else
{
gtk_spinner_stop (GTK_SPINNER (self->priv->throbber));
- gtk_widget_hide (self->priv->throbber_tool_item);
+ gtk_widget_hide (self->priv->throbber);
}
/* Update widgets sensibility */
for (l = self->priv->actions_connected; l; l = l->next)
- gtk_action_set_sensitive (l->data, connected);
-
- /* Update favourite rooms sensitivity */
- children = gtk_container_get_children (GTK_CONTAINER (self->priv->room_menu));
- for (l = children; l != NULL; l = l->next)
- {
- if (g_object_get_data (G_OBJECT (l->data), "is_favorite") != NULL)
- gtk_widget_set_sensitive (GTK_WIDGET (l->data), connected);
- }
-
- g_list_free (children);
-}
-
-static char *
-roster_window_account_to_action_name (TpAccount *account)
-{
- char *r;
-
- /* action names can't have '/' in them, replace it with '.' */
- r = g_strdup (tp_account_get_path_suffix (account));
- r = g_strdelimit (r, "/", '.');
-
- return r;
-}
+ g_simple_action_set_enabled (l->data, connected);
-static void
-roster_window_balance_activate_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- const char *uri;
-
- uri = g_object_get_data (G_OBJECT (action), "manage-credit-uri");
-
- if (!tp_str_empty (uri))
- {
- DEBUG ("Top-up credit URI: %s", uri);
- empathy_url_show (GTK_WIDGET (self), uri);
- }
- else
- {
- DEBUG ("unknown protocol for top-up");
- }
+ 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
-roster_window_balance_update_balance (GtkAction *action,
- TpConnection *conn)
+roster_window_balance_update_balance (EmpathyRosterWindow *self,
+ TpAccount *account)
{
- TpAccount *account = tp_connection_get_account (conn);
+ TpConnection *conn;
GtkWidget *label;
int amount = 0;
guint scale = G_MAXINT32;
const gchar *currency = "";
- char *money, *str;
+ char *money;
+
+ conn = tp_account_get_connection (account);
+ if (conn == NULL)
+ return;
if (!tp_connection_get_balance (conn, &amount, &scale, ¤cy))
return;
g_free (tmp);
}
- /* Translators: this string will be something like:
- * Top up My Account ($1.23)..." */
- str = g_strdup_printf (_("Top up %s (%s)..."),
- tp_account_get_display_name (account), money);
-
- gtk_action_set_label (action, str);
- g_free (str);
-
/* update the money label in the roster */
- label = g_object_get_data (G_OBJECT (action), "money-label");
+ label = g_object_get_data (G_OBJECT (account), "balance-money-label");
gtk_label_set_text (GTK_LABEL (label), money);
g_free (money);
guint balance,
guint scale,
const gchar *currency,
- GtkAction *action)
+ EmpathyRosterWindow *self)
{
- roster_window_balance_update_balance (action, conn);
+ TpAccount *account;
+
+ account = tp_connection_get_account (conn);
+ if (account == NULL)
+ return;
+
+ roster_window_balance_update_balance (self, account);
}
-static GtkAction *
-roster_window_setup_balance_create_action (EmpathyRosterWindow *self,
+static void
+roster_window_setup_balance (EmpathyRosterWindow *self,
TpAccount *account)
{
- GtkAction *action;
- char *name, *ui;
- guint merge_id;
- GError *error = NULL;
-
- /* create the action group if required */
- if (self->priv->balance_action_group == NULL)
- {
- self->priv->balance_action_group =
- gtk_action_group_new ("balance-action-group");
-
- gtk_ui_manager_insert_action_group (self->priv->ui_manager,
- self->priv->balance_action_group, -1);
- }
-
- /* create the action */
- name = roster_window_account_to_action_name (account);
- action = gtk_action_new (name,
- tp_account_get_display_name (account),
- _("Top up account credit"), NULL);
-
- g_object_bind_property (account, "icon-name", action, "icon-name",
- G_BINDING_SYNC_CREATE);
-
- g_signal_connect (action, "activate",
- G_CALLBACK (roster_window_balance_activate_cb), self);
-
- gtk_action_group_add_action (self->priv->balance_action_group, action);
- g_object_unref (action);
-
- ui = g_strdup_printf (
- "<ui>"
- " <menubar name='menubar'>"
- " <menu action='view'>"
- " <placeholder name='view_balance_placeholder'>"
- " <menuitem action='%s'/>"
- " </placeholder>"
- " </menu>"
- " </menubar>"
- "</ui>",
- name);
-
- merge_id = gtk_ui_manager_add_ui_from_string (self->priv->ui_manager,
- ui, -1, &error);
-
- if (error != NULL)
- {
- DEBUG ("Failed to add balance UI for %s: %s",
- tp_account_get_display_name (account),
- error->message);
- g_error_free (error);
- }
-
- g_object_set_data (G_OBJECT (action),
- "merge-id", GUINT_TO_POINTER (merge_id));
+ TpConnection *conn = tp_account_get_connection (account);
+ GtkWidget *hbox, *image, *label;
+ const gchar *uri;
- g_free (name);
- g_free (ui);
+ if (conn == NULL)
+ return;
- return action;
-}
+ if (!tp_proxy_is_prepared (conn, TP_CONNECTION_FEATURE_BALANCE))
+ return;
-static GtkWidget *
-roster_window_setup_balance_create_widget (EmpathyRosterWindow *self,
- GtkAction *action,
- TpAccount *account)
-{
- GtkWidget *hbox, *image, *label, *button;
+ DEBUG ("Setting up balance for acct: %s",
+ tp_account_get_display_name (account));
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ /* create the display widget */
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 3);
/* protocol icon */
image = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
- g_object_bind_property (action, "icon-name", image, "icon-name",
+ g_object_bind_property (account, "icon-name", image, "icon-name",
G_BINDING_SYNC_CREATE);
/* account name label */
label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
g_object_bind_property (account, "display-name", label, "label",
G_BINDING_SYNC_CREATE);
label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
- g_object_set_data (G_OBJECT (action), "money-label", label);
/* top up button */
- button = gtk_button_new_with_label (_("Top Up..."));
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
- g_signal_connect_swapped (button, "clicked",
- G_CALLBACK (gtk_action_activate), action);
+ uri = tp_connection_get_balance_uri (conn);
+
+ if (!tp_str_empty (uri))
+ {
+ GtkWidget *button;
+
+ button = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER (button),
+ gtk_image_new_from_icon_name ("emblem-symbolic-link",
+ GTK_ICON_SIZE_SMALL_TOOLBAR));
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ gtk_widget_set_tooltip_text (button, _("Top up account"));
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+
+ g_signal_connect_data (button, "clicked",
+ G_CALLBACK (empathy_url_show),
+ g_strdup (uri), (GClosureNotify) g_free,
+ 0);
+ }
gtk_box_pack_start (GTK_BOX (self->priv->balance_vbox), hbox, FALSE, TRUE, 0);
gtk_widget_show_all (hbox);
- /* tie the lifetime of the widget to the lifetime of the action */
- g_object_weak_ref (G_OBJECT (action),
- (GWeakNotify) gtk_widget_destroy, hbox);
-
- return hbox;
-}
-
-static void
-roster_window_setup_balance (EmpathyRosterWindow *self,
- TpAccount *account)
-{
- TpConnection *conn = tp_account_get_connection (account);
- GtkAction *action;
- const gchar *uri;
-
- if (conn == NULL)
- return;
-
- if (!tp_proxy_is_prepared (conn, TP_CONNECTION_FEATURE_BALANCE))
- return;
-
- DEBUG ("Setting up balance for acct: %s",
- tp_account_get_display_name (account));
-
- /* create the action */
- action = roster_window_setup_balance_create_action (self, account);
-
- if (action == NULL)
- return;
-
- gtk_action_set_visible (self->priv->view_balance_show_in_roster, TRUE);
-
- /* create the display widget */
- roster_window_setup_balance_create_widget (self, action, account);
-
- /* check the current balance and monitor for any changes */
- uri = tp_connection_get_balance_uri (conn);
-
- g_object_set_data_full (G_OBJECT (action), "manage-credit-uri",
- g_strdup (uri), g_free);
- gtk_action_set_sensitive (GTK_ACTION (action), !tp_str_empty (uri));
+ g_object_set_data (G_OBJECT (account), "balance-money-label", label);
+ g_object_set_data (G_OBJECT (account), "balance-money-hbox", hbox);
- roster_window_balance_update_balance (GTK_ACTION (action), conn);
+ roster_window_balance_update_balance (self, account);
g_signal_connect (conn, "balance-changed",
- G_CALLBACK (roster_window_balance_changed_cb), action);
+ G_CALLBACK (roster_window_balance_changed_cb), self);
}
static void
roster_window_remove_balance_action (EmpathyRosterWindow *self,
TpAccount *account)
{
- GtkAction *action;
- char *name;
- GList *a;
+ GtkWidget *hbox =
+ g_object_get_data (G_OBJECT (account), "balance-money-hbox");
- if (self->priv->balance_action_group == NULL)
+ if (hbox == NULL)
return;
- name = roster_window_account_to_action_name (account);
-
- action = gtk_action_group_get_action (
- self->priv->balance_action_group, name);
-
- if (action != NULL)
- {
- guint merge_id;
-
- DEBUG ("Removing action");
-
- merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (action),
- "merge-id"));
-
- gtk_ui_manager_remove_ui (self->priv->ui_manager,
- merge_id);
- gtk_action_group_remove_action (
- self->priv->balance_action_group, action);
- }
-
- g_free (name);
-
- a = gtk_action_group_list_actions (
- self->priv->balance_action_group);
+ g_return_if_fail (GTK_IS_BOX (hbox));
- gtk_action_set_visible (self->priv->view_balance_show_in_roster,
- g_list_length (a) > 0);
-
- g_list_free (a);
+ 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)
{
empathy_sound_manager_play (self->priv->sound_mgr, GTK_WIDGET (self),
EMPATHY_SOUND_ACCOUNT_DISCONNECTED);
-
- /* remove balance action if required */
- roster_window_remove_balance_action (self, account);
}
if (current == TP_CONNECTION_STATUS_CONNECTED)
/* Account connected without error, remove error message if any */
roster_window_remove_error (self, account);
- roster_window_setup_balance (self, account);
}
}
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);
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->ui_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
-roster_window_chat_quit_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+unprepare_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
- gtk_widget_destroy (GTK_WIDGET (self));
+ GtkWidget *self = user_data;
+
+ gtk_widget_destroy (self);
}
static void
-roster_window_view_history_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_chat_quit_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (self));
+ EmpathyRosterWindow *self = user_data;
+
+ /* 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
-roster_window_chat_new_message_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_view_history_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- empathy_new_message_dialog_show (GTK_WINDOW (self));
+ EmpathyRosterWindow *self = user_data;
+
+ empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (self));
}
static void
-roster_window_chat_new_call_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- empathy_new_call_dialog_show (GTK_WINDOW (self));
-}
-
-static void
-roster_window_chat_add_contact_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- empathy_new_individual_dialog_show (GTK_WINDOW (self));
-}
-
-static void
-roster_window_chat_search_contacts_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- GtkWidget *dialog = empathy_contact_search_dialog_new (
- GTK_WINDOW (self));
-
- gtk_widget_show (dialog);
-}
-
-static void
-roster_window_view_show_ft_manager (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- empathy_ft_manager_show ();
-}
-
-static void
-roster_window_view_show_offline_cb (GtkToggleAction *action,
- EmpathyRosterWindow *self)
-{
- gboolean current;
-
- current = gtk_toggle_action_get_active (action);
- g_settings_set_boolean (self->priv->gsettings_ui,
- EMPATHY_PREFS_UI_SHOW_OFFLINE,
- current);
-
- empathy_individual_view_set_show_offline (self->priv->individual_view,
- current);
-}
-
-static void
-roster_window_notify_sort_contact_cb (GSettings *gsettings,
- const gchar *key,
- EmpathyRosterWindow *self)
-{
- gchar *str;
-
- str = g_settings_get_string (gsettings, key);
-
- if (str != NULL)
- {
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- type = empathy_individual_store_sort_get_type ();
- enum_class = G_ENUM_CLASS (g_type_class_peek (type));
- enum_value = g_enum_get_value_by_nick (enum_class, str);
- if (enum_value)
- {
- /* By changing the value of the GtkRadioAction,
- it emits a signal that calls roster_window_view_sort_contacts_cb
- which updates the contacts list */
- gtk_radio_action_set_current_value (self->priv->sort_by_name,
- enum_value->value);
- }
- else
- {
- g_warning ("Wrong value for sort_criterium configuration : %s", str);
- }
- g_free (str);
- }
-}
-
-static void
-roster_window_view_sort_contacts_cb (GtkRadioAction *action,
- GtkRadioAction *current,
- EmpathyRosterWindow *self)
+roster_window_chat_new_message_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- EmpathyIndividualStoreSort value;
- GSList *group;
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- value = gtk_radio_action_get_current_value (action);
- group = gtk_radio_action_get_group (action);
-
- /* Get string from index */
- type = empathy_individual_store_sort_get_type ();
- enum_class = G_ENUM_CLASS (g_type_class_peek (type));
- enum_value = g_enum_get_value (enum_class, g_slist_index (group, current));
-
- if (!enum_value)
- g_warning ("No GEnumValue for EmpathyContactListSort with GtkRadioAction index:%d",
- g_slist_index (group, action));
- else
- g_settings_set_string (self->priv->gsettings_contacts,
- EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
- enum_value->value_nick);
+ EmpathyRosterWindow *self = user_data;
- empathy_individual_store_set_sort_criterium (self->priv->individual_store,
- value);
+ empathy_new_message_dialog_show (GTK_WINDOW (self));
}
static void
-roster_window_view_show_protocols_cb (GtkToggleAction *action,
- EmpathyRosterWindow *self)
+roster_window_chat_new_call_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- gboolean value;
-
- value = gtk_toggle_action_get_active (action);
-
- g_settings_set_boolean (self->priv->gsettings_ui,
- EMPATHY_PREFS_UI_SHOW_PROTOCOLS,
- value);
+ EmpathyRosterWindow *self = user_data;
- empathy_individual_store_set_show_protocols (self->priv->individual_store,
- value);
+ empathy_new_call_dialog_show (GTK_WINDOW (self));
}
-/* Matches GtkRadioAction values set in empathy-roster-window.ui */
-#define CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS 0
-#define CONTACT_LIST_NORMAL_SIZE 1
-#define CONTACT_LIST_COMPACT_SIZE 2
-
static void
-roster_window_view_contacts_list_size_cb (GtkRadioAction *action,
- GtkRadioAction *current,
- EmpathyRosterWindow *self)
+roster_window_chat_add_contact_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- GSettings *gsettings_ui;
- gint value;
-
- value = gtk_radio_action_get_current_value (action);
- /* create a new GSettings, so we can delay the setting until both
- * values are set */
- gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
-
- DEBUG ("radio button toggled, value = %i", value);
-
- g_settings_delay (gsettings_ui);
- g_settings_set_boolean (gsettings_ui, EMPATHY_PREFS_UI_SHOW_AVATARS,
- value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
-
- g_settings_set_boolean (gsettings_ui, EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- value == CONTACT_LIST_COMPACT_SIZE);
- g_settings_apply (gsettings_ui);
-
- /* FIXME: these enums probably have the wrong namespace */
- empathy_individual_store_set_show_avatars (self->priv->individual_store,
- value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
- empathy_individual_store_set_is_compact (self->priv->individual_store,
- value == CONTACT_LIST_COMPACT_SIZE);
-
- g_object_unref (gsettings_ui);
-}
+ EmpathyRosterWindow *self = user_data;
-static void roster_window_notify_show_protocols_cb (GSettings *gsettings,
- const gchar *key,
- EmpathyRosterWindow *self)
-{
- gtk_toggle_action_set_active (self->priv->show_protocols,
- g_settings_get_boolean (gsettings, EMPATHY_PREFS_UI_SHOW_PROTOCOLS));
+ empathy_new_individual_dialog_show (GTK_WINDOW (self));
}
-
static void
-roster_window_notify_contact_list_size_cb (GSettings *gsettings,
- const gchar *key,
- EmpathyRosterWindow *self)
+roster_window_chat_search_contacts_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- gint value;
-
- if (g_settings_get_boolean (gsettings,
- EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST))
- value = CONTACT_LIST_COMPACT_SIZE;
- else if (g_settings_get_boolean (gsettings,
- EMPATHY_PREFS_UI_SHOW_AVATARS))
- value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS;
- else
- value = CONTACT_LIST_NORMAL_SIZE;
-
- DEBUG ("setting changed, value = %i", value);
+ EmpathyRosterWindow *self = user_data;
+ GtkWidget *dialog;
- /* By changing the value of the GtkRadioAction,
- it emits a signal that calls roster_window_view_contacts_list_size_cb
- which updates the contacts list */
- gtk_radio_action_set_current_value (self->priv->normal_with_avatars, value);
-}
+ dialog = empathy_contact_search_dialog_new (
+ GTK_WINDOW (self));
-static void
-roster_window_edit_search_contacts_cb (GtkCheckMenuItem *item,
- EmpathyRosterWindow *self)
-{
- empathy_individual_view_start_search (self->priv->individual_view);
+ gtk_widget_show (dialog);
}
static void
-roster_window_view_show_map_cb (GtkCheckMenuItem *item,
- EmpathyRosterWindow *self)
+roster_window_view_show_ft_manager (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
-#ifdef HAVE_LIBCHAMPLAIN
- empathy_map_view_show ();
-#endif
+ empathy_ft_manager_show ();
}
static void
}
static void
-roster_window_favorite_chatroom_menu_activate_cb (GtkMenuItem *menu_item,
+roster_window_favorite_chatroom_menu_activate_cb (GAction *action,
+ GVariant *parameter,
EmpathyChatroom *chatroom)
{
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);
+}
+
static void
roster_window_favorite_chatroom_menu_add (EmpathyRosterWindow *self,
EmpathyChatroom *chatroom)
{
- GtkWidget *menu_item;
+ GMenuItem *item;
const gchar *name, *account_name;
- gchar *label;
-
- if (g_object_get_data (G_OBJECT (chatroom), "menu_item"))
- return;
+ gchar *label, *action_name;
+ GAction *action;
name = empathy_chatroom_get_name (chatroom);
account_name = tp_account_get_display_name (
empathy_chatroom_get_account (chatroom));
+
label = g_strdup_printf ("%s (%s)", name, account_name);
- menu_item = gtk_menu_item_new_with_label (label);
- g_free (label);
- g_object_set_data (G_OBJECT (menu_item), "is_favorite",
- GUINT_TO_POINTER (TRUE));
+ action_name = dup_join_action_name (chatroom, FALSE);
- g_object_set_data (G_OBJECT (chatroom), "menu_item", menu_item);
- g_signal_connect (menu_item, "activate",
+ 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);
- gtk_menu_shell_insert (GTK_MENU_SHELL (self->priv->room_menu),
- menu_item, 4);
+ 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);
+ g_menu_item_set_attribute (item, "room-name", "s", name);
+ g_menu_append_item (self->priv->rooms_section, item);
- gtk_widget_show (menu_item);
+ g_free (label);
+ g_free (action_name);
+ g_object_unref (action);
}
static void
EmpathyRosterWindow *self)
{
roster_window_favorite_chatroom_menu_add (self, chatroom);
- gtk_widget_show (self->priv->room_separator);
- gtk_action_set_sensitive (self->priv->room_join_favorites, TRUE);
}
static void
EmpathyChatroom *chatroom,
EmpathyRosterWindow *self)
{
- GtkWidget *menu_item;
GList *chatrooms;
+ gchar *act;
+ gint i;
- menu_item = g_object_get_data (G_OBJECT (chatroom), "menu_item");
- g_object_set_data (G_OBJECT (chatroom), "menu_item", NULL);
- gtk_widget_destroy (menu_item);
+ act = dup_join_action_name (chatroom, TRUE);
- chatrooms = empathy_chatroom_manager_get_chatrooms (self->priv->chatroom_manager,
- NULL);
- if (chatrooms)
- gtk_widget_show (self->priv->room_separator);
- else
- gtk_widget_hide (self->priv->room_separator);
+ g_action_map_remove_action (G_ACTION_MAP (self), act);
+
+ for (i = 0; i < g_menu_model_get_n_items (
+ G_MENU_MODEL (self->priv->rooms_section)); i++)
+ {
+ const gchar *name;
+
+ 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)))
+ {
+ g_menu_remove (self->priv->rooms_section, i);
+ break;
+ }
+ }
+
+ chatrooms = empathy_chatroom_manager_get_chatrooms (
+ self->priv->chatroom_manager, NULL);
- gtk_action_set_sensitive (self->priv->room_join_favorites, chatrooms != NULL);
g_list_free (chatrooms);
}
roster_window_favorite_chatroom_menu_setup (EmpathyRosterWindow *self)
{
GList *chatrooms, *l;
- GtkWidget *room;
self->priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
+
chatrooms = empathy_chatroom_manager_get_chatrooms (
self->priv->chatroom_manager, NULL);
- room = gtk_ui_manager_get_widget (self->priv->ui_manager,
- "/menubar/room");
- self->priv->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (room));
- self->priv->room_separator = gtk_ui_manager_get_widget (self->priv->ui_manager,
- "/menubar/room/room_separator");
for (l = chatrooms; l; l = l->next)
roster_window_favorite_chatroom_menu_add (self, l->data);
- if (!chatrooms)
- gtk_widget_hide (self->priv->room_separator);
-
- gtk_action_set_sensitive (self->priv->room_join_favorites, chatrooms != NULL);
-
g_signal_connect (self->priv->chatroom_manager, "chatroom-added",
G_CALLBACK (roster_window_favorite_chatroom_menu_added_cb),
self);
}
static void
-roster_window_room_join_new_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_room_join_new_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
+ EmpathyRosterWindow *self = user_data;
+
empathy_new_chatroom_dialog_show (GTK_WINDOW (self));
}
static void
-roster_window_room_join_favorites_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_room_join_favorites_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
+ EmpathyRosterWindow *self = user_data;
GList *chatrooms, *l;
chatrooms = empathy_chatroom_manager_get_chatrooms (self->priv->chatroom_manager,
}
static void
-roster_window_room_manage_favorites_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- empathy_chatrooms_window_show (GTK_WINDOW (self));
-}
-
-static void
-roster_window_edit_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_room_manage_favorites_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- GtkWidget *submenu;
-
- /* FIXME: It should use the UIManager to merge the contact/group submenu */
- submenu = empathy_individual_view_get_individual_menu (
- self->priv->individual_view);
- if (submenu)
- {
- GtkMenuItem *item;
- GtkWidget *label;
-
- item = GTK_MENU_ITEM (self->priv->edit_context);
- label = gtk_bin_get_child (GTK_BIN (item));
- gtk_label_set_text (GTK_LABEL (label), _("Contact"));
-
- gtk_widget_show (self->priv->edit_context);
- gtk_widget_show (self->priv->edit_context_separator);
-
- gtk_menu_item_set_submenu (item, submenu);
-
- return;
- }
-
- submenu = empathy_individual_view_get_group_menu (self->priv->individual_view);
- if (submenu)
- {
- GtkMenuItem *item;
- GtkWidget *label;
-
- item = GTK_MENU_ITEM (self->priv->edit_context);
- label = gtk_bin_get_child (GTK_BIN (item));
- gtk_label_set_text (GTK_LABEL (label), _("Group"));
-
- gtk_widget_show (self->priv->edit_context);
- gtk_widget_show (self->priv->edit_context_separator);
-
- gtk_menu_item_set_submenu (item, submenu);
-
- return;
- }
-
- gtk_widget_hide (self->priv->edit_context);
- gtk_widget_hide (self->priv->edit_context_separator);
+ EmpathyRosterWindow *self = user_data;
- return;
+ empathy_chatrooms_window_show (GTK_WINDOW (self));
}
static void
-roster_window_edit_accounts_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_edit_accounts_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
empathy_accounts_dialog_show_application (gdk_screen_get_default (),
NULL, FALSE, FALSE);
}
static void
-roster_window_edit_personal_information_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- empathy_contact_personal_dialog_show (GTK_WINDOW (self));
-}
-
-static void
-roster_window_edit_blocked_contacts_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_edit_blocked_contacts_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
+ EmpathyRosterWindow *self = user_data;
GtkWidget *dialog;
dialog = empathy_contact_blocking_dialog_new (GTK_WINDOW (self));
}
static void
-roster_window_edit_preferences_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_edit_preferences_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
+ EmpathyRosterWindow *self = user_data;
+
empathy_roster_window_show_preferences (self, NULL);
}
static void
-roster_window_help_about_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_help_about_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
+ EmpathyRosterWindow *self = user_data;
+
empathy_about_dialog_new (GTK_WINDOW (self));
}
static void
-roster_window_help_debug_cb (GtkAction *action,
- EmpathyRosterWindow *self)
+roster_window_help_contents_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
- empathy_launch_program (BIN_DIR, "empathy-debugger", NULL);
-}
+ EmpathyRosterWindow *self = user_data;
-static void
-roster_window_help_contents_cb (GtkAction *action,
- EmpathyRosterWindow *self)
-{
- empathy_url_show (GTK_WIDGET (self), "ghelp:empathy");
+ empathy_url_show (GTK_WIDGET (self), "help:empathy");
}
static gboolean
TpAccount *account,
EmpathyRosterWindow *self)
{
- GList *a;
-
- a = tp_account_manager_get_valid_accounts (manager);
-
- gtk_action_set_sensitive (self->priv->view_history,
- g_list_length (a) > 0);
-
- g_list_free (a);
-
/* remove errors if any */
roster_window_remove_error (self, account);
roster_window_remove_balance_action (self, account);
}
+static void
+account_connection_notify_cb (TpAccount *account,
+ GParamSpec *spec,
+ EmpathyRosterWindow *self)
+{
+ TpConnection *conn;
+
+ conn = tp_account_get_connection (account);
+
+ if (conn != NULL)
+ {
+ roster_window_setup_balance (self, account);
+ }
+ else
+ {
+ /* remove balance action if required */
+ roster_window_remove_balance_action (self, account);
+ }
+}
+
static void
add_account (EmpathyRosterWindow *self,
TpAccount *account)
g_hash_table_insert (self->priv->status_changed_handlers,
account, GUINT_TO_POINTER (handler_id));
+ /* roster_window_setup_balance() relies on the TpConnection to be ready on
+ * the TpAccount so we connect this signal as well. */
+ tp_g_signal_connect_object (account, "notify::connection",
+ G_CALLBACK (account_connection_notify_cb), self, 0);
+
roster_window_setup_balance (self, account);
}
+/* @account: if not %NULL, the only account which can be enabled */
+static void
+display_page_account_not_enabled (EmpathyRosterWindow *self,
+ TpAccount *account)
+{
+ if (account == NULL)
+ {
+ display_page_message (self,
+ _("You need to enable one of your accounts to see contacts here."),
+ PAGE_MESSAGE_FLAG_ACCOUNTS);
+ }
+ else
+ {
+ gchar *tmp;
+
+ /* translators: argument is an account name */
+ tmp = g_strdup_printf (_("You need to enable %s to see contacts here."),
+ tp_account_get_display_name (account));
+
+ display_page_message (self, tmp, PAGE_MESSAGE_FLAG_ACCOUNTS);
+ g_free (tmp);
+ }
+}
+static gboolean
+has_enabled_account (GList *accounts)
+{
+ GList *l;
+
+ for (l = accounts; l != NULL; l = g_list_next (l))
+ {
+ TpAccount *account = l->data;
+
+ if (tp_account_is_enabled (account))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+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_dup_valid_accounts (
+ self->priv->account_manager);
+
+ len = g_list_length (accounts);
+
+ if (len == 0)
+ {
+ /* No account */
+ display_page_no_account (self);
+ goto out;
+ }
+
+ if (!has_enabled_account (accounts))
+ {
+ TpAccount *account = NULL;
+
+ /* Pass the account if there is only one which can be enabled */
+ if (len == 1)
+ account = accounts->data;
+
+ display_page_account_not_enabled (self, account);
+ 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 contact 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_full (accounts, g_object_unref);
+}
+
static void
roster_window_account_validity_changed_cb (TpAccountManager *manager,
TpAccount *account,
add_account (self, account);
else
roster_window_account_removed_cb (manager, account, self);
-}
-static void
-roster_window_notify_show_offline_cb (GSettings *gsettings,
- const gchar *key,
- gpointer toggle_action)
-{
- gtk_toggle_action_set_active (toggle_action,
- g_settings_get_boolean (gsettings, key));
+ set_notebook_page (self);
}
static void
-roster_window_connection_items_setup (EmpathyRosterWindow *self,
- GtkBuilder *gui)
+roster_window_connection_items_setup (EmpathyRosterWindow *self)
{
- GList *list;
- GObject *action;
guint i;
const gchar *actions_connected[] = {
"room_join_new",
"chat_new_call",
"chat_search_contacts",
"chat_add_contact",
- "edit_personal_information",
"edit_blocked_contacts",
- "edit_search_contacts"
};
- for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++)
+ for (i = 0; i < G_N_ELEMENTS (actions_connected); i++)
{
- action = gtk_builder_get_object (gui, actions_connected[i]);
- list = g_list_prepend (list, action);
+ GAction *action;
+
+ action = g_action_map_lookup_action (G_ACTION_MAP (self),
+ actions_connected[i]);
+
+ self->priv->actions_connected = g_list_prepend (
+ self->priv->actions_connected, action);
}
+}
- self->priv->actions_connected = list;
+static void
+account_enabled_cb (TpAccountManager *manager,
+ TpAccount *account,
+ EmpathyRosterWindow *self)
+{
+ set_notebook_page (self);
+}
+
+static void
+account_disabled_cb (TpAccountManager *manager,
+ TpAccount *account,
+ EmpathyRosterWindow *self)
+{
+ set_notebook_page (self);
}
static void
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-disabled",
+ G_CALLBACK (account_disabled_cb), self, 0);
+ tp_g_signal_connect_object (manager, "account-enabled",
+ G_CALLBACK (account_enabled_cb), self, 0);
roster_window_update_status (self);
- /* Disable the "Previous Conversations" menu entry if there is no account */
- gtk_action_set_sensitive (self->priv->view_history,
- g_list_length (accounts) > 0);
+ set_notebook_page (self);
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
}
void
return window;
}
+static GActionEntry menubar_entries[] = {
+ { "chat_new_message", roster_window_chat_new_message_cb, NULL, NULL, NULL },
+ { "chat_new_call", roster_window_chat_new_call_cb, NULL, NULL, NULL },
+ { "chat_add_contact", roster_window_chat_add_contact_cb, NULL, NULL, NULL },
+ { "chat_search_contacts", roster_window_chat_search_contacts_cb, NULL, NULL, NULL },
+ { "chat_quit", roster_window_chat_quit_cb, NULL, NULL, NULL },
+
+ { "edit_accounts", roster_window_edit_accounts_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 },
+
+ { "view_history", roster_window_view_history_cb, NULL, NULL, NULL },
+ { "view_show_ft_manager", roster_window_view_show_ft_manager, NULL, NULL, NULL },
+
+ { "room_join_new", roster_window_room_join_new_cb, NULL, NULL, NULL },
+ { "room_join_favorites", roster_window_room_join_favorites_cb, NULL, 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 void
empathy_roster_window_set_property (GObject *object,
guint property_id,
}
}
+static void
+empathy_roster_window_constructed (GObject *self)
+{
+ G_OBJECT_CLASS (empathy_roster_window_parent_class)->constructed (self);
+}
+
static void
empathy_roster_window_class_init (EmpathyRosterWindowClass *klass)
{
object_class->finalize = empathy_roster_window_finalize;
object_class->constructor = empathy_roster_window_constructor;
+ object_class->constructed = empathy_roster_window_constructed;
object_class->set_property = empathy_roster_window_set_property;
object_class->get_property = empathy_roster_window_get_property;
g_type_class_add_private (object_class, sizeof (EmpathyRosterWindowPriv));
}
+static void
+contacts_loaded_cb (EmpathyIndividualManager *manager,
+ EmpathyRosterWindow *self)
+{
+ set_notebook_page (self);
+}
+
+static void
+roster_window_setup_actions (EmpathyRosterWindow *self)
+{
+ 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);
+
+ ADD_GSETTINGS_ACTION (ui, UI_SHOW_OFFLINE);
+
+#undef ADD_GSETTINGS_ACTION
+}
+
+static void
+menu_deactivate_cb (GtkMenuShell *menushell,
+ gpointer user_data)
+{
+ /* 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
+popup_individual_menu_cb (EmpathyRosterView *view,
+ 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, 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);
+
+ 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
+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;
+ GtkWidget *child;
+
+ individual = empathy_roster_view_get_individual_at_y (self->priv->view,
+ y, &child);
+ 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);
+ return FALSE;
+ }
+
+no_hl:
+ egg_list_box_drag_unhighlight_widget (EGG_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)
{
- EmpathyIndividualManager *individual_manager;
- GtkBuilder *gui, *gui_mgr;
+ GtkBuilder *gui;
GtkWidget *sw;
- GtkToggleAction *show_offline_widget;
- GtkAction *show_map_widget;
- GtkToolItem *item;
- gboolean show_offline;
gchar *filename;
- GtkTreeModel *model;
GtkWidget *search_vbox;
- GtkWidget *menubar;
+ guint i;
+ EmpathyRosterModel *model;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowPriv);
+ 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 ();
"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);
- /* Set UI manager */
- filename = empathy_file_lookup ("empathy-roster-window-menubar.ui", "src");
- gui_mgr = empathy_builder_get_file (filename,
- "ui_manager", &self->priv->ui_manager,
- "view_show_offline", &show_offline_widget,
- "view_show_protocols", &self->priv->show_protocols,
- "view_sort_by_name", &self->priv->sort_by_name,
- "view_sort_by_status", &self->priv->sort_by_status,
- "view_normal_size_with_avatars", &self->priv->normal_with_avatars,
- "view_normal_size", &self->priv->normal_size,
- "view_compact_size", &self->priv->compact_size,
- "view_history", &self->priv->view_history,
- "view_show_map", &show_map_widget,
- "room_join_favorites", &self->priv->room_join_favorites,
- "view_balance_show_in_roster", &self->priv->view_balance_show_in_roster,
- "menubar", &menubar,
- NULL);
- g_free (filename);
-
- /* The UI manager is living in its own .ui file as Glade doesn't support
- * those. The GtkMenubar has to be in this file as well to we manually add
- * it to the first position of the vbox. */
- gtk_box_pack_start (GTK_BOX (self->priv->main_vbox), menubar, FALSE, FALSE, 0);
- gtk_box_reorder_child (GTK_BOX (self->priv->main_vbox), menubar, 0);
-
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);
-
- empathy_builder_connect (gui_mgr, self,
- "chat_quit", "activate", roster_window_chat_quit_cb,
- "chat_new_message", "activate", roster_window_chat_new_message_cb,
- "chat_new_call", "activate", roster_window_chat_new_call_cb,
- "view_history", "activate", roster_window_view_history_cb,
- "room_join_new", "activate", roster_window_room_join_new_cb,
- "room_join_favorites", "activate", roster_window_room_join_favorites_cb,
- "room_manage_favorites", "activate", roster_window_room_manage_favorites_cb,
- "chat_add_contact", "activate", roster_window_chat_add_contact_cb,
- "chat_search_contacts", "activate", roster_window_chat_search_contacts_cb,
- "view_show_ft_manager", "activate", roster_window_view_show_ft_manager,
- "view_show_offline", "toggled", roster_window_view_show_offline_cb,
- "view_show_protocols", "toggled", roster_window_view_show_protocols_cb,
- "view_sort_by_name", "changed", roster_window_view_sort_contacts_cb,
- "view_normal_size_with_avatars", "changed", roster_window_view_contacts_list_size_cb,
- "view_show_map", "activate", roster_window_view_show_map_cb,
- "edit", "activate", roster_window_edit_cb,
- "edit_accounts", "activate", roster_window_edit_accounts_cb,
- "edit_personal_information", "activate", roster_window_edit_personal_information_cb,
- "edit_blocked_contacts", "activate", roster_window_edit_blocked_contacts_cb,
- "edit_preferences", "activate", roster_window_edit_preferences_cb,
- "edit_search_contacts", "activate", roster_window_edit_search_contacts_cb,
- "help_about", "activate", roster_window_help_about_cb,
- "help_debug", "activate", roster_window_help_debug_cb,
- "help_contents", "activate", roster_window_help_contents_cb,
- NULL);
-
- /* Set up connection related widgets. */
- roster_window_connection_items_setup (self, gui_mgr);
+ G_CALLBACK (roster_window_key_press_event_cb), self);
- g_object_ref (self->priv->ui_manager);
g_object_unref (gui);
- g_object_unref (gui_mgr);
-
-#ifndef HAVE_LIBCHAMPLAIN
- gtk_action_set_visible (show_map_widget, FALSE);
-#endif
self->priv->account_manager = tp_account_manager_dup ();
self->priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash,
g_direct_equal, NULL, NULL);
- /* Set up menu */
+ /* 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,
+ "appmenu", &self->priv->menumodel,
+ "rooms", &self->priv->rooms_section,
+ NULL);
+ g_free (filename);
+
+ g_object_ref (self->priv->menumodel);
+ g_object_ref (self->priv->rooms_section);
+
+ /* Set up connection related actions. */
+ roster_window_connection_items_setup (self);
roster_window_favorite_chatroom_menu_setup (self);
- self->priv->edit_context = gtk_ui_manager_get_widget (self->priv->ui_manager,
- "/menubar/edit/edit_context");
- self->priv->edit_context_separator = gtk_ui_manager_get_widget (
- self->priv->ui_manager,
- "/menubar/edit/edit_context_separator");
- gtk_widget_hide (self->priv->edit_context);
- gtk_widget_hide (self->priv->edit_context_separator);
+ g_object_unref (gui);
/* Set up contact list. */
empathy_status_presets_get_all ();
/* Set up presence chooser */
self->priv->presence_chooser = empathy_presence_chooser_new ();
gtk_widget_show (self->priv->presence_chooser);
- item = gtk_tool_item_new ();
- gtk_widget_show (GTK_WIDGET (item));
- gtk_widget_set_size_request (self->priv->presence_chooser, 10, -1);
- gtk_container_add (GTK_CONTAINER (item), self->priv->presence_chooser);
- gtk_tool_item_set_is_important (item, TRUE);
- gtk_tool_item_set_expand (item, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (self->priv->presence_toolbar), item, -1);
+ gtk_box_pack_start (GTK_BOX (self->priv->presence_toolbar),
+ self->priv->presence_chooser,
+ TRUE, TRUE, 0);
/* Set up the throbber */
self->priv->throbber = gtk_spinner_new ();
g_signal_connect (self->priv->throbber, "button-press-event",
G_CALLBACK (roster_window_throbber_button_press_event_cb),
self);
- gtk_widget_show (self->priv->throbber);
-
- item = gtk_tool_item_new ();
- gtk_container_set_border_width (GTK_CONTAINER (item), 6);
- gtk_toolbar_insert (GTK_TOOLBAR (self->priv->presence_toolbar), item, -1);
- gtk_container_add (GTK_CONTAINER (item), self->priv->throbber);
- self->priv->throbber_tool_item = GTK_WIDGET (item);
-
- /* 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. */
- individual_manager = empathy_individual_manager_dup_singleton ();
- self->priv->individual_store = EMPATHY_INDIVIDUAL_STORE (
- empathy_individual_store_manager_new (individual_manager));
- g_object_unref (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_LINK |
- 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);
+ gtk_box_pack_start (GTK_BOX (self->priv->presence_toolbar),
+ self->priv->throbber,
+ FALSE, TRUE, 0);
+
+ self->priv->individual_manager = empathy_individual_manager_dup_singleton ();
+
+ 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));
+
+ 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));
+
+ 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,
+ 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);
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 ();
+ gtk_window_set_default_size (GTK_WINDOW (self), -1, 600);
/* Set window size. */
empathy_geometry_bind (GTK_WINDOW (self), GEOMETRY_NAME);
- /* bind view_balance_show_in_roster */
- g_settings_bind (self->priv->gsettings_ui, "show-balance-in-roster",
- self->priv->view_balance_show_in_roster, "active",
- G_SETTINGS_BIND_DEFAULT);
- g_object_bind_property (self->priv->view_balance_show_in_roster, "active",
- self->priv->balance_vbox, "visible",
- G_BINDING_SYNC_CREATE);
-
/* Enable event handling */
self->priv->call_observer = empathy_call_observer_dup_singleton ();
self->priv->event_manager = empathy_event_manager_dup_singleton ();
- 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);
+ 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->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);
-
- /* Show offline ? */
- show_offline = g_settings_get_boolean (self->priv->gsettings_ui,
- EMPATHY_PREFS_UI_SHOW_OFFLINE);
-
- g_signal_connect (self->priv->gsettings_ui,
+ 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 (roster_window_notify_show_offline_cb), show_offline_widget);
-
- gtk_toggle_action_set_active (show_offline_widget, show_offline);
-
- /* Show protocol ? */
- g_signal_connect (self->priv->gsettings_ui,
- "changed::" EMPATHY_PREFS_UI_SHOW_PROTOCOLS,
- G_CALLBACK (roster_window_notify_show_protocols_cb), self);
-
- roster_window_notify_show_protocols_cb (self->priv->gsettings_ui,
- EMPATHY_PREFS_UI_SHOW_PROTOCOLS, self);
-
- /* Sort by name / by status ? */
- g_signal_connect (self->priv->gsettings_contacts,
- "changed::" EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
- G_CALLBACK (roster_window_notify_sort_contact_cb), self);
-
- roster_window_notify_sort_contact_cb (self->priv->gsettings_contacts,
- EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, self);
-
- /* Contacts list size */
- g_signal_connect (self->priv->gsettings_ui,
- "changed::" EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- G_CALLBACK (roster_window_notify_contact_list_size_cb), self);
-
- g_signal_connect (self->priv->gsettings_ui,
- "changed::" EMPATHY_PREFS_UI_SHOW_AVATARS,
- G_CALLBACK (roster_window_notify_contact_list_size_cb),
- self);
+ 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_settings_bind (self->priv->gsettings_ui, "show-balance-in-roster",
+ self->priv->balance_vbox, "visible",
+ G_SETTINGS_BIND_GET);
- roster_window_notify_contact_list_size_cb (self->priv->gsettings_ui,
- EMPATHY_PREFS_UI_SHOW_AVATARS, 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 *
-empathy_roster_window_dup (void)
+empathy_roster_window_new (GtkApplication *app)
{
- return g_object_new (EMPATHY_TYPE_ROSTER_WINDOW, NULL);
+ return g_object_new (EMPATHY_TYPE_ROSTER_WINDOW,
+ "application", app,
+ NULL);
+}
+
+GMenuModel *
+empathy_roster_window_get_menu_model (EmpathyRosterWindow *self)
+{
+ g_return_val_if_fail (EMPATHY_IS_ROSTER_WINDOW (self), NULL);
+
+ return G_MENU_MODEL (self->priv->menumodel);
}
projects / empathy.git / blobdiff