* Xavier Claessens <xclaesse@gmail.com>
* Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
* Jonathan Tellier <jonathan.tellier@gmail.com>
+ * Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
#include <config.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <dbus/dbus-glib.h>
+#include <gio/gdesktopappinfo.h>
#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/defs.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
#include <libempathy/empathy-connectivity.h>
-#include <libempathy/empathy-gsettings.h>
+#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-protocol-chooser.h>
#include <libempathy-gtk/empathy-account-widget-irc.h>
#include <libempathy-gtk/empathy-account-widget-sip.h>
#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
+#include <libempathy-gtk/empathy-contact-widget.h>
#include <libempathy-gtk/empathy-images.h>
+#include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h>
+#include <libempathy-gtk/empathy-new-account-dialog.h>
+#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
#include "empathy-import-dialog.h"
#include "empathy-import-utils.h"
enum
{
NOTEBOOK_PAGE_ACCOUNT = 0,
- NOTEBOOK_PAGE_LOADING
+ NOTEBOOK_PAGE_LOADING,
+ NOTEBOOK_PAGE_NO_PROTOCOL
};
typedef struct {
GtkWidget *label_status;
GtkWidget *image_status;
GtkWidget *throbber;
- GtkWidget *frame_no_protocol;
+ GtkWidget *enabled_switch;
GtkWidget *treeview;
GtkWidget *button_remove;
GtkWidget *button_import;
- GtkWidget *combobox_protocol;
- GtkWidget *hbox_protocol;
-
GtkWidget *image_type;
GtkWidget *label_name;
GtkWidget *label_type;
- GtkWidget *settings_widget;
+ GtkWidget *dialog_content;
GtkWidget *notebook_account;
GtkWidget *spinner;
gboolean loading;
- /* We have to keep a reference on the actual EmpathyAccountWidget, not just
- * his GtkWidget. It is the only reliable source we can query to know if
+ /* We have to keep a weak reference on the actual EmpathyAccountWidget, not
+ * just its GtkWidget. It is the only reliable source we can query to know if
* there are any unsaved changes to the currently selected account. We can't
* look at the account settings because it does not contain everything that
* can be changed using the EmpathyAccountWidget. For instance, it does not
- * contain the state of the "Enabled" checkbox. */
+ * contain the state of the "Enabled" checkbox.
+ *
+ * Even if we create it ourself, we just get a weak ref and not a strong one
+ * as EmpathyAccountWidget unrefs itself when the GtkWidget is destroyed.
+ * That's kinda ugly; cf bgo #640417.
+ *
+ * */
EmpathyAccountWidget *setting_widget_object;
gboolean connecting_show;
static EmpathyAccountSettings * accounts_dialog_model_get_selected_settings (
EmpathyAccountsDialog *dialog);
-static gboolean accounts_dialog_get_settings_iter (
- EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings,
- GtkTreeIter *iter);
-
static void accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog);
static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings);
-static void accounts_dialog_add (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings);
-
static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings);
+ TpAccount *account);
static void accounts_dialog_connection_changed_cb (TpAccount *account,
guint old_status,
GtkTreeSelection *selection,
EmpathyAccountsDialog *dialog);
+static gboolean accounts_dialog_has_pending_change (
+ EmpathyAccountsDialog *dialog, TpAccount **account);
+
static void
accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
const gchar *display_name)
message_markup = g_markup_printf_escaped ("<i>%s</i>", message);
gtk_label_set_markup (GTK_LABEL (priv->label_status), message_markup);
+
+ gtk_widget_set_tooltip_text (priv->label_status, message);
+
g_free (message_markup);
}
+static void
+accounts_dialog_enable_account_cb (GObject *account,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GError *error = NULL;
+
+ tp_account_set_enabled_finish (TP_ACCOUNT (account), result, &error);
+
+ if (error != NULL)
+ {
+ DEBUG ("Could not enable the account: %s", error->message);
+ g_error_free (error);
+ }
+ else
+ {
+ TpAccountManager *am = tp_account_manager_dup ();
+
+ empathy_connect_new_account (TP_ACCOUNT (account), am);
+ g_object_unref (am);
+ }
+}
+
+static void
+accounts_dialog_enable_switch_active_cb (GtkSwitch *sw,
+ GParamSpec *spec,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountSettings *settings;
+ TpAccount *account;
+
+ settings = accounts_dialog_model_get_selected_settings (dialog);
+ if (settings == NULL)
+ return;
+
+ account = empathy_account_settings_get_account (settings);
+ if (account == NULL)
+ return;
+
+ tp_account_set_enabled_async (account, gtk_switch_get_active (sw),
+ accounts_dialog_enable_account_cb, NULL);
+}
+
static void
accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
TpAccount *account)
TpAccount *selected_account;
gboolean account_enabled;
gboolean creating_account;
+ TpStorageRestrictionFlags storage_restrictions = 0;
view = GTK_TREE_VIEW (priv->treeview);
selection = gtk_tree_view_get_selection (view);
* (else no icon is shown in infobar)*/
if (!account_enabled)
presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
+
+ storage_restrictions = tp_account_get_storage_restrictions (account);
}
else
{
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image_status),
empathy_icon_name_for_presence (presence), GTK_ICON_SIZE_SMALL_TOOLBAR);
+ /* update the enabled switch */
+ g_signal_handlers_block_by_func (priv->enabled_switch,
+ accounts_dialog_enable_switch_active_cb, dialog);
+ gtk_switch_set_active (GTK_SWITCH (priv->enabled_switch),
+ account_enabled);
+ g_signal_handlers_unblock_by_func (priv->enabled_switch,
+ accounts_dialog_enable_switch_active_cb, dialog);
+
+ /* Display the Enable switch if account supports it */
+ gtk_widget_set_visible (priv->enabled_switch,
+ !(storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED));
+
if (account_enabled)
{
switch (status)
empathy_account_dialog_cancel (dialog);
}
-static void
-empathy_account_dialog_account_created_cb (EmpathyAccountWidget *widget_object,
- TpAccount *account,
- EmpathyAccountsDialog *dialog)
-{
- EmpathyAccountSettings *settings =
- accounts_dialog_model_get_selected_settings (dialog);
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- accounts_dialog_update_settings (dialog, settings);
- accounts_dialog_update_status_infobar (dialog,
- empathy_account_settings_get_account (settings));
-
- gtk_widget_set_sensitive (priv->treeview, TRUE);
- gtk_widget_set_sensitive (priv->button_add, TRUE);
- gtk_widget_set_sensitive (priv->button_remove, TRUE);
- gtk_widget_set_sensitive (priv->button_import, TRUE);
-
- if (settings)
- g_object_unref (settings);
-}
-
static gboolean
accounts_dialog_has_valid_accounts (EmpathyAccountsDialog *dialog)
{
}
static void
-account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings)
+account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog)
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- const gchar *icon_name;
- TpAccount *account;
+ EmpathyAccountSettings *settings;
+ GtkWidget *subdialog, *content, *content_area, *align;
+
+ settings = accounts_dialog_model_get_selected_settings (dialog);
+
+ subdialog = gtk_dialog_new_with_buttons (_("Edit Connection Parameters"),
+ GTK_WINDOW (dialog),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ NULL, NULL);
priv->setting_widget_object =
- empathy_account_widget_new_for_protocol (settings, FALSE);
+ empathy_account_widget_new_for_protocol (settings, FALSE);
+
+ g_object_add_weak_pointer (G_OBJECT (priv->setting_widget_object),
+ (gpointer *) &priv->setting_widget_object);
if (accounts_dialog_has_valid_accounts (dialog))
empathy_account_widget_set_other_accounts_exist (
priv->setting_widget_object, TRUE);
- priv->settings_widget =
- empathy_account_widget_get_widget (priv->setting_widget_object);
+ content = empathy_account_widget_get_widget (priv->setting_widget_object);
- g_signal_connect (priv->setting_widget_object, "account-created",
- G_CALLBACK (empathy_account_dialog_account_created_cb), dialog);
g_signal_connect (priv->setting_widget_object, "cancelled",
G_CALLBACK (empathy_account_dialog_widget_cancelled_cb), dialog);
+ g_signal_connect_swapped (priv->setting_widget_object, "close",
+ G_CALLBACK (gtk_widget_destroy), subdialog);
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (subdialog));
+
+ align = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 0, 6, 6);
+
+ gtk_container_add (GTK_CONTAINER (align), content);
+ gtk_box_pack_start (GTK_BOX (content_area), align, TRUE, TRUE, 0);
+
+ gtk_widget_show (content);
+ gtk_widget_show (align);
+ gtk_widget_show (subdialog);
+}
+
+static void
+start_external_app (GAppInfo *app_info)
+{
+ GError *error = NULL;
+ GdkAppLaunchContext *context = NULL;
+ GdkDisplay *display;
+
+ 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_critical ("Failed to bisho: %s", error->message);
+ g_clear_error (&error);
+ }
+
+ tp_clear_object (&context);
+}
+
+static void
+use_external_storage_provider (EmpathyAccountsDialog *self,
+ TpAccount *account)
+{
+ const gchar *provider;
+
+ provider = tp_account_get_storage_provider (account);
+ if (!tp_strdiff (provider, "com.meego.libsocialweb"))
+ {
+ GDesktopAppInfo *desktop_info;
+ gchar *cmd;
+ GAppInfo *app_info;
+ GError *error = NULL;
+
+ desktop_info = g_desktop_app_info_new ("gnome-control-center.desktop");
+ if (desktop_info == NULL)
+ {
+ g_critical ("Could not locate 'gnome-control-center.desktop'");
+ return;
+ }
+
+ /* glib doesn't have API to start a desktop file with args... (#637875) */
+ cmd = g_strdup_printf ("%s bisho.desktop", g_app_info_get_commandline (
+ (GAppInfo *) desktop_info));
+
+ app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error);
+
+ if (app_info == NULL)
+ {
+ DEBUG ("Failed to create app info: %s", error->message);
+ g_error_free (error);
+ }
+ else
+ {
+ start_external_app (app_info);
+ g_object_unref (app_info);
+ }
+
+ g_object_unref (desktop_info);
+ g_free (cmd);
+ return;
+ }
+ else if (!tp_strdiff (provider, "org.gnome.OnlineAccounts"))
+ {
+ GDesktopAppInfo *desktop_info;
+
+ desktop_info = g_desktop_app_info_new (
+ "gnome-online-accounts-panel.desktop");
+ if (desktop_info == NULL)
+ {
+ g_critical ("Could not locate 'gnome-online-accounts-panel.desktop'");
+ }
+ else
+ {
+ start_external_app (G_APP_INFO (desktop_info));
+ g_object_unref (desktop_info);
+ }
+
+ return;
+ }
+ else
+ {
+ DEBUG ("Don't know how to handle %s", provider);
+ return;
+ }
+}
+
+static void
+account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog,
+ GtkButton *button)
+{
+ EmpathyAccountSettings *settings;
+ TpAccount *account;
+ TpStorageRestrictionFlags storage_restrictions;
+
+ settings = accounts_dialog_model_get_selected_settings (dialog);
+
+ account = empathy_account_settings_get_account (settings);
+ g_return_if_fail (account != NULL);
+
+ storage_restrictions = tp_account_get_storage_restrictions (account);
+
+ /* Empathy can only edit accounts without the Cannot_Set_Parameters flag */
+ if (storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS)
+ {
+ DEBUG ("Account is provided by an external storage provider");
+
+ use_external_storage_provider (dialog, account);
+ }
+ else
+ {
+ account_dialog_create_edit_params_dialog (dialog);
+ }
+}
+
+static void
+account_dialog_show_contact_details_failed (EmpathyAccountsDialog *dialog,
+ gboolean error)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkWidget *infobar, *label;
+
+ infobar = gtk_info_bar_new ();
+
+ if (error)
+ {
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_ERROR);
+ label = gtk_label_new (_("Failed to retrieve your personal information "
+ "from the server."));
+ }
+ else
+ {
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO);
+ label = gtk_label_new (_("Go online to edit your personal information."));
+ }
+
+ gtk_container_add (
+ GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar))),
+ label);
+ gtk_box_pack_start (GTK_BOX (priv->dialog_content), infobar, FALSE, FALSE, 0);
+ gtk_widget_show_all (infobar);
+}
+
+static void
+account_dialog_got_self_contact (TpConnection *conn,
+ EmpathyContact *contact,
+ const GError *in_error,
+ gpointer user_data,
+ GObject *dialog)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkWidget *editor, *alig;
+
+ if (in_error != NULL)
+ {
+ DEBUG ("Failed to get self-contact: %s", in_error->message);
+ account_dialog_show_contact_details_failed (
+ EMPATHY_ACCOUNTS_DIALOG (dialog), TRUE);
+ return;
+ }
+
+ alig = gtk_alignment_new (0.5, 0, 1, 1);
+
+ /* create the contact info editor for this account */
+ editor = empathy_contact_widget_new (contact,
+ EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
+ EMPATHY_CONTACT_WIDGET_EDIT_AVATAR |
+ EMPATHY_CONTACT_WIDGET_NO_STATUS |
+ EMPATHY_CONTACT_WIDGET_EDIT_DETAILS);
+
+ gtk_box_pack_start (GTK_BOX (priv->dialog_content), alig, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (alig), editor);
+ gtk_widget_show (alig);
+ gtk_widget_show (editor);
+}
+
+static void
+account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog,
+ EmpathyAccountSettings *settings)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ const gchar *icon_name;
+ TpAccount *account;
+ TpConnection *conn = NULL;
+ GtkWidget *bbox, *button;
+
+ account = empathy_account_settings_get_account (settings);
+
+ // if (priv->setting_widget_object != NULL)
+ // g_object_remove_weak_pointer (G_OBJECT (priv->setting_widget_object),
+ // (gpointer *) &priv->setting_widget_object);
+
+ priv->dialog_content = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (priv->alignment_settings),
- priv->settings_widget);
- gtk_widget_show (priv->settings_widget);
+ priv->dialog_content);
+ gtk_widget_show (priv->dialog_content);
+
+ /* request the self contact */
+ if (account != NULL)
+ conn = tp_account_get_connection (account);
+
+ if (conn != NULL)
+ {
+ empathy_tp_contact_factory_get_from_handle (conn,
+ tp_connection_get_self_handle (conn),
+ account_dialog_got_self_contact,
+ NULL, NULL, G_OBJECT (dialog));
+ }
+ else
+ {
+ account_dialog_show_contact_details_failed (dialog, FALSE);
+ }
+
+ bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
+ gtk_box_pack_end (GTK_BOX (priv->dialog_content), bbox, FALSE, TRUE, 0);
+ gtk_widget_show (bbox);
+
+ button = gtk_button_new_with_mnemonic (_("_Edit Connection Parameters..."));
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, TRUE, 0);
+ gtk_widget_show (button);
+ g_signal_connect_swapped (button, "clicked",
+ G_CALLBACK (account_dialow_show_edit_params_dialog), dialog);
icon_name = empathy_account_settings_get_icon_name (settings);
accounts_dialog_update_name_label (dialog,
empathy_account_settings_get_display_name (settings));
- account = empathy_account_settings_get_account (settings);
accounts_dialog_update_status_infobar (dialog, account);
}
EmpathyAccountsDialog *dialog)
{
if (empathy_account_settings_is_ready (settings))
- account_dialog_create_settings_widget (dialog, settings);
+ account_dialog_create_dialog_content (dialog, settings);
}
static void
priv->setting_widget_object);
}
-static void
-accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
-{
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- EmpathyAccountSettings *settings;
- gchar *str;
- const gchar *name, *display_name;
- TpConnectionManager *cm;
- TpConnectionManagerProtocol *proto;
- gboolean is_gtalk, is_facebook;
-
- cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk,
- &is_facebook);
- if (cm == NULL)
- return;
-
- if (is_gtalk)
- name = "gtalk";
- else if (is_facebook)
- name ="facebook";
- else
- name = proto->name;
-
- display_name = empathy_protocol_name_to_display_name (name);
- if (display_name == NULL)
- display_name = proto->name;
-
- /* Create account */
- /* To translator: %s is the name of the protocol, such as "Google Talk" or
- * "Yahoo!"
- */
- str = g_strdup_printf (_("New %s account"), display_name);
- settings = empathy_account_settings_new (cm->name, proto->name, str);
-
- g_free (str);
-
- if (is_gtalk)
- {
- gchar *fallback_servers[] = {
- "talkx.l.google.com",
- "talkx.l.google.com:443,oldssl",
- "talkx.l.google.com:80",
- NULL};
-
- empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
- NULL, NULL);
-
- empathy_account_settings_set_string (settings, "server", NULL);
- empathy_account_settings_set_strv (settings, "fallback-servers",
- fallback_servers);
- }
- else if (is_facebook)
- {
- empathy_account_settings_set_icon_name_async (settings, "im-facebook",
- NULL, NULL);
-
- empathy_account_settings_set_string (settings, "server",
- "chat.facebook.com");
- }
-
- accounts_dialog_add (dialog, settings);
- accounts_dialog_model_set_selected (dialog, settings);
-
- gtk_widget_show_all (priv->hbox_protocol);
-
- g_object_unref (settings);
- g_object_unref (cm);
-}
-
-static void
-accounts_dialog_protocol_changed_cb (GtkWidget *widget,
- EmpathyAccountsDialog *dialog)
-{
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- gboolean creating;
- EmpathyAccountSettings *settings;
- gchar *account = NULL, *password = NULL;
-
- /* The "changed" signal is fired during the initiation of the
- * EmpathyProtocolChooser while populating the widget. Such signals should
- * be ignored so we check if we are actually creating a new account. */
- if (priv->setting_widget_object == NULL)
- return;
-
- g_object_get (priv->setting_widget_object,
- "creating-account", &creating, NULL);
- if (!creating)
- return;
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- return;
-
- /* Save "account" and "password" parameters */
- g_object_get (priv->setting_widget_object, "settings", &settings, NULL);
-
- if (settings != NULL)
- {
- account = g_strdup (empathy_account_settings_get_string (settings,
- "account"));
- password = g_strdup (empathy_account_settings_get_string (settings,
- "password"));
- g_object_unref (settings);
- }
-
- /* We are creating a new widget to replace the current one, don't ask
- * confirmation to the user. */
- priv->force_change_row = TRUE;
-
- /* We'll update the selection after we create the new account widgets;
- * updating it right now causes problems for the # of accounts = zero case */
- g_signal_handlers_block_by_func (selection,
- accounts_dialog_model_selection_changed, dialog);
-
- gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-
- g_signal_handlers_unblock_by_func (selection,
- accounts_dialog_model_selection_changed, dialog);
-
- accounts_dialog_setup_ui_to_add_account (dialog);
-
- /* Restore "account" and "password" parameters in the new widget */
- if (account != NULL)
- {
- empathy_account_widget_set_account_param (priv->setting_widget_object,
- account);
- g_free (account);
- }
-
- if (password != NULL)
- {
- empathy_account_widget_set_password_param (priv->setting_widget_object,
- password);
- g_free (password);
- }
-}
-
static void
accounts_dialog_show_question_dialog (EmpathyAccountsDialog *dialog,
const gchar *primary_text,
gtk_widget_show (message_dialog);
}
-static void
-accounts_dialog_add_pending_changes_response_cb (GtkDialog *message_dialog,
- gint response_id,
- gpointer *user_data)
-{
- EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- gtk_widget_destroy (GTK_WIDGET (message_dialog));
-
- if (response_id == GTK_RESPONSE_YES)
- {
- empathy_account_widget_discard_pending_changes (
- priv->setting_widget_object);
- accounts_dialog_setup_ui_to_add_account (dialog);
- }
-}
-
static gchar *
get_dialog_primary_text (TpAccount *account)
{
static void
accounts_dialog_button_add_clicked_cb (GtkWidget *button,
- EmpathyAccountsDialog *dialog)
+ EmpathyAccountsDialog *self)
{
- TpAccount *account = NULL;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkWidget *dialog;
+ gint response;
- if (accounts_dialog_has_pending_change (dialog, &account))
- {
- gchar *question_dialog_primary_text = get_dialog_primary_text (account);
+ dialog = empathy_new_account_dialog_new (GTK_WINDOW (self));
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- accounts_dialog_show_question_dialog (dialog,
- question_dialog_primary_text,
- _("You are about to create a new account, which will discard\n"
- "your changes. Are you sure you want to proceed?"),
- G_CALLBACK (accounts_dialog_add_pending_changes_response_cb),
- dialog,
- GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
- GTK_STOCK_DISCARD, GTK_RESPONSE_YES, NULL);
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
- g_free (question_dialog_primary_text);
- }
- else
+ if (response == GTK_RESPONSE_OK)
{
- accounts_dialog_setup_ui_to_add_account (dialog);
- gtk_widget_set_sensitive (priv->treeview, FALSE);
- gtk_widget_set_sensitive (priv->button_add, FALSE);
- gtk_widget_set_sensitive (priv->button_remove, FALSE);
- gtk_widget_set_sensitive (priv->button_import, FALSE);
+ EmpathyAccountSettings *settings;
+ TpAccount *account;
+
+ settings = empathy_new_account_dialog_get_settings (
+ EMPATHY_NEW_ACCOUNT_DIALOG (dialog));
+
+ /* The newly created account has already been added by
+ * accounts_dialog_account_validity_changed_cb so we just
+ * have to select it. */
+ account = empathy_account_settings_get_account (settings);
+ accounts_dialog_model_set_selected (self, account);
}
- if (account != NULL)
- g_object_unref (account);
+ gtk_widget_destroy (dialog);
}
static void
return;
}
- if (empathy_connection_managers_get_cms_num (priv->cms) > 0)
- {
- /* We have no account configured but we have some
- * profiles installed. The user obviously wants to add
- * an account. Click on the Add button for him. */
- accounts_dialog_button_add_clicked_cb (priv->button_add,
- dialog);
- return;
- }
/* No account and no profile, warn the user */
gtk_widget_hide (priv->vbox_details);
- gtk_widget_show (priv->frame_no_protocol);
gtk_widget_set_sensitive (priv->button_add, FALSE);
+
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account),
+ NOTEBOOK_PAGE_NO_PROTOCOL);
return;
}
/* We have an account selected, destroy old settings and create a new
* one for the account selected */
- gtk_widget_hide (priv->frame_no_protocol);
gtk_widget_show (priv->vbox_details);
- gtk_widget_hide (priv->hbox_protocol);
- if (priv->settings_widget)
+ if (priv->dialog_content)
{
- gtk_widget_destroy (priv->settings_widget);
- priv->settings_widget = NULL;
+ gtk_widget_destroy (priv->dialog_content);
+ priv->dialog_content = NULL;
}
if (empathy_account_settings_is_ready (settings))
{
- account_dialog_create_settings_widget (dialog, settings);
+ account_dialog_create_dialog_content (dialog, settings);
}
else
{
GtkTreeIter *iter,
gpointer user_data)
{
- gtk_tree_model_row_changed (model, path, iter);
+ TpAccount *account;
+
+ gtk_tree_model_get (model, iter, COL_ACCOUNT, &account, -1);
+ if (account == NULL)
+ return FALSE;
+
+ if (tp_account_get_connection_status (account, NULL) ==
+ TP_CONNECTION_STATUS_CONNECTING)
+ {
+ /* Only update the row where we have a connecting account as that's the
+ * ones having a blinking icon. */
+ gtk_tree_model_row_changed (model, path, iter);
+ }
+
+ g_object_unref (account);
return FALSE;
}
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkTreeView *view;
- GtkTreeModel *model;
GtkTreeSelection *selection;
GtkTreeIter iter;
view = GTK_TREE_VIEW (priv->treeview);
- model = gtk_tree_view_get_model (view);
selection = gtk_tree_view_get_selection (view);
if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
return;
}
static gboolean
-accounts_dialog_get_settings_iter (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings,
+accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
+ TpAccount *account,
GtkTreeIter *iter)
{
GtkTreeView *view;
- GtkTreeSelection *selection;
GtkTreeModel *model;
gboolean ok;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
/* Update the status in the model */
view = GTK_TREE_VIEW (priv->treeview);
- selection = gtk_tree_view_get_selection (view);
model = gtk_tree_view_get_model (view);
for (ok = gtk_tree_model_get_iter_first (model, iter);
ok;
ok = gtk_tree_model_iter_next (model, iter))
{
- EmpathyAccountSettings *this_settings;
+ TpAccount *this_account;
gboolean equal;
gtk_tree_model_get (model, iter,
- COL_ACCOUNT_SETTINGS, &this_settings,
+ COL_ACCOUNT, &this_account,
-1);
- equal = (this_settings == settings);
- g_object_unref (this_settings);
+ equal = (this_account == account);
+ g_object_unref (this_account);
if (equal)
return TRUE;
return FALSE;
}
-static gboolean
-accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
- TpAccount *account,
+static void
+select_and_scroll_to_iter (EmpathyAccountsDialog *dialog,
GtkTreeIter *iter)
{
- GtkTreeView *view;
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- gboolean ok;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+ GtkTreeModel *model;
- /* Update the status in the model */
- view = GTK_TREE_VIEW (priv->treeview);
- selection = gtk_tree_view_get_selection (view);
- model = gtk_tree_view_get_model (view);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
- for (ok = gtk_tree_model_get_iter_first (model, iter);
- ok;
- ok = gtk_tree_model_iter_next (model, iter))
- {
- EmpathyAccountSettings *settings;
- gboolean equal;
+ gtk_tree_selection_select_iter (selection, iter);
- gtk_tree_model_get (model, iter,
- COL_ACCOUNT_SETTINGS, &settings,
- -1);
-
- equal = empathy_account_settings_has_account (settings, account);
- g_object_unref (settings);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+ path = gtk_tree_model_get_path (model, iter);
- if (equal)
- return TRUE;
- }
+ gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (priv->treeview), path, NULL,
+ TRUE, 0, 0.5);
- return FALSE;
+ gtk_tree_path_free (path);
}
static void
accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings)
+ TpAccount *account)
{
- GtkTreeSelection *selection;
GtkTreeIter iter;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
- if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
- gtk_tree_selection_select_iter (selection, &iter);
+ if (accounts_dialog_get_account_iter (dialog, account, &iter))
+ select_and_scroll_to_iter (dialog, &iter);
}
+
static void
-accounts_dialog_add (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings)
+accounts_dialog_treeview_enabled_cb (GtkMenuItem *item,
+ TpAccount *account)
+{
+ gboolean enabled;
+
+ enabled = tp_account_is_enabled (account);
+ tp_account_set_enabled_async (account, !enabled, NULL, NULL);
+}
+
+static gboolean
+accounts_dialog_treeview_button_press_event_cb (GtkTreeView *view,
+ GdkEventButton *event,
+ EmpathyAccountsDialog *dialog)
{
- GtkTreeModel *model;
- GtkTreeIter iter;
- const gchar *name;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ TpAccount *account = NULL;
+ GtkTreeModel *model = NULL;
+ GtkTreePath *path = NULL;
+ GtkTreeIter iter;
+ GtkWidget *menu;
+ GtkWidget *item_enable, *item_disable;
+ GtkWidget *image_enable, *image_disable;
+ /* ignore multiple clicks */
+ if (event->type != GDK_BUTTON_PRESS)
+ return TRUE;
+
+ if (event->button != 3)
+ goto finally;
+
+ /* Selection is not yet set, so we have to get account from event position */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
- name = empathy_account_settings_get_display_name (settings);
+ if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->treeview),
+ event->x, event->y, &path, NULL, NULL, NULL))
+ goto finally;
+
+ if (!gtk_tree_model_get_iter (model, &iter, path))
+ goto finally;
+
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT, &account, -1);
+
+ /* Create the menu */
+ menu = empathy_context_menu_new (GTK_WIDGET (view));
+
+ /* Get images for menu items */
+ image_enable = gtk_image_new_from_icon_name (empathy_icon_name_for_presence (
+ tp_account_manager_get_most_available_presence (
+ priv->account_manager, NULL, NULL)),
+ GTK_ICON_SIZE_MENU);
+ image_disable = gtk_image_new_from_icon_name (
+ empathy_icon_name_for_presence (TP_CONNECTION_PRESENCE_TYPE_OFFLINE),
+ GTK_ICON_SIZE_MENU);
+
+ /* Menu items: to enabled/disable the account */
+ item_enable = gtk_image_menu_item_new_with_mnemonic (_("_Enable"));
+ item_disable = gtk_image_menu_item_new_with_mnemonic (_("_Disable"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_enable),
+ image_enable);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_disable),
+ image_disable);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item_enable);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item_disable);
+
+ if (tp_account_is_enabled (account))
+ {
+ tp_g_signal_connect_object (item_disable, "activate",
+ G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+ gtk_widget_set_sensitive (item_enable, FALSE);
+ }
+ else
+ {
+ tp_g_signal_connect_object (item_enable, "activate",
+ G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+ gtk_widget_set_sensitive (item_disable, FALSE);
+ }
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_widget_show (item_enable);
+ gtk_widget_show (item_disable);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COL_NAME, name,
- COL_STATUS, TP_CONNECTION_STATUS_DISCONNECTED,
- COL_ACCOUNT_SETTINGS, settings,
- -1);
+ /* FIXME: Add here presence items, to be able to set per-account presence */
+
+ /* Popup menu */
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+ event->button, event->time);
+
+finally:
+ tp_clear_object (&account);
+ gtk_tree_path_free (path);
+
+ return FALSE;
}
static void
GtkTreeIter iter;
TpConnectionStatus status;
const gchar *name;
- gboolean enabled;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ gboolean selected = FALSE;
+ GtkTreeSelection *selection;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
status = tp_account_get_connection_status (account, NULL);
name = tp_account_get_display_name (account);
- enabled = tp_account_is_enabled (account);
settings = empathy_account_settings_new_for_account (account);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+
if (!accounts_dialog_get_account_iter (dialog, account, &iter))
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ {
+ /* Select the account if it's the first added */
+ if (gtk_tree_selection_count_selected_rows (selection) == 0)
+ selected = TRUE;
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ }
+ else
+ {
+ selected = gtk_tree_selection_iter_is_selected (selection, &iter);
+ }
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COL_NAME, name,
COL_ACCOUNT_SETTINGS, settings,
-1);
+ if (selected)
+ {
+ /* We just modified the selected account. Its display name may have been
+ * changed and so it's place in the treeview. Scroll to it so it stays
+ * visible. */
+ select_and_scroll_to_iter (dialog, &iter);
+ }
+
accounts_dialog_connection_changed_cb (account,
0,
status,
g_object_unref (settings);
}
-static void
-account_prepare_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
- TpAccount *account = TP_ACCOUNT (source_object);
- GError *error = NULL;
-
- if (!tp_account_prepare_finish (account, result, &error))
- {
- DEBUG ("Failed to prepare account: %s", error->message);
- g_error_free (error);
- return;
- }
-
- accounts_dialog_add_account (dialog, account);
-}
-
static void
accounts_dialog_account_validity_changed_cb (TpAccountManager *manager,
TpAccount *account,
gboolean valid,
EmpathyAccountsDialog *dialog)
{
- tp_account_prepare_async (account, NULL, account_prepare_cb, dialog);
+ accounts_dialog_add_account (dialog, account);
}
static void
TpAccount *account,
gboolean enabled)
{
- GtkTreeModel *model;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- /* Update the status in the model */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
-
/* Update the status-infobar in the details view */
accounts_dialog_update_status_infobar (dialog, account);
enable_or_disable_account (dialog, account, TRUE);
}
-static void
-accounts_dialog_button_import_clicked_cb (GtkWidget *button,
- EmpathyAccountsDialog *dialog)
+static GtkWidget *
+display_import_dialog (EmpathyAccountsDialog *dialog)
{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkWidget *import_dialog;
import_dialog = empathy_import_dialog_new (GTK_WINDOW (dialog),
- FALSE);
+ FALSE, priv->cms);
gtk_widget_show (import_dialog);
+
+ return import_dialog;
+}
+
+static void
+accounts_dialog_button_import_clicked_cb (GtkWidget *button,
+ EmpathyAccountsDialog *dialog)
+{
+ display_import_dialog (dialog);
}
static void
accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog,
TpAccount *account)
{
- GtkTreeSelection *selection;
GtkTreeIter iter;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (accounts_dialog_get_account_iter (dialog, account, &iter))
- gtk_tree_selection_select_iter (selection, &iter);
+ select_and_scroll_to_iter (dialog, &iter);
+}
+
+static void
+salut_valid_cb (GtkWidget *widget,
+ gboolean valid,
+ GtkWidget *button)
+{
+ gtk_widget_set_sensitive (button, valid);
+}
+
+static void
+maybe_show_salut_dialog (EmpathyAccountsDialog *self)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
+ GtkWidget *dialog, *widget, *content, *button;
+ gint response;
+
+ if (!empathy_local_xmpp_assistant_widget_should_create_account (
+ priv->account_manager))
+ return;
+
+ widget = empathy_local_xmpp_assistant_widget_new ();
+ gtk_widget_show (widget);
+
+ dialog = gtk_dialog_new ();
+
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Skip"),
+ GTK_RESPONSE_NO);
+
+ button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+ _("_Connect"), GTK_RESPONSE_YES);
+ gtk_widget_set_sensitive (button, FALSE);
+
+ g_signal_connect (widget, "valid", G_CALLBACK (salut_valid_cb),
+ button);
+
+ content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ gtk_box_pack_start (GTK_BOX (content), widget, TRUE, TRUE, 0);
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+ if (response == GTK_RESPONSE_YES)
+ {
+ empathy_local_xmpp_assistant_widget_create_account (
+ EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET (widget));
+ }
+
+ gtk_widget_destroy (dialog);
+}
+
+static void
+import_dialog_response_cb (GtkDialog *dialog,
+ gint response_id,
+ EmpathyAccountsDialog *self)
+{
+ maybe_show_salut_dialog (self);
+}
+
+static void
+maybe_show_import_dialog (EmpathyAccountsDialog *self)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
+ GtkWidget *dialog;
+
+ if (empathy_accounts_has_non_salut_accounts (priv->account_manager))
+ return;
+
+ if (!empathy_import_accounts_to_import ())
+ {
+ maybe_show_salut_dialog (self);
+ return;
+ }
+
+ dialog = display_import_dialog (self);
+
+ tp_g_signal_connect_object (dialog, "response",
+ G_CALLBACK (import_dialog_response_cb), self, 0);
}
static void
gtk_spinner_stop (GTK_SPINNER (priv->spinner));
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account),
NOTEBOOK_PAGE_ACCOUNT);
+
+ maybe_show_import_dialog (self);
}
static void
if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
goto out;
- accounts_dialog_update_settings (dialog, NULL);
+ /* No need to update the settings if we are already preparing one */
+ if (priv->settings_ready == NULL)
+ accounts_dialog_update_settings (dialog, NULL);
if (priv->initial_selection != NULL)
{
TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
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);
GtkBuilder *gui;
gchar *filename;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- GtkWidget *content_area;
- GtkWidget *action_area, *vbox, *hbox, *align;
+ GtkWidget *content_area, *action_area;
+ GtkWidget *grid, *hbox;
GtkWidget *alig;
+ GtkWidget *sw, *toolbar;
+ GtkStyleContext *context;
filename = empathy_file_lookup ("empathy-accounts-dialog.ui", "src");
gui = empathy_builder_get_file (filename,
"accounts_dialog_hbox", &top_hbox,
"vbox_details", &priv->vbox_details,
- "frame_no_protocol", &priv->frame_no_protocol,
"alignment_settings", &priv->alignment_settings,
"alignment_infobar", &priv->alignment_infobar,
"treeview", &priv->treeview,
"button_add", &priv->button_add,
"button_remove", &priv->button_remove,
"button_import", &priv->button_import,
- "hbox_protocol", &priv->hbox_protocol,
"notebook_account", &priv->notebook_account,
"alignment_loading", &alig,
+ "accounts_sw", &sw,
+ "add_remove_toolbar", &toolbar,
NULL);
g_free (filename);
- gtk_widget_set_no_show_all (priv->frame_no_protocol, TRUE);
-
empathy_builder_connect (gui, dialog,
"button_add", "clicked", accounts_dialog_button_add_clicked_cb,
"button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
"button_import", "clicked", accounts_dialog_button_import_clicked_cb,
+ "treeview", "button-press-event",
+ accounts_dialog_treeview_button_press_event_cb,
NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
- gtk_container_add (GTK_CONTAINER (content_area), top_hbox);
+ gtk_box_pack_start (GTK_BOX (content_area), top_hbox, TRUE, TRUE, 0);
g_object_unref (gui);
gtk_widget_set_sensitive (priv->button_import, FALSE);
gtk_widget_set_sensitive (priv->treeview, FALSE);
- priv->combobox_protocol = empathy_protocol_chooser_new ();
- gtk_box_pack_start (GTK_BOX (priv->hbox_protocol), priv->combobox_protocol,
- TRUE, TRUE, 0);
- g_signal_connect (priv->combobox_protocol, "changed",
- G_CALLBACK (accounts_dialog_protocol_changed_cb),
- dialog);
-
if (priv->parent_window)
gtk_window_set_transient_for (GTK_WINDOW (dialog),
priv->parent_window);
priv->infobar);
gtk_widget_show (priv->infobar);
- content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (priv->infobar));
+ grid = gtk_grid_new ();
+ gtk_container_add (
+ GTK_CONTAINER (gtk_info_bar_get_content_area (
+ GTK_INFO_BAR (priv->infobar))),
+ grid);
priv->image_type = gtk_image_new_from_stock (GTK_STOCK_CUT,
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (priv->image_type), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (content_area), priv->image_type, FALSE, FALSE, 0);
- gtk_widget_show (priv->image_type);
-
- vbox = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
- gtk_widget_show (vbox);
+ gtk_grid_attach (GTK_GRID (grid), priv->image_type, 0, 0, 1, 2);
/* first row */
- align = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
- gtk_widget_show (align);
-
priv->label_name = gtk_label_new (NULL);
- gtk_container_add (GTK_CONTAINER (align), priv->label_name);
- gtk_widget_show (priv->label_name);
-
- gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
+ gtk_grid_attach (GTK_GRID (grid), priv->label_name, 1, 0, 1, 1);
/* second row */
- align = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
- gtk_widget_show (align);
- hbox = gtk_hbox_new (FALSE, 6);
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (align), hbox);
-
- gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_widget_set_hexpand (hbox, TRUE);
+ gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
+ gtk_grid_attach (GTK_GRID (grid), hbox, 1, 1, 1, 1);
/* set up spinner */
priv->throbber = gtk_spinner_new ();
TP_CONNECTION_PRESENCE_TYPE_OFFLINE), GTK_ICON_SIZE_SMALL_TOOLBAR);
priv->label_status = gtk_label_new (NULL);
- gtk_label_set_line_wrap (GTK_LABEL (priv->label_status), TRUE);
- gtk_widget_show (priv->label_status);
+ gtk_label_set_ellipsize (GTK_LABEL (priv->label_status), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (hbox), priv->throbber, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->image_status, FALSE, FALSE, 3);
- gtk_box_pack_start (GTK_BOX (hbox), priv->label_status, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->image_status, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->label_status, FALSE, FALSE, 0);
+
+ /* enabled switch */
+ priv->enabled_switch = gtk_switch_new ();
+ gtk_widget_set_valign (priv->enabled_switch, GTK_ALIGN_CENTER);
+ g_signal_connect (priv->enabled_switch, "notify::active",
+ G_CALLBACK (accounts_dialog_enable_switch_active_cb), dialog);
+ gtk_grid_attach (GTK_GRID (grid), priv->enabled_switch, 2, 0, 1, 2);
+
+ gtk_widget_show_all (grid);
/* Tweak the dialog */
gtk_window_set_title (GTK_WINDOW (dialog), _("Messaging and VoIP Accounts"));
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+ /* join the add/remove toolbar to the treeview */
+ context = gtk_widget_get_style_context (sw);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
+
+ context = gtk_widget_get_style_context (toolbar);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+
/* add dialog buttons */
gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (object);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkTreeModel *model;
- GSettings *gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
accounts_dialog_build_ui (dialog);
accounts_dialog_model_setup (dialog);
/* Set up signalling */
priv->account_manager = tp_account_manager_dup ();
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
accounts_dialog_manager_ready_cb, dialog);
- if (empathy_import_accounts_to_import ())
- {
- gtk_widget_show (priv->button_import);
-
- if (!g_settings_get_boolean (gsettings, EMPATHY_PREFS_IMPORT_ASKED))
- {
- GtkWidget *import_dialog;
-
- g_settings_set_boolean (gsettings, EMPATHY_PREFS_IMPORT_ASKED, TRUE);
- import_dialog = empathy_import_dialog_new (GTK_WINDOW (dialog),
- FALSE);
- gtk_widget_show (import_dialog);
- }
- }
-
priv->connectivity = empathy_connectivity_dup_singleton ();
-
- g_object_unref (gsettings);
}
static void
gboolean if_needed,
gboolean hidden)
{
- GError *error = NULL;
- const gchar *argv[4] = { NULL, };
- gint i = 0;
- gchar *account_option = NULL;
- gchar *path;
+ GString *args;
- g_return_if_fail (GDK_IS_SCREEN (screen));
g_return_if_fail (!selected_account || TP_IS_ACCOUNT (selected_account));
- /* Try to run from source directory if possible */
- path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
- "empathy-accounts", NULL);
-
- if (!g_file_test (path, G_FILE_TEST_EXISTS))
- {
- g_free (path);
- path = g_build_filename (BIN_DIR, "empathy-accounts", NULL);
- }
-
- argv[i++] = path;
+ args = g_string_new (NULL);
if (selected_account != NULL)
- {
- const gchar *account_path;
-
- account_path = tp_proxy_get_object_path (TP_PROXY (selected_account));
- account_option = g_strdup_printf ("--select-account=%s",
- &account_path[strlen (TP_ACCOUNT_OBJECT_PATH_BASE)]);
-
- argv[i++] = account_option;
- }
+ g_string_append_printf (args, " --select-account=%s",
+ tp_account_get_path_suffix (selected_account));
if (if_needed)
- argv[i++] = "--if-needed";
+ g_string_append_printf (args, " --if-needed");
if (hidden)
- argv[i++] = "--hidden";
+ g_string_append_printf (args, " --hidden");
DEBUG ("Launching empathy-accounts (if_needed: %d, hidden: %d, account: %s)",
if_needed, hidden,
selected_account == NULL ? "<none selected>" :
tp_proxy_get_object_path (TP_PROXY (selected_account)));
- gdk_spawn_on_screen (screen, NULL, (gchar**) argv, NULL, G_SPAWN_SEARCH_PATH,
- NULL, NULL, NULL, &error);
- if (error != NULL)
- {
- g_warning ("Failed to open accounts dialog: %s", error->message);
- g_error_free (error);
- }
+ empathy_launch_program (BIN_DIR, "empathy-accounts", args->str);
- g_free (account_option);
- g_free (path);
+ g_string_free (args, TRUE);
}
gboolean
projects / empathy.git / blobdiff