/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2002-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2010 Collabora Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <telepathy-glib/account-manager.h>
+
#include <libempathy/empathy-contact.h>
+#include <libempathy/empathy-idle.h>
#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account-manager.h>
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-chatroom-manager.h>
#include <libempathy/empathy-chatroom.h>
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-status-presets.h>
+#include <libempathy-gtk/empathy-conf.h>
#include <libempathy-gtk/empathy-contact-dialogs.h>
#include <libempathy-gtk/empathy-contact-list-store.h>
#include <libempathy-gtk/empathy-contact-list-view.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-conf.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
#include <libempathy-gtk/empathy-gtk-enum-types.h>
-
-#include <libmissioncontrol/mission-control.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.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-accounts-dialog.h"
#include "empathy-main-window.h"
#include "ephy-spinner.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-chatrooms-window.h"
#include "empathy-event-manager.h"
#include "empathy-ft-manager.h"
+#include "empathy-migrate-butterfly-logs.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>
typedef struct {
EmpathyContactListView *list_view;
EmpathyContactListStore *list_store;
- MissionControl *mc;
- EmpathyAccountManager *account_manager;
+ TpAccountManager *account_manager;
EmpathyChatroomManager *chatroom_manager;
EmpathyEventManager *event_manager;
guint flash_timeout_id;
GtkWidget *presence_chooser;
GtkWidget *errors_vbox;
+ 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;
guint size_timeout_id;
GHashTable *errors;
+ /* stores a mapping from TpAccount to Handler ID to prevent
+ * to listen more than once to the status-changed signal */
+ GHashTable *status_changed_handlers;
+
/* Actions that are enabled when there are connected accounts */
GList *actions_connected;
+
+ /* The idle event source to migrate butterfly's logs */
+ guint butterfly_log_migration_contact_added_id;
} EmpathyMainWindow;
-static EmpathyMainWindow *window = NULL;
+static EmpathyMainWindow *main_window = NULL;
static void
main_window_flash_stop (EmpathyMainWindow *window)
}
typedef struct {
- EmpathyEvent *event;
- gboolean on;
+ EmpathyEvent *event;
+ gboolean on;
+ EmpathyMainWindow *window;
} FlashForeachData;
static gboolean
const gchar *icon_name;
GtkTreePath *parent_path = NULL;
GtkTreeIter parent_iter;
+ GdkPixbuf *pixbuf = NULL;
/* To be used with gtk_tree_model_foreach, update the status icon
* of the contact to show the event icon (on=TRUE) or the presence
if (data->on) {
icon_name = data->event->icon_name;
+ pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
} else {
- icon_name = empathy_icon_name_for_contact (contact);
+ pixbuf = contact_list_store_get_contact_status_icon (
+ data->window->list_store,
+ contact);
}
gtk_tree_store_set (GTK_TREE_STORE (model), iter,
- EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, icon_name,
+ EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf,
-1);
/* To make sure the parent is shown correctly, we emit
events = empathy_event_manager_get_events (window->event_manager);
for (l = events; l; l = l->next) {
data.event = l->data;
- if (!data.event->contact) {
+ data.window = window;
+ if (!data.event->contact || !data.event->must_ack) {
continue;
}
data.on = FALSE;
data.event = event;
+ data.window = window;
gtk_tree_model_foreach (GTK_TREE_MODEL (window->list_store),
main_window_flash_foreach,
&data);
}
static void
-main_window_error_edit_clicked_cb (GtkButton *button,
- EmpathyMainWindow *window)
+main_window_remove_error (EmpathyMainWindow *window,
+ TpAccount *account)
{
- McAccount *account;
GtkWidget *error_widget;
+ error_widget = g_hash_table_lookup (window->errors, account);
+ if (error_widget != NULL) {
+ gtk_widget_destroy (error_widget);
+ g_hash_table_remove (window->errors, account);
+ }
+}
+
+static void
+main_window_account_disabled_cb (TpAccountManager *manager,
+ TpAccount *account,
+ EmpathyMainWindow *window)
+{
+ main_window_remove_error (window, account);
+}
+
+static void
+main_window_error_retry_clicked_cb (GtkButton *button,
+ EmpathyMainWindow *window)
+{
+ TpAccount *account;
+
account = g_object_get_data (G_OBJECT (button), "account");
- empathy_accounts_dialog_show (GTK_WINDOW (window->window), account);
+ tp_account_reconnect_async (account, NULL, NULL);
- error_widget = g_hash_table_lookup (window->errors, account);
- gtk_widget_destroy (error_widget);
- g_hash_table_remove (window->errors, account);
+ main_window_remove_error (window, account);
+}
+
+static void
+main_window_error_edit_clicked_cb (GtkButton *button,
+ EmpathyMainWindow *window)
+{
+ 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);
+
+ main_window_remove_error (window, account);
}
static void
-main_window_error_clear_clicked_cb (GtkButton *button,
+main_window_error_close_clicked_cb (GtkButton *button,
EmpathyMainWindow *window)
{
- McAccount *account;
- GtkWidget *error_widget;
+ TpAccount *account;
account = g_object_get_data (G_OBJECT (button), "account");
- error_widget = g_hash_table_lookup (window->errors, account);
- gtk_widget_destroy (error_widget);
- g_hash_table_remove (window->errors, account);
+ main_window_remove_error (window, account);
}
static void
main_window_error_display (EmpathyMainWindow *window,
- McAccount *account,
+ TpAccount *account,
const gchar *message)
{
- GtkWidget *child;
- GtkWidget *table;
- GtkWidget *image;
- GtkWidget *button_edit;
- GtkWidget *alignment;
- GtkWidget *hbox;
+ GtkWidget *info_bar;
+ GtkWidget *content_area;
GtkWidget *label;
- GtkWidget *fixed;
- GtkWidget *vbox;
- GtkWidget *button_close;
+ GtkWidget *image;
+ GtkWidget *retry_button;
+ GtkWidget *edit_button;
+ GtkWidget *close_button;
+ GtkWidget *action_area;
+ GtkWidget *action_table;
gchar *str;
+ const gchar *icon_name;
+
+ str = g_markup_printf_escaped ("<b>%s</b>\n%s",
+ tp_account_get_display_name (account),
+ message);
- child = g_hash_table_lookup (window->errors, account);
- if (child) {
- label = g_object_get_data (G_OBJECT (child), "label");
+ info_bar = g_hash_table_lookup (window->errors, account);
+ if (info_bar) {
+ label = g_object_get_data (G_OBJECT (info_bar), "label");
/* Just set the latest error and return */
- str = g_markup_printf_escaped ("<b>%s</b>\n%s",
- mc_account_get_display_name (account),
- message);
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
return;
}
- child = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (window->errors_vbox), child, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (child), 6);
- gtk_widget_show (child);
+ info_bar = gtk_info_bar_new ();
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR);
- table = gtk_table_new (2, 4, FALSE);
- gtk_widget_show (table);
- gtk_box_pack_start (GTK_BOX (child), table, TRUE, TRUE, 0);
- gtk_table_set_row_spacings (GTK_TABLE (table), 12);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-
- image = gtk_image_new_from_stock (GTK_STOCK_DISCONNECT, GTK_ICON_SIZE_MENU);
- gtk_widget_show (image);
- gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
+ gtk_widget_set_no_show_all (info_bar, TRUE);
+ gtk_box_pack_start (GTK_BOX (window->errors_vbox), info_bar, FALSE, TRUE, 0);
+ gtk_widget_show (info_bar);
- button_edit = gtk_button_new ();
- gtk_widget_show (button_edit);
- gtk_table_attach (GTK_TABLE (table), button_edit, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment);
- gtk_container_add (GTK_CONTAINER (button_edit), alignment);
-
- hbox = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (alignment), hbox);
-
- image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON);
+ 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);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("_Edit 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);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
- fixed = gtk_fixed_new ();
- gtk_widget_show (fixed);
- gtk_table_attach (GTK_TABLE (table), fixed, 2, 3, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
- vbox = gtk_vbox_new (FALSE, 6);
- gtk_widget_show (vbox);
- gtk_table_attach (GTK_TABLE (table), vbox, 3, 4, 0, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
- button_close = gtk_button_new ();
- gtk_widget_show (button_close);
- gtk_box_pack_start (GTK_BOX (vbox), button_close, FALSE, FALSE, 0);
- gtk_button_set_relief (GTK_BUTTON (button_close), GTK_RELIEF_NONE);
-
+ g_free (str);
- image = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image);
- gtk_container_add (GTK_CONTAINER (button_close), image);
+ 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);
- label = gtk_label_new ("");
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 1, 3, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0);
- gtk_widget_set_size_request (label, 175, -1);
- gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 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);
- str = g_markup_printf_escaped ("<b>%s</b>\n%s",
- mc_account_get_display_name (account),
- message);
- gtk_label_set_markup (GTK_LABEL (label), str);
- g_free (str);
-
- g_object_set_data (G_OBJECT (child), "label", label);
- g_object_set_data_full (G_OBJECT (button_edit),
+ 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);
+
+ 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_table = gtk_table_new (1, 3, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (action_table), 2);
+ gtk_widget_show (action_table);
+
+ action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar));
+ gtk_box_pack_start (GTK_BOX (action_area), action_table, FALSE, FALSE, 0);
+
+ gtk_table_attach (GTK_TABLE (action_table), retry_button, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_SHRINK),
+ (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ gtk_table_attach (GTK_TABLE (action_table), edit_button, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_SHRINK),
+ (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ gtk_table_attach (GTK_TABLE (action_table), close_button, 2, 3, 0, 1,
+ (GtkAttachOptions) (GTK_SHRINK),
+ (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+
+ 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 (button_close),
+ g_object_set_data_full (G_OBJECT (retry_button),
"account", g_object_ref (account),
g_object_unref);
- g_signal_connect (button_edit, "clicked",
+ g_signal_connect (edit_button, "clicked",
G_CALLBACK (main_window_error_edit_clicked_cb),
window);
-
- g_signal_connect (button_close, "clicked",
- G_CALLBACK (main_window_error_clear_clicked_cb),
+ g_signal_connect (close_button, "clicked",
+ G_CALLBACK (main_window_error_close_clicked_cb),
+ window);
+ g_signal_connect (retry_button, "clicked",
+ G_CALLBACK (main_window_error_retry_clicked_cb),
window);
gtk_widget_show (window->errors_vbox);
- g_hash_table_insert (window->errors, g_object_ref (account), child);
+ g_hash_table_insert (window->errors, g_object_ref (account), info_bar);
}
static void
-main_window_update_status (EmpathyMainWindow *window, EmpathyAccountManager *manager)
+main_window_update_status (EmpathyMainWindow *window)
{
- int connected;
- int connecting;
+ gboolean connected, connecting;
GList *l;
- /* Count number of connected/connecting/disconnected accounts */
- connected = empathy_account_manager_get_connected_accounts (manager);
- connecting = empathy_account_manager_get_connecting_accounts (manager);
+ connected = empathy_account_manager_get_accounts_connected (&connecting);
/* Update the spinner state */
- if (connecting > 0) {
+ if (connecting) {
ephy_spinner_start (EPHY_SPINNER (window->throbber));
} else {
ephy_spinner_stop (EPHY_SPINNER (window->throbber));
/* Update widgets sensibility */
for (l = window->actions_connected; l; l = l->next) {
- gtk_action_set_sensitive (l->data, (connected > 0));
+ gtk_action_set_sensitive (l->data, connected);
}
}
static void
-main_window_connection_changed_cb (EmpathyAccountManager *manager,
- McAccount *account,
- TpConnectionStatusReason reason,
- TpConnectionStatus current,
- TpConnectionStatus previous,
+main_window_connection_changed_cb (TpAccount *account,
+ guint old_status,
+ guint current,
+ guint reason,
+ gchar *dbus_error_name,
+ GHashTable *details,
EmpathyMainWindow *window)
{
- main_window_update_status (window, manager);
+ main_window_update_status (window);
if (current == TP_CONNECTION_STATUS_DISCONNECTED &&
reason != TP_CONNECTION_STATUS_REASON_REQUESTED) {
const gchar *message;
- switch (reason) {
- case TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED:
- message = _("No error specified");
- break;
- case TP_CONNECTION_STATUS_REASON_NETWORK_ERROR:
- message = _("Network error");
- break;
- case TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED:
- message = _("Authentication failed");
- break;
- case TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR:
- message = _("Encryption error");
- break;
- case TP_CONNECTION_STATUS_REASON_NAME_IN_USE:
- message = _("Name in use");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED:
- message = _("Certificate not provided");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED:
- message = _("Certificate untrusted");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_EXPIRED:
- message = _("Certificate expired");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED:
- message = _("Certificate not activated");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH:
- message = _("Certificate hostname mismatch");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH:
- message = _("Certificate fingerprint mismatch");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED:
- message = _("Certificate self-signed");
- break;
- case TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR:
- message = _("Certificate error");
- break;
- default:
- message = _("Unknown error");
- break;
- }
+ message = empathy_status_reason_get_default_message (reason);
main_window_error_display (window, account, message);
}
}
if (current == TP_CONNECTION_STATUS_CONNECTED) {
- GtkWidget *error_widget;
-
empathy_sound_play (GTK_WIDGET (window->window),
EMPATHY_SOUND_ACCOUNT_CONNECTED);
/* Account connected without error, remove error message if any */
- error_widget = g_hash_table_lookup (window->errors, account);
- if (error_widget) {
- gtk_widget_destroy (error_widget);
- g_hash_table_remove (window->errors, account);
- }
+ main_window_remove_error (window, account);
}
}
static void
main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor,
EmpathyContact *contact,
- McPresence current,
- McPresence previous,
+ TpConnectionPresenceType current,
+ TpConnectionPresenceType previous,
EmpathyMainWindow *window)
{
- McAccount *account;
- gboolean should_play;
-
- account = empathy_contact_get_account (contact);
- should_play = !empathy_account_manager_is_account_just_connected (window->account_manager, account);
-
- if (!should_play) {
- return;
- }
-
- if (previous < MC_PRESENCE_AVAILABLE && current > MC_PRESENCE_OFFLINE) {
- /* someone is logging in */
- empathy_sound_play (GTK_WIDGET (window->window),
- EMPATHY_SOUND_CONTACT_CONNECTED);
- return;
- }
-
- if (previous > MC_PRESENCE_OFFLINE && current < MC_PRESENCE_AVAILABLE) {
- /* someone is logging off */
- empathy_sound_play (GTK_WIDGET (window->window),
- EMPATHY_SOUND_CONTACT_DISCONNECTED);
- }
+ TpAccount *account;
+ gboolean should_play = FALSE;
+ EmpathyIdle *idle;
+
+ account = empathy_contact_get_account (contact);
+ idle = empathy_idle_dup_singleton ();
+
+ should_play = !empathy_idle_account_is_just_connected (idle, account);
+
+ if (!should_play)
+ goto out;
+
+ if (tp_connection_presence_type_cmp_availability (previous,
+ TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
+ {
+ /* contact was online */
+ if (tp_connection_presence_type_cmp_availability (current,
+ TP_CONNECTION_PRESENCE_TYPE_OFFLINE) <= 0)
+ /* someone is logging off */
+ empathy_sound_play (GTK_WIDGET (window->window),
+ EMPATHY_SOUND_CONTACT_DISCONNECTED);
+ }
+ else
+ {
+ /* contact was offline */
+ if (tp_connection_presence_type_cmp_availability (current,
+ TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
+ /* someone is logging in */
+ empathy_sound_play (GTK_WIDGET (window->window),
+ EMPATHY_SOUND_CONTACT_CONNECTED);
+ }
+
+out:
+ g_object_unref (idle);
}
static void
{
gchar *filename;
- filename = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, ACCELS_FILENAME, NULL);
+ filename = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, ACCELS_FILENAME, NULL);
if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
DEBUG ("Loading from:'%s'", filename);
gtk_accel_map_load (filename);
gchar *dir;
gchar *file_with_path;
- dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+ dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
file_with_path = g_build_filename (dir, ACCELS_FILENAME, NULL);
g_free (dir);
main_window_destroy_cb (GtkWidget *widget,
EmpathyMainWindow *window)
{
+ GHashTableIter iter;
+ gpointer key, value;
+
/* Save user-defined accelerators. */
main_window_accels_save ();
- g_signal_handlers_disconnect_by_func (window->account_manager,
- main_window_connection_changed_cb,
- window);
-
- if (window->size_timeout_id) {
- g_source_remove (window->size_timeout_id);
- }
-
g_list_free (window->actions_connected);
- g_object_unref (window->mc);
g_object_unref (window->account_manager);
g_object_unref (window->list_store);
g_hash_table_destroy (window->errors);
+ /* disconnect all handlers of status-changed signal */
+ g_hash_table_iter_init (&iter, window->status_changed_handlers);
+ while (g_hash_table_iter_next (&iter, &key, &value))
+ g_signal_handler_disconnect (TP_ACCOUNT (key),
+ GPOINTER_TO_UINT (value));
+
+ g_hash_table_destroy (window->status_changed_handlers);
+
g_signal_handlers_disconnect_by_func (window->event_manager,
main_window_event_added_cb,
window);
window);
g_object_unref (window->event_manager);
g_object_unref (window->ui_manager);
+ g_object_unref (window->chatroom_manager);
g_free (window);
}
empathy_new_message_dialog_show (GTK_WINDOW (window->window));
}
+static void
+main_window_chat_new_call_cb (GtkAction *action,
+ EmpathyMainWindow *window)
+{
+ empathy_new_call_dialog_show (GTK_WINDOW (window->window));
+}
+
static void
main_window_chat_add_contact_cb (GtkAction *action,
EmpathyMainWindow *window)
main_window_view_show_ft_manager (GtkAction *action,
EmpathyMainWindow *window)
{
- EmpathyFTManager *manager;
- GtkWidget *dialog;
-
- manager = empathy_ft_manager_dup_singleton ();
- dialog = empathy_ft_manager_get_dialog (manager);
-
- gtk_window_present (GTK_WINDOW (dialog));
- g_object_unref (manager);
+ empathy_ft_manager_show ();
}
static void
//empathy_sound_set_enabled (TRUE);
}
-#if HAVE_LIBCHAMPLAIN
+static void
+main_window_notify_sort_contact_cb (EmpathyConf *conf,
+ const gchar *key,
+ EmpathyMainWindow *window)
+{
+ gchar *str = NULL;
+
+ if (empathy_conf_get_string (conf, key, &str) && str) {
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ type = empathy_contact_list_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 main_window_view_sort_contacts_cb
+ which updates the contacts list */
+ gtk_radio_action_set_current_value (window->sort_by_name,
+ enum_value->value);
+ } else {
+ g_warning ("Wrong value for sort_criterium configuration : %s", str);
+ }
+ g_free (str);
+ }
+}
+
+static void
+main_window_view_sort_contacts_cb (GtkRadioAction *action,
+ GtkRadioAction *current,
+ EmpathyMainWindow *window)
+{
+ EmpathyContactListStoreSort 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_contact_list_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 {
+ empathy_conf_set_string (empathy_conf_get (),
+ EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
+ enum_value->value_nick);
+ }
+ empathy_contact_list_store_set_sort_criterium (window->list_store, value);
+}
+
+static void
+main_window_view_show_protocols_cb (GtkToggleAction *action,
+ EmpathyMainWindow *window)
+{
+ gboolean value;
+
+ value = gtk_toggle_action_get_active (action);
+
+ empathy_conf_set_bool (empathy_conf_get (),
+ EMPATHY_PREFS_UI_SHOW_PROTOCOLS,
+ value == TRUE);
+ empathy_contact_list_store_set_show_protocols (window->list_store,
+ value == TRUE);
+}
+
+/* Matches GtkRadioAction values set in empathy-main-window.ui */
+#define CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS 0
+#define CONTACT_LIST_NORMAL_SIZE 1
+#define CONTACT_LIST_COMPACT_SIZE 2
+
+static void
+main_window_view_contacts_list_size_cb (GtkRadioAction *action,
+ GtkRadioAction *current,
+ EmpathyMainWindow *window)
+{
+ gint value;
+
+ value = gtk_radio_action_get_current_value (action);
+
+ empathy_conf_set_bool (empathy_conf_get (),
+ EMPATHY_PREFS_UI_SHOW_AVATARS,
+ value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
+ empathy_conf_set_bool (empathy_conf_get (),
+ EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
+ value == CONTACT_LIST_COMPACT_SIZE);
+
+ empathy_contact_list_store_set_show_avatars (window->list_store,
+ value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
+ empathy_contact_list_store_set_is_compact (window->list_store,
+ value == CONTACT_LIST_COMPACT_SIZE);
+}
+
+static void main_window_notify_show_protocols_cb (EmpathyConf *conf,
+ const gchar *key,
+ EmpathyMainWindow *window)
+{
+ gboolean show_protocols;
+
+ if (empathy_conf_get_bool (conf,
+ EMPATHY_PREFS_UI_SHOW_PROTOCOLS,
+ &show_protocols)) {
+ gtk_toggle_action_set_active (window->show_protocols,
+ show_protocols);
+ }
+}
+
+
+static void
+main_window_notify_contact_list_size_cb (EmpathyConf *conf,
+ const gchar *key,
+ EmpathyMainWindow *window)
+{
+ gboolean show_avatars;
+ gboolean compact_contact_list;
+ gint value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS;
+
+ if (empathy_conf_get_bool (conf,
+ EMPATHY_PREFS_UI_SHOW_AVATARS,
+ &show_avatars)
+ && empathy_conf_get_bool (conf,
+ EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
+ &compact_contact_list)) {
+ if (compact_contact_list) {
+ value = CONTACT_LIST_COMPACT_SIZE;
+ } else if (show_avatars) {
+ value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS;
+ } else {
+ value = CONTACT_LIST_NORMAL_SIZE;
+ }
+ }
+ /* By changing the value of the GtkRadioAction,
+ it emits a signal that calls main_window_view_contacts_list_size_cb
+ which updates the contacts list */
+ gtk_radio_action_set_current_value (window->normal_with_avatars, value);
+}
+
static void
main_window_view_show_map_cb (GtkCheckMenuItem *item,
EmpathyMainWindow *window)
{
+#if HAVE_LIBCHAMPLAIN
empathy_map_view_show ();
-}
#endif
+}
static void
main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
{
- EmpathyAccountManager *manager;
- McAccount *account;
+ TpAccount *account;
TpConnection *connection;
const gchar *room;
- manager = empathy_account_manager_dup_singleton ();
account = empathy_chatroom_get_account (chatroom);
- connection = empathy_account_manager_get_connection (manager, account);
+ connection = tp_account_get_connection (account);
room = empathy_chatroom_get_room (chatroom);
- g_object_unref (manager);
if (connection != NULL) {
DEBUG ("Requesting channel for '%s'", room);
main_window_edit_accounts_cb (GtkAction *action,
EmpathyMainWindow *window)
{
- empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL);
+ empathy_accounts_dialog_show_application (gdk_screen_get_default (),
+ NULL, FALSE, FALSE);
}
static void
empathy_about_dialog_new (GTK_WINDOW (window->window));
}
+static void
+main_window_help_debug_cb (GtkAction *action,
+ EmpathyMainWindow *window)
+{
+ GdkScreen *screen = gdk_screen_get_default ();
+ GError *error = NULL;
+ gchar *argv[2] = { NULL, };
+ gint i = 0;
+ gchar *path;
+
+ g_return_if_fail (GDK_IS_SCREEN (screen));
+
+ /* Try to run from source directory if possible */
+ path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
+ "empathy-debugger", NULL);
+
+ if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+ g_free (path);
+ path = g_build_filename (BIN_DIR, "empathy-debugger", NULL);
+ }
+
+ argv[i++] = path;
+
+ gdk_spawn_on_screen (screen, NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, &error);
+
+ if (error) {
+ g_warning ("Failed to open debug window: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_free (path);
+}
+
static void
main_window_help_contents_cb (GtkAction *action,
EmpathyMainWindow *window)
return FALSE;
}
- empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL);
+ empathy_accounts_dialog_show_application (
+ gtk_widget_get_screen (GTK_WIDGET (throbber_ebox)),
+ NULL, FALSE, FALSE);
return FALSE;
}
-static gboolean
-main_window_configure_event_timeout_cb (EmpathyMainWindow *window)
+static void
+main_window_account_removed_cb (TpAccountManager *manager,
+ TpAccount *account,
+ EmpathyMainWindow *window)
{
- gint x, y, w, h;
+ GList *a;
- gtk_window_get_size (GTK_WINDOW (window->window), &w, &h);
- gtk_window_get_position (GTK_WINDOW (window->window), &x, &y);
+ a = tp_account_manager_get_valid_accounts (manager);
- empathy_geometry_save (GEOMETRY_NAME, x, y, w, h);
+ gtk_action_set_sensitive (window->view_history,
+ g_list_length (a) > 0);
- window->size_timeout_id = 0;
+ g_list_free (a);
- return FALSE;
+ /* remove errors if any */
+ main_window_remove_error (window, account);
}
-static gboolean
-main_window_configure_event_cb (GtkWidget *widget,
- GdkEventConfigure *event,
- EmpathyMainWindow *window)
+static void
+main_window_account_validity_changed_cb (TpAccountManager *manager,
+ TpAccount *account,
+ gboolean valid,
+ EmpathyMainWindow *window)
{
- if (window->size_timeout_id) {
- g_source_remove (window->size_timeout_id);
+ if (valid) {
+ gulong handler_id;
+ handler_id = GPOINTER_TO_UINT (g_hash_table_lookup (
+ window->status_changed_handlers, account));
+
+ /* connect signal only if it was not connected yet */
+ if (handler_id == 0) {
+ handler_id = g_signal_connect (account,
+ "status-changed",
+ G_CALLBACK (main_window_connection_changed_cb),
+ window);
+ g_hash_table_insert (window->status_changed_handlers,
+ account, GUINT_TO_POINTER (handler_id));
+ }
}
- window->size_timeout_id = g_timeout_add_seconds (1,
- (GSourceFunc) main_window_configure_event_timeout_cb,
- window);
-
- return FALSE;
-}
-
-static void
-main_window_account_created_or_deleted_cb (EmpathyAccountManager *manager,
- McAccount *account,
- EmpathyMainWindow *window)
-{
- gtk_action_set_sensitive (window->view_history,
- empathy_account_manager_get_count (manager) > 0);
+ main_window_account_removed_cb (manager, account, window);
}
static void
}
}
-static void
-main_window_notify_show_avatars_cb (EmpathyConf *conf,
- const gchar *key,
- EmpathyMainWindow *window)
-{
- gboolean show_avatars;
-
- if (empathy_conf_get_bool (conf, key, &show_avatars)) {
- empathy_contact_list_store_set_show_avatars (window->list_store,
- show_avatars);
- }
-}
-
-static void
-main_window_notify_compact_contact_list_cb (EmpathyConf *conf,
- const gchar *key,
- EmpathyMainWindow *window)
-{
- gboolean compact_contact_list;
-
- if (empathy_conf_get_bool (conf, key, &compact_contact_list)) {
- empathy_contact_list_store_set_is_compact (window->list_store,
- compact_contact_list);
- }
-}
-
-static void
-main_window_notify_sort_criterium_cb (EmpathyConf *conf,
- const gchar *key,
- EmpathyMainWindow *window)
-{
- gchar *str = NULL;
-
- if (empathy_conf_get_string (conf, key, &str) && str) {
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- type = empathy_contact_list_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);
- g_free (str);
-
- if (enum_value) {
- empathy_contact_list_store_set_sort_criterium (window->list_store,
- enum_value->value);
- }
- }
-}
-
static void
main_window_connection_items_setup (EmpathyMainWindow *window,
GtkBuilder *gui)
{
GList *list;
GObject *action;
- gint i;
+ guint i;
const gchar *actions_connected[] = {
"room",
"chat_new_message",
+ "chat_new_call",
"chat_add_contact",
"edit_personal_information"
};
GtkWidget *
empathy_main_window_get (void)
{
- return window != NULL ? window->window : NULL;
+ return main_window != NULL ? main_window->window : NULL;
+}
+
+static void
+account_manager_prepared_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GList *accounts, *j;
+ TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+ EmpathyMainWindow *window = user_data;
+ GError *error = NULL;
+
+ if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+ DEBUG ("Failed to prepare account manager: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ accounts = tp_account_manager_get_valid_accounts (window->account_manager);
+ for (j = accounts; j != NULL; j = j->next) {
+ TpAccount *account = TP_ACCOUNT (j->data);
+ gulong handler_id;
+
+ handler_id = g_signal_connect (account, "status-changed",
+ G_CALLBACK (main_window_connection_changed_cb),
+ window);
+ g_hash_table_insert (window->status_changed_handlers,
+ account, GUINT_TO_POINTER (handler_id));
+ }
+
+ g_signal_connect (manager, "account-validity-changed",
+ G_CALLBACK (main_window_account_validity_changed_cb),
+ window);
+
+ main_window_update_status (window);
+
+ /* Disable the "Previous Conversations" menu entry if there is no account */
+ gtk_action_set_sensitive (window->view_history,
+ g_list_length (accounts) > 0);
+
+ g_list_free (accounts);
+}
+
+static void
+main_window_contact_added_cb (EmpathyContactMonitor *monitor,
+ EmpathyContact *contact,
+ EmpathyMainWindow *window)
+{
+ if (!empathy_migrate_butterfly_logs (contact)) {
+ g_signal_handler_disconnect (monitor,
+ window->butterfly_log_migration_contact_added_id);
+ window->butterfly_log_migration_contact_added_id = 0;
+ }
}
GtkWidget *
empathy_main_window_show (void)
{
+ EmpathyMainWindow *window;
EmpathyContactList *list_iface;
EmpathyContactMonitor *monitor;
GtkBuilder *gui;
GtkAction *show_map_widget;
GtkToolItem *item;
gboolean show_offline;
- gboolean show_avatars;
- gboolean compact_contact_list;
- gint x, y, w, h;
gchar *filename;
GSList *l;
- if (window) {
- empathy_window_present (GTK_WINDOW (window->window), TRUE);
- return window->window;
+ if (main_window) {
+ empathy_window_present (GTK_WINDOW (main_window->window));
+ return main_window->window;
}
- window = g_new0 (EmpathyMainWindow, 1);
+ main_window = g_new0 (EmpathyMainWindow, 1);
+ window = main_window;
/* Set up interface */
filename = empathy_file_lookup ("empathy-main-window.ui", "src");
"errors_vbox", &window->errors_vbox,
"ui_manager", &window->ui_manager,
"view_show_offline", &show_offline_widget,
+ "view_show_protocols", &window->show_protocols,
+ "view_sort_by_name", &window->sort_by_name,
+ "view_sort_by_status", &window->sort_by_status,
+ "view_normal_size_with_avatars", &window->normal_with_avatars,
+ "view_normal_size", &window->normal_size,
+ "view_compact_size", &window->compact_size,
"view_history", &window->view_history,
"view_show_map", &show_map_widget,
"room_join_favorites", &window->room_join_favorites,
empathy_builder_connect (gui, window,
"main_window", "destroy", main_window_destroy_cb,
- "main_window", "configure_event", main_window_configure_event_cb,
"chat_quit", "activate", main_window_chat_quit_cb,
"chat_new_message", "activate", main_window_chat_new_message_cb,
+ "chat_new_call", "activate", main_window_chat_new_call_cb,
"view_history", "activate", main_window_view_history_cb,
"room_join_new", "activate", main_window_room_join_new_cb,
"room_join_favorites", "activate", main_window_room_join_favorites_cb,
"chat_add_contact", "activate", main_window_chat_add_contact_cb,
"view_show_ft_manager", "activate", main_window_view_show_ft_manager,
"view_show_offline", "toggled", main_window_view_show_offline_cb,
-#if HAVE_LIBCHAMPLAIN
+ "view_show_protocols", "toggled", main_window_view_show_protocols_cb,
+ "view_sort_by_name", "changed", main_window_view_sort_contacts_cb,
+ "view_normal_size_with_avatars", "changed", main_window_view_contacts_list_size_cb,
"view_show_map", "activate", main_window_view_show_map_cb,
-#endif
"edit", "activate", main_window_edit_cb,
"edit_accounts", "activate", main_window_edit_accounts_cb,
"edit_personal_information", "activate", main_window_edit_personal_information_cb,
"edit_preferences", "activate", main_window_edit_preferences_cb,
"help_about", "activate", main_window_help_about_cb,
+ "help_debug", "activate", main_window_help_debug_cb,
"help_contents", "activate", main_window_help_contents_cb,
NULL);
gtk_action_set_visible (show_map_widget, FALSE);
#endif
- window->mc = empathy_mission_control_dup_singleton ();
- window->account_manager = empathy_account_manager_dup_singleton ();
+ window->account_manager = tp_account_manager_dup ();
- g_signal_connect (window->account_manager,
- "account-connection-changed",
- G_CALLBACK (main_window_connection_changed_cb), window);
+ tp_account_manager_prepare_async (window->account_manager, NULL,
+ account_manager_prepared_cb, window);
- window->errors = g_hash_table_new_full (empathy_account_hash,
- empathy_account_equal,
+ window->errors = g_hash_table_new_full (g_direct_hash,
+ g_direct_equal,
g_object_unref,
NULL);
+ window->status_changed_handlers = g_hash_table_new_full (g_direct_hash,
+ g_direct_equal,
+ NULL,
+ NULL);
+
/* Set up menu */
main_window_favorite_chatroom_menu_setup (window);
EMPATHY_CONTACT_FEATURE_ALL);
g_signal_connect (monitor, "contact-presence-changed",
G_CALLBACK (main_window_contact_presence_changed_cb), window);
+ window->butterfly_log_migration_contact_added_id = g_signal_connect (monitor, "contact-added",
+ G_CALLBACK (main_window_contact_added_cb), window);
g_object_unref (list_iface);
gtk_widget_show (GTK_WIDGET (window->list_view));
main_window_accels_load ();
/* Set window size. */
- empathy_geometry_load (GEOMETRY_NAME, &x, &y, &w, &h);
-
- if (w >= 1 && h >= 1) {
- /* Use the defaults from the ui file if we
- * don't have good w, h geometry.
- */
- DEBUG ("Configuring window default size w:%d, h:%d", w, h);
- gtk_window_set_default_size (GTK_WINDOW (window->window), w, h);
- }
-
- if (x >= 0 && y >= 0) {
- /* Let the window manager position it if we
- * don't have good x, y coordinates.
- */
- DEBUG ("Configuring window default position x:%d, y:%d", x, y);
- gtk_window_move (GTK_WINDOW (window->window), x, y);
- }
+ empathy_geometry_bind (GTK_WINDOW (window->window), GEOMETRY_NAME);
/* Enable event handling */
window->event_manager = empathy_event_manager_dup_singleton ();
G_CALLBACK (main_window_event_removed_cb),
window);
- g_signal_connect (window->account_manager, "account-created",
- G_CALLBACK (main_window_account_created_or_deleted_cb),
+ g_signal_connect (window->account_manager, "account-validity-changed",
+ G_CALLBACK (main_window_account_validity_changed_cb),
+ window);
+ g_signal_connect (window->account_manager, "account-removed",
+ G_CALLBACK (main_window_account_removed_cb),
window);
- g_signal_connect (window->account_manager, "account-deleted",
- G_CALLBACK (main_window_account_created_or_deleted_cb),
+ g_signal_connect (window->account_manager, "account-disabled",
+ G_CALLBACK (main_window_account_disabled_cb),
window);
- main_window_account_created_or_deleted_cb (window->account_manager, NULL, window);
l = empathy_event_manager_get_events (window->event_manager);
while (l) {
gtk_toggle_action_set_active (show_offline_widget, show_offline);
- /* Show avatars ? */
- empathy_conf_get_bool (conf,
- EMPATHY_PREFS_UI_SHOW_AVATARS,
- &show_avatars);
+ /* Show protocol ? */
empathy_conf_notify_add (conf,
- EMPATHY_PREFS_UI_SHOW_AVATARS,
- (EmpathyConfNotifyFunc) main_window_notify_show_avatars_cb,
- window);
- empathy_contact_list_store_set_show_avatars (window->list_store, show_avatars);
+ EMPATHY_PREFS_UI_SHOW_PROTOCOLS,
+ (EmpathyConfNotifyFunc) main_window_notify_show_protocols_cb,
+ window);
- /* Is compact ? */
- empathy_conf_get_bool (conf,
- EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- &compact_contact_list);
+ main_window_notify_show_protocols_cb (conf,
+ EMPATHY_PREFS_UI_SHOW_PROTOCOLS,
+ window);
+
+ /* Sort by name / by status ? */
empathy_conf_notify_add (conf,
- EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- (EmpathyConfNotifyFunc) main_window_notify_compact_contact_list_cb,
- window);
- empathy_contact_list_store_set_is_compact (window->list_store, compact_contact_list);
+ EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
+ (EmpathyConfNotifyFunc) main_window_notify_sort_contact_cb,
+ window);
+
+ main_window_notify_sort_contact_cb (conf,
+ EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
+ window);
- /* Sort criterium */
+ /* Contacts list size */
empathy_conf_notify_add (conf,
- EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
- (EmpathyConfNotifyFunc) main_window_notify_sort_criterium_cb,
- window);
- main_window_notify_sort_criterium_cb (conf,
- EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
- window);
+ EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
+ (EmpathyConfNotifyFunc) main_window_notify_contact_list_size_cb,
+ window);
+ empathy_conf_notify_add (conf,
+ EMPATHY_PREFS_UI_SHOW_AVATARS,
+ (EmpathyConfNotifyFunc) main_window_notify_contact_list_size_cb,
+ window);
- main_window_update_status (window, window->account_manager);
+ main_window_notify_contact_list_size_cb (conf,
+ EMPATHY_PREFS_UI_SHOW_AVATARS,
+ window);
return window->window;
}
projects / empathy.git / blobdiff