#include <libempathy/empathy-tp-contact-factory.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-live-search.h>
#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
#include <libempathy-gtk/empathy-contact-search-dialog.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>
PAGE_NO_MATCH
};
+enum {
+ PROP_0,
+ PROP_SHELL_RUNNING
+};
+
G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW);
#define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv)
/* 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_members_changed_id;
+ gboolean shell_running;
};
static void
GdkPixbuf *pixbuf = NULL;
gtk_tree_model_get (model, iter,
- EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL,
- &individual,
+ 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) {
- tp_clear_object (&contact);
- return FALSE;
- }
+ if (contact != data->event->contact)
+ goto out;
if (data->on) {
icon_name = data->event->icon_name;
gtk_tree_path_free (parent_path);
}
+out:
g_object_unref (individual);
tp_clear_object (&contact);
tp_clear_object (&pixbuf);
GtkWidget *add_button;
GtkWidget *close_button;
GtkWidget *action_area;
- GtkWidget *action_table;
+ GtkWidget *action_grid;
const gchar *icon_name;
gchar *str;
gtk_widget_set_tooltip_text (close_button, _("Disconnect"));
gtk_widget_show (close_button);
- action_table = gtk_table_new (1, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (action_table), 6);
- gtk_widget_show (action_table);
+ action_grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (action_grid), 6);
+ 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_table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0);
- gtk_table_attach (GTK_TABLE (action_table), add_button, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_SHRINK),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_table_attach (GTK_TABLE (action_table), close_button, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_SHRINK),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ gtk_grid_attach (GTK_GRID (action_grid), add_button, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1);
g_object_set_data_full (G_OBJECT (info_bar),
"event", event, NULL);
g_hash_table_insert (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 (EmpathyMainWindow *self,
+ EmpathyEvent *event)
+{
+ EmpathyMainWindowPriv *priv = GET_PRIV (self);
+ GtkTreeModel *model;
+
+ model = GTK_TREE_MODEL (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 (EmpathyMainWindow *self,
+ EmpathyEvent *event)
+{
+ EmpathyMainWindowPriv *priv = GET_PRIV (self);
+ GtkTreeModel *model;
+
+ model = GTK_TREE_MODEL (priv->individual_store);
+
+ gtk_tree_model_foreach (model, decrease_event_count_foreach, event);
+}
+
static void
main_window_event_added_cb (EmpathyEventManager *manager,
EmpathyEvent *event,
EmpathyMainWindow *window)
{
if (event->contact) {
+ increase_event_count (window, event);
+
main_window_flash_start (window);
} else if (event->type == EMPATHY_EVENT_TYPE_AUTH) {
main_window_auth_display (window, event);
return;
}
+ decrease_event_count (window, event);
+
data.on = FALSE;
data.event = event;
data.window = window;
&data);
}
+static gboolean
+main_window_load_events_idle_cb (gpointer user_data)
+{
+ EmpathyMainWindow *window = user_data;
+ EmpathyMainWindowPriv *priv = GET_PRIV (window);
+ GSList *l;
+
+ l = empathy_event_manager_get_events (priv->event_manager);
+ while (l) {
+ main_window_event_added_cb (priv->event_manager, l->data,
+ window);
+ l = l->next;
+ }
+
+ return FALSE;
+}
+
static void
-main_window_row_activated_cb (EmpathyContactListView *view,
+main_window_row_activated_cb (EmpathyIndividualView *view,
GtkTreePath *path,
GtkTreeViewColumn *col,
EmpathyMainWindow *window)
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
PAGE_CONTACT_LIST);
gtk_widget_grab_focus (GTK_WIDGET (priv->individual_view));
+
+ /* The store is being filled, it will be done after an idle cb.
+ * So we can then get events. If we do that too soon, event's
+ * contact is not yet in the store and it won't get marked as
+ * having events. */
+ g_idle_add (main_window_load_events_idle_cb, window);
}
}
main_window_remove_error (window, account);
}
+static void
+main_window_error_upgrade_sw_clicked_cb (GtkButton *button,
+ EmpathyMainWindow *window)
+{
+ TpAccount *account;
+ GtkWidget *dialog;
+
+ account = g_object_get_data (G_OBJECT (button), "account");
+ main_window_remove_error (window, account);
+
+ dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+ 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);
+
+ gtk_widget_show (dialog);
+}
+
+static void
+main_window_upgrade_software_error (EmpathyMainWindow *window,
+ TpAccount *account)
+{
+ EmpathyMainWindowPriv *priv = GET_PRIV (window);
+ GtkWidget *info_bar;
+ GtkWidget *content_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 */
+ main_window_remove_error (window, account);
+
+ info_bar = gtk_info_bar_new ();
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR);
+
+ gtk_widget_set_no_show_all (info_bar, TRUE);
+ gtk_box_pack_start (GTK_BOX (priv->errors_vbox), info_bar, FALSE, TRUE, 0);
+ gtk_widget_show (info_bar);
+
+ 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);
+
+ 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);
+ g_free (str);
+
+ content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar));
+ gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
+
+ image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
+ upgrade_button = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (upgrade_button), image);
+ gtk_widget_set_tooltip_text (upgrade_button, _("Update software..."));
+ gtk_widget_show (upgrade_button);
+
+ image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
+ close_button = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (close_button), image);
+ gtk_widget_set_tooltip_text (close_button, _("Close"));
+ gtk_widget_show (close_button);
+
+ action_grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2);
+ gtk_widget_show (action_grid);
+
+ action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar));
+ gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0);
+
+ gtk_grid_attach (GTK_GRID (action_grid), upgrade_button, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1);
+
+ 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 (main_window_error_upgrade_sw_clicked_cb),
+ window);
+ g_signal_connect (close_button, "clicked",
+ G_CALLBACK (main_window_error_close_clicked_cb),
+ window);
+
+ gtk_widget_set_tooltip_text (priv->errors_vbox, error_message);
+ gtk_widget_show (priv->errors_vbox);
+
+ g_hash_table_insert (priv->errors, g_object_ref (account), info_bar);
+}
+
static void
main_window_error_display (EmpathyMainWindow *window,
TpAccount *account)
GtkWidget *edit_button;
GtkWidget *close_button;
GtkWidget *action_area;
- GtkWidget *action_table;
+ 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))) {
+ main_window_upgrade_software_error (window, account);
+ return;
+ }
+
error_message =
empathy_account_get_error_message (account, &user_requested);
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_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_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);
+ gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0);
+
+ 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);
g_object_set_data (G_OBJECT (info_bar), "label", label);
g_object_set_data_full (G_OBJECT (info_bar),
static void
main_window_balance_update_balance (GtkAction *action,
- GValueArray *balance)
+ TpConnection *conn)
{
- TpAccount *account = g_object_get_data (G_OBJECT (action), "account");
+ TpAccount *account = tp_connection_get_account (conn);
GtkWidget *label;
int amount = 0;
guint scale = G_MAXINT32;
- const char *currency = "";
+ const gchar *currency = "";
char *money, *str;
- if (balance != NULL)
- tp_value_array_unpack (balance, 3,
- &amount,
- &scale,
- ¤cy);
+ if (!tp_connection_get_balance (conn, &amount, &scale, ¤cy))
+ return;
if (amount == 0 &&
scale == G_MAXINT32 &&
g_free (money);
}
-static void
-main_window_setup_balance_got_balance_props (TpProxy *conn,
- GHashTable *props,
- const GError *in_error,
- gpointer user_data,
- GObject *action)
-{
- GValueArray *balance = NULL;
- const char *uri;
-
- if (in_error != NULL) {
- DEBUG ("Failed to get account balance properties: %s",
- in_error->message);
- goto finally;
- }
-
- balance = tp_asv_get_boxed (props, "AccountBalance",
- TP_STRUCT_TYPE_CURRENCY_AMOUNT);
- uri = tp_asv_get_string (props, "ManageCreditURI");
-
- g_object_set_data_full (action, "manage-credit-uri",
- g_strdup (uri), g_free);
- gtk_action_set_sensitive (GTK_ACTION (action), !tp_str_empty (uri));
-
-finally:
- main_window_balance_update_balance (GTK_ACTION (action), balance);
-}
-
static void
main_window_balance_changed_cb (TpConnection *conn,
- const GValueArray *balance,
- gpointer user_data,
- GObject *action)
+ guint balance,
+ guint scale,
+ const gchar *currency,
+ GtkAction *action)
{
- main_window_balance_update_balance (GTK_ACTION (action),
- (GValueArray *) balance);
+ main_window_balance_update_balance (action, conn);
}
static GtkAction *
g_object_bind_property (account, "icon-name", action, "icon-name",
G_BINDING_SYNC_CREATE);
- g_object_set_data (G_OBJECT (action), "account", account);
g_signal_connect (action, "activate",
G_CALLBACK (main_window_balance_activate_cb), window);
static GtkWidget *
main_window_setup_balance_create_widget (EmpathyMainWindow *window,
- GtkAction *action)
+ GtkAction *action,
+ TpAccount *account)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
- TpAccount *account;
GtkWidget *hbox, *image, *label, *button;
- account = g_object_get_data (G_OBJECT (action), "account");
- g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
/* protocol icon */
image = gtk_image_new ();
}
static void
-main_window_setup_balance_conn_ready (GObject *conn,
- GAsyncResult *result,
- gpointer user_data)
+main_window_setup_balance (EmpathyMainWindow *window,
+ TpAccount *account)
{
- EmpathyMainWindow *window = user_data;
EmpathyMainWindowPriv *priv = GET_PRIV (window);
- TpAccount *account = g_object_get_data (conn, "account");
+ TpConnection *conn = tp_account_get_connection (account);
GtkAction *action;
- GError *error = NULL;
-
- if (!tp_proxy_prepare_finish (conn, result, &error)) {
- DEBUG ("Failed to prepare connection: %s", error->message);
+ const gchar *uri;
- g_error_free (error);
+ if (conn == NULL)
return;
- }
- if (!tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE)) {
+ if (!tp_proxy_is_prepared (conn, TP_CONNECTION_FEATURE_BALANCE))
return;
- }
DEBUG ("Setting up balance for acct: %s",
tp_account_get_display_name (account));
gtk_action_set_visible (priv->view_balance_show_in_roster, TRUE);
/* create the display widget */
- main_window_setup_balance_create_widget (window, action);
+ main_window_setup_balance_create_widget (window, action, account);
- /* request the current balance and monitor for any changes */
- tp_cli_dbus_properties_call_get_all (conn, -1,
- TP_IFACE_CONNECTION_INTERFACE_BALANCE,
- main_window_setup_balance_got_balance_props,
- window, NULL, G_OBJECT (action));
+ /* check the current balance and monitor for any changes */
+ uri = tp_connection_get_balance_uri (conn);
- tp_cli_connection_interface_balance_connect_to_balance_changed (
- TP_CONNECTION (conn), main_window_balance_changed_cb,
- window, NULL, G_OBJECT (action), NULL);
-}
+ 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));
-static void
-main_window_setup_balance (EmpathyMainWindow *window,
- TpAccount *account)
-{
- TpConnection *conn = tp_account_get_connection (account);
+ main_window_balance_update_balance (GTK_ACTION (action), conn);
- if (conn == NULL)
- return;
+ g_signal_connect (conn, "balance-changed",
+ G_CALLBACK (main_window_balance_changed_cb), action);
- /* need to prepare the connection:
- * store the account on the connection */
- g_object_set_data (G_OBJECT (conn), "account", account);
- tp_proxy_prepare_async (conn, NULL,
- main_window_setup_balance_conn_ready, window);
}
static void
GHashTable *details,
EmpathyMainWindow *window)
{
+ EmpathyMainWindowPriv *priv = GET_PRIV (window);
+
main_window_update_status (window);
if (current == TP_CONNECTION_STATUS_DISCONNECTED &&
g_object_unref (priv->individual_store);
g_object_unref (priv->contact_manager);
g_object_unref (priv->sound_mgr);
- g_hash_table_destroy (priv->errors);
- g_hash_table_destroy (priv->auths);
+ g_hash_table_unref (priv->errors);
+ g_hash_table_unref (priv->auths);
/* disconnect all handlers of status-changed signal */
g_hash_table_iter_init (&iter, priv->status_changed_handlers);
g_signal_handler_disconnect (TP_ACCOUNT (key),
GPOINTER_TO_UINT (value));
- g_hash_table_destroy (priv->status_changed_handlers);
+ g_hash_table_unref (priv->status_changed_handlers);
g_signal_handlers_disconnect_by_func (priv->event_manager,
main_window_event_added_cb,
main_window_chat_quit_cb (GtkAction *action,
EmpathyMainWindow *window)
{
- gtk_main_quit ();
+ gtk_widget_destroy (GTK_WIDGET (window));
}
static void
EmpathyMainWindow *window)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
- EmpathyContactListStoreSort value;
+ EmpathyIndividualStoreSort value;
GSList *group;
GType type;
GEnumClass *enum_class;
G_CALLBACK (gtk_widget_destroy), NULL);
}
-static void
-main_window_edit_preferences_cb (GtkAction *action,
- EmpathyMainWindow *window)
+void
+empathy_main_window_show_preferences (EmpathyMainWindow *window,
+ const gchar *tab)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
if (priv->preferences == NULL) {
- priv->preferences = empathy_preferences_new (GTK_WINDOW (window));
+ priv->preferences = empathy_preferences_new (GTK_WINDOW (window),
+ priv->shell_running);
g_object_add_weak_pointer (G_OBJECT (priv->preferences),
(gpointer) &priv->preferences);
} else {
gtk_window_present (GTK_WINDOW (priv->preferences));
}
+
+ if (tab != NULL)
+ empathy_preferences_show_tab (
+ EMPATHY_PREFERENCES (priv->preferences), tab);
+}
+
+static void
+main_window_edit_preferences_cb (GtkAction *action,
+ EmpathyMainWindow *window)
+{
+ empathy_main_window_show_preferences (window, NULL);
}
static void
main_window_help_debug_cb (GtkAction *action,
EmpathyMainWindow *window)
{
- GdkDisplay *display;
- GError *error = NULL;
- gchar *path;
- GAppInfo *app_info;
- GdkAppLaunchContext *context = NULL;
-
- /* 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);
- }
-
- app_info = g_app_info_create_from_commandline (path, NULL, 0, &error);
- if (app_info == NULL) {
- DEBUG ("Failed to create app info: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
- display = gdk_display_get_default ();
- context = gdk_display_get_app_launch_context (display);
-
- if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
- &error)) {
- g_warning ("Failed to open debug window: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
-out:
- tp_clear_object (&app_info);
- tp_clear_object (&context);
- g_free (path);
+ empathy_launch_program (BIN_DIR, "empathy-debugger", NULL);
}
static void
"room_join_favorites",
"chat_new_message",
"chat_new_call",
+ "chat_search_contacts",
"chat_add_contact",
"edit_personal_information",
- "edit_blocked_contacts"
+ "edit_blocked_contacts",
+ "edit_search_contacts"
};
for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) {
EmpathyMainWindowPriv *priv = GET_PRIV (window);
GError *error = NULL;
- if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+ if (!tp_proxy_prepare_finish (manager, result, &error)) {
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
return;
g_list_free (accounts);
}
-static void
-main_window_members_changed_cb (EmpathyContactList *list,
- EmpathyContact *contact,
- EmpathyContact *actor,
- guint reason,
- gchar *message,
- gboolean is_member,
- EmpathyMainWindow *window)
+void
+empathy_main_window_set_shell_running (EmpathyMainWindow *window,
+ gboolean shell_running)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
- if (!is_member)
+ if (priv->shell_running == shell_running)
return;
- if (!empathy_migrate_butterfly_logs (contact)) {
- g_signal_handler_disconnect (list,
- priv->butterfly_log_migration_members_changed_id);
- priv->butterfly_log_migration_members_changed_id = 0;
- }
+ priv->shell_running = shell_running;
+ g_object_notify (G_OBJECT (window), "shell-running");
}
static GObject *
return window;
}
+static void
+empathy_main_window_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyMainWindow *self = EMPATHY_MAIN_WINDOW (object);
+ EmpathyMainWindowPriv *priv = GET_PRIV (self);
+
+ switch (property_id)
+ {
+ case PROP_SHELL_RUNNING:
+ priv->shell_running = g_value_get_boolean (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_main_window_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyMainWindow *self = EMPATHY_MAIN_WINDOW (object);
+ EmpathyMainWindowPriv *priv = GET_PRIV (self);
+
+ switch (property_id)
+ {
+ case PROP_SHELL_RUNNING:
+ g_value_set_boolean (value, priv->shell_running);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
static void
empathy_main_window_class_init (EmpathyMainWindowClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GParamSpec *pspec;
object_class->finalize = empathy_main_window_finalize;
object_class->constructor = empathy_main_window_constructor;
+ object_class->set_property = empathy_main_window_set_property;
+ object_class->get_property = empathy_main_window_get_property;
+
+ pspec = g_param_spec_boolean ("shell-running",
+ "Shell running",
+ "Whether the Shell is running or not",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class, PROP_SHELL_RUNNING, pspec);
+
g_type_class_add_private (object_class, sizeof (EmpathyMainWindowPriv));
}
{
EmpathyMainWindowPriv *priv;
EmpathyIndividualManager *individual_manager;
- GtkBuilder *gui;
+ GtkBuilder *gui, *gui_mgr;
GtkWidget *sw;
GtkToggleAction *show_offline_widget;
GtkAction *show_map_widget;
GtkToolItem *item;
gboolean show_offline;
gchar *filename;
- GSList *l;
GtkTreeModel *model;
+ GtkWidget *search_vbox;
+ GtkWidget *menubar;
priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowPriv);
gtk_window_set_role (GTK_WINDOW (window), "contact_list");
gtk_window_set_default_size (GTK_WINDOW (window), 225, 325);
+ /* don't finalize the widget on delete-event, just hide it */
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
/* Set up interface */
filename = empathy_file_lookup ("empathy-main-window.ui", "src");
gui = empathy_builder_get_file (filename,
"balance_vbox", &priv->balance_vbox,
"errors_vbox", &priv->errors_vbox,
"auth_vbox", &priv->auth_vbox,
+ "search_vbox", &search_vbox,
+ "presence_toolbar", &priv->presence_toolbar,
+ "notebook", &priv->notebook,
+ "no_entry_label", &priv->no_entry_label,
+ "roster_scrolledwindow", &sw,
+ NULL);
+ g_free (filename);
+
+ /* Set UI manager */
+ filename = empathy_file_lookup ("empathy-main-window-menubar.ui", "src");
+ gui_mgr = empathy_builder_get_file (filename,
"ui_manager", &priv->ui_manager,
"view_show_offline", &show_offline_widget,
"view_show_protocols", &priv->show_protocols,
"view_history", &priv->view_history,
"view_show_map", &show_map_widget,
"room_join_favorites", &priv->room_join_favorites,
- "presence_toolbar", &priv->presence_toolbar,
- "notebook", &priv->notebook,
- "no_entry_label", &priv->no_entry_label,
- "roster_scrolledwindow", &sw,
"view_balance_show_in_roster", &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 (priv->main_vbox), menubar, FALSE, FALSE, 0);
+ gtk_box_reorder_child (GTK_BOX (priv->main_vbox), menubar, 0);
+
gtk_container_add (GTK_CONTAINER (window), priv->main_vbox);
gtk_widget_show (priv->main_vbox);
g_signal_connect (window, "key-press-event",
G_CALLBACK (main_window_key_press_event_cb), NULL);
- empathy_builder_connect (gui, window,
+ empathy_builder_connect (gui_mgr, window,
"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,
NULL);
/* Set up connection related widgets. */
- main_window_connection_items_setup (window, gui);
+ main_window_connection_items_setup (window, gui_mgr);
g_object_ref (priv->ui_manager);
g_object_unref (gui);
+ g_object_unref (gui_mgr);
#ifndef HAVE_LIBCHAMPLAIN
gtk_action_set_visible (show_map_widget, FALSE);
priv->account_manager = tp_account_manager_dup ();
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
account_manager_prepared_cb, window);
priv->errors = g_hash_table_new_full (g_direct_hash,
/* Set up the throbber */
priv->throbber = gtk_spinner_new ();
gtk_widget_set_size_request (priv->throbber, 16, -1);
- gtk_widget_set_tooltip_text (priv->throbber, _("Show and edit accounts"));
gtk_widget_set_events (priv->throbber, GDK_BUTTON_PRESS_MASK);
g_signal_connect (priv->throbber, "button-press-event",
G_CALLBACK (main_window_throbber_button_press_event_cb),
EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP,
EMPATHY_INDIVIDUAL_FEATURE_ALL);
- priv->butterfly_log_migration_members_changed_id = g_signal_connect (
- priv->contact_manager, "members-changed",
- G_CALLBACK (main_window_members_changed_cb), window);
-
gtk_widget_show (GTK_WIDGET (priv->individual_view));
gtk_container_add (GTK_CONTAINER (sw),
GTK_WIDGET (priv->individual_view));
GTK_WIDGET (priv->individual_view));
empathy_individual_view_set_live_search (priv->individual_view,
EMPATHY_LIVE_SEARCH (priv->search_bar));
- gtk_box_pack_start (GTK_BOX (priv->main_vbox), priv->search_bar,
+ gtk_box_pack_start (GTK_BOX (search_vbox), priv->search_bar,
FALSE, TRUE, 0);
+
g_signal_connect_swapped (window, "map",
G_CALLBACK (gtk_widget_grab_focus), priv->individual_view);
G_CALLBACK (main_window_account_disabled_cb),
window);
- l = empathy_event_manager_get_events (priv->event_manager);
- while (l) {
- main_window_event_added_cb (priv->event_manager, l->data,
- window);
- l = l->next;
- }
-
/* Show offline ? */
show_offline = g_settings_get_boolean (priv->gsettings_ui,
EMPATHY_PREFS_UI_SHOW_OFFLINE);
projects / empathy.git / blobdiff