#include <dbus/dbus-glib.h>
#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/defs.h>
#include <telepathy-glib/util.h>
#include <libempathy/empathy-utils.h>
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountsDialog)
G_DEFINE_TYPE (EmpathyAccountsDialog, empathy_accounts_dialog, GTK_TYPE_DIALOG);
-static EmpathyAccountsDialog *dialog_singleton = NULL;
-
typedef struct {
GtkWidget *alignment_settings;
GtkWidget *alignment_infobar;
GtkWidget *treeview;
GtkWidget *button_add;
+ GtkWidget *button_remove;
GtkWidget *button_import;
GtkWidget *combobox_protocol;
enum {
COL_NAME,
COL_STATUS,
- COL_ACCOUNT_POINTER,
- COL_ACCOUNT_SETTINGS_POINTER,
+ COL_ACCOUNT,
+ COL_ACCOUNT_SETTINGS,
COL_COUNT
};
gchar *status_message,
EmpathyAccountsDialog *dialog);
+static void accounts_dialog_model_selection_changed (
+ GtkTreeSelection *selection,
+ EmpathyAccountsDialog *dialog);
+
static void
accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
const gchar *display_name)
gchar *text;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- text = g_markup_printf_escaped ("<big><b>%s</b></big>", display_name);
+ text = g_markup_printf_escaped ("<b>%s</b>", display_name);
gtk_label_set_markup (GTK_LABEL (priv->label_name), text);
g_free (text);
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
const gchar *message;
+ gchar *message_markup;
gchar *status_message = NULL;
guint status;
guint reason;
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
- gtk_tree_model_get (model, &iter,
- COL_ACCOUNT_POINTER, &selected_account, -1);
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT, &selected_account, -1);
+ if (selected_account != NULL)
+ g_object_unref (selected_account);
/* do not update the infobar when the account is not selected */
if (account != selected_account)
gtk_widget_hide (priv->throbber);
}
- gtk_label_set_text (GTK_LABEL (priv->label_status), message);
+ message_markup = g_markup_printf_escaped ("<i>%s</i>", message);
+ gtk_label_set_markup (GTK_LABEL (priv->label_status), message_markup);
gtk_widget_show (priv->label_status);
if (!creating_account)
gtk_widget_hide (priv->infobar);
g_free (status_message);
+ g_free (message_markup);
}
static void
return;
gtk_tree_model_get (model, &iter,
- COL_ACCOUNT_SETTINGS_POINTER, &settings,
- COL_ACCOUNT_POINTER, &account, -1);
+ COL_ACCOUNT_SETTINGS, &settings,
+ COL_ACCOUNT, &account, -1);
empathy_account_widget_discard_pending_changes (priv->setting_widget_object);
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 != NULL)
TpAccount *account,
EmpathyAccountsDialog *dialog)
{
- gchar *display_name;
EmpathyAccountSettings *settings =
accounts_dialog_model_get_selected_settings (dialog);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- display_name = empathy_account_widget_get_default_display_name (
- widget_object);
-
- empathy_account_settings_set_display_name_async (settings,
- display_name, NULL, NULL);
-
- g_free (display_name);
-
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);
empathy_signal_connect_weak (account, "status-changed",
g_object_unref (settings);
}
+static gboolean
+accounts_dialog_has_valid_accounts (EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gboolean creating;
+
+ g_object_get (priv->setting_widget_object,
+ "creating-account", &creating, NULL);
+
+ if (!creating)
+ return TRUE;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+
+ if (gtk_tree_model_get_iter_first (model, &iter))
+ return gtk_tree_model_iter_next (model, &iter);
+
+ return FALSE;
+}
+
static void
account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
priv->setting_widget_object =
empathy_account_widget_new_for_protocol (settings, FALSE);
+ 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);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (gtk_tree_selection_get_selected (selection, &model, &iter))
- gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, account, -1);
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT, account, -1);
return priv->setting_widget_object != NULL
&& empathy_account_widget_contains_pending_changes (
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
EmpathyAccountSettings *settings;
gchar *str;
- const gchar *display_name;
+ const gchar *name, *display_name;
TpConnectionManager *cm;
TpConnectionManagerProtocol *proto;
- gboolean is_gtalk;
+ gboolean is_gtalk, is_facebook;
cm = empathy_protocol_chooser_dup_selected (
- EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk);
+ EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto, &is_gtalk,
+ &is_facebook);
if (cm == NULL)
return;
- display_name = empathy_protocol_name_to_display_name (
- is_gtalk ? "gtalk" : proto->name);
+ 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;
if (is_gtalk)
empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
NULL, NULL);
+ else if (is_facebook)
+ empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+ NULL, NULL);
accounts_dialog_add (dialog, settings);
accounts_dialog_model_set_selected (dialog, 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 */
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);
}
+
+ if (account != NULL)
+ g_object_unref (account);
}
static void
/* An error occured */
return GTK_STOCK_DIALOG_ERROR;
- presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
+ presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
}
else if (status == TP_CONNECTION_STATUS_CONNECTING)
{
{
TpAccount *account;
- gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1);
+ gtk_tree_model_get (model, iter, COL_ACCOUNT, &account, -1);
g_object_set (cell,
"icon-name", get_status_icon_for_account (dialog, account),
gtk_tree_model_get (model, iter,
COL_STATUS, &status,
- COL_ACCOUNT_SETTINGS_POINTER, &settings,
+ COL_ACCOUNT_SETTINGS, &settings,
-1);
icon_name = empathy_account_settings_get_icon_name (settings);
treepath = gtk_tree_path_new_from_string (path);
gtk_tree_model_get_iter (model, &iter, treepath);
gtk_tree_model_get (model, &iter,
- COL_ACCOUNT_SETTINGS_POINTER, &settings,
+ COL_ACCOUNT_SETTINGS, &settings,
-1);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COL_NAME, new_text,
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
- gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT, &account, -1);
if (account != NULL)
{
account = NULL;
}
+ /* No need to call accounts_dialog_model_selection_changed while
+ * removing as we are going to call accounts_dialog_model_select_first
+ * right after which will update the selection. */
+ g_signal_handlers_block_by_func (selection,
+ accounts_dialog_model_selection_changed, account_dialog);
+
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+
+ g_signal_handlers_unblock_by_func (selection,
+ accounts_dialog_model_selection_changed, account_dialog);
+
accounts_dialog_model_select_first (account_dialog);
}
}
static void
-accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell,
- const gchar *path_string,
- EmpathyAccountsDialog *dialog)
+accounts_dialog_remove_account_iter (EmpathyAccountsDialog *dialog,
+ GtkTreeIter *iter)
{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
TpAccount *account;
GtkTreeModel *model;
- GtkTreeIter iter;
gchar *question_dialog_primary_text;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
- if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
- return;
-
- gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
+ gtk_tree_model_get (model, iter, COL_ACCOUNT, &account, -1);
if (account == NULL || !tp_account_is_valid (account))
{
- gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+ if (account != NULL)
+ g_object_unref (account);
+ gtk_list_store_remove (GTK_LIST_STORE (model), iter);
accounts_dialog_model_select_first (dialog);
return;
}
GTK_STOCK_REMOVE, GTK_RESPONSE_YES, NULL);
g_free (question_dialog_primary_text);
+ g_object_unref (account);
+}
- if (account != NULL)
- {
- g_object_unref (account);
- account = NULL;
- }
+static void
+accounts_dialog_button_remove_clicked_cb (GtkWidget *button,
+ EmpathyAccountsDialog *dialog)
+{
+ 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;
+
+ accounts_dialog_remove_account_iter (dialog, &iter);
+}
+
+#ifdef HAVE_MEEGO
+static void
+accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell,
+ const gchar *path_string,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+ if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
+ return;
+
+ accounts_dialog_remove_account_iter (dialog, &iter);
}
+#endif /* HAVE_MEEGO */
static void
accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
dialog);
g_object_set (cell, "ypad", 4, NULL);
+#ifdef HAVE_MEEGO
/* Delete column */
cell = empathy_cell_renderer_activatable_new ();
gtk_tree_view_column_pack_start (column, cell, FALSE);
g_signal_connect (cell, "path-activated",
G_CALLBACK (accounts_dialog_view_delete_activated_cb),
dialog);
+#endif /* HAVE_MEEGO */
}
static EmpathyAccountSettings *
return NULL;
gtk_tree_model_get (model, &iter,
- COL_ACCOUNT_SETTINGS_POINTER, &settings, -1);
+ COL_ACCOUNT_SETTINGS, &settings, -1);
return settings;
}
accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
EmpathyAccountsDialog *dialog)
{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
EmpathyAccountSettings *settings;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean is_selection;
+ gboolean creating = FALSE;
is_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
if (settings != NULL)
g_object_unref (settings);
+
+ if (priv->setting_widget_object != NULL)
+ {
+ g_object_get (priv->setting_widget_object,
+ "creating-account", &creating, NULL);
+ }
+
+ /* Update remove button sensitivity */
+ gtk_widget_set_sensitive (priv->button_remove, is_selection && !creating);
}
static void
TpAccount *account = NULL;
EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (data);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ gboolean ret;
if (priv->force_change_row)
{
GTK_STOCK_DISCARD, GTK_RESPONSE_YES, NULL);
g_free (question_dialog_primary_text);
+ ret = FALSE;
}
else
{
- return TRUE;
+ ret = TRUE;
}
- return FALSE;
+ if (account != NULL)
+ g_object_unref (account);
+
+ return ret;
}
static void
gboolean equal;
gtk_tree_model_get (model, iter,
- COL_ACCOUNT_SETTINGS_POINTER, &this_settings,
+ COL_ACCOUNT_SETTINGS, &this_settings,
-1);
equal = (this_settings == settings);
gboolean equal;
gtk_tree_model_get (model, iter,
- COL_ACCOUNT_SETTINGS_POINTER, &settings,
+ COL_ACCOUNT_SETTINGS, &settings,
-1);
equal = empathy_account_settings_has_account (settings, account);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COL_NAME, name,
COL_STATUS, TP_CONNECTION_STATUS_DISCONNECTED,
- COL_ACCOUNT_SETTINGS_POINTER, settings,
+ COL_ACCOUNT_SETTINGS, settings,
-1);
}
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COL_NAME, name,
COL_STATUS, status,
- COL_ACCOUNT_POINTER, account,
- COL_ACCOUNT_SETTINGS_POINTER, settings,
+ COL_ACCOUNT, account,
+ COL_ACCOUNT_SETTINGS, settings,
-1);
accounts_dialog_connection_changed_cb (account,
tp_account_prepare_async (account, NULL, account_prepare_cb, dialog);
}
+static void
+accounts_dialog_accounts_model_row_inserted_cb (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+ if (priv->setting_widget_object != NULL &&
+ accounts_dialog_has_valid_accounts (dialog))
+ {
+ empathy_account_widget_set_other_accounts_exist (
+ priv->setting_widget_object, TRUE);
+ }
+}
+
+static void
+accounts_dialog_accounts_model_row_deleted_cb (GtkTreeModel *model,
+ GtkTreePath *path,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+ if (priv->setting_widget_object != NULL &&
+ !accounts_dialog_has_valid_accounts (dialog))
+ {
+ empathy_account_widget_set_other_accounts_exist (
+ priv->setting_widget_object, FALSE);
+ }
+}
+
static void
accounts_dialog_account_removed_cb (TpAccountManager *manager,
TpAccount *account,
if (accounts_dialog_get_account_iter (dialog, account, &iter))
{
gtk_list_store_remove (GTK_LIST_STORE (
- gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview))), &iter);
+ gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview))), &iter);
}
}
/* 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 when disabling */
- if (!enabled)
- accounts_dialog_update_status_infobar (dialog, account);
+ /* Update the status-infobar in the details view */
+ accounts_dialog_update_status_infobar (dialog, account);
DEBUG ("Account %s is now %s",
tp_account_get_display_name (account),
}
static void
-accounts_dialog_cms_ready_cb (EmpathyConnectionManagers *cms,
- GParamSpec *pspec,
- EmpathyAccountsDialog *dialog)
+accounts_dialog_cms_prepare_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
+ EmpathyConnectionManagers *cms = EMPATHY_CONNECTION_MANAGERS (source);
+ EmpathyAccountsDialog *dialog = user_data;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- if (empathy_connection_managers_is_ready (cms))
- {
- accounts_dialog_update_settings (dialog, NULL);
+ if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
+ return;
- if (priv->initial_selection != NULL)
- {
- accounts_dialog_set_selected_account
- (dialog, priv->initial_selection);
- g_object_unref (priv->initial_selection);
- priv->initial_selection = NULL;
- }
+ accounts_dialog_update_settings (dialog, NULL);
+
+ if (priv->initial_selection != NULL)
+ {
+ accounts_dialog_set_selected_account (dialog, priv->initial_selection);
+ g_object_unref (priv->initial_selection);
+ priv->initial_selection = NULL;
}
}
g_list_free (accounts);
priv->cms = empathy_connection_managers_dup_singleton ();
- if (!empathy_connection_managers_is_ready (priv->cms))
- g_signal_connect (priv->cms, "notify::ready",
- G_CALLBACK (accounts_dialog_cms_ready_cb), dialog);
+
+ empathy_connection_managers_prepare_async (priv->cms,
+ accounts_dialog_cms_prepare_cb, dialog);
accounts_dialog_model_select_first (dialog);
}
{
gtk_widget_destroy (widget);
}
+
+ if (account != NULL)
+ g_object_unref (account);
}
}
gchar *filename;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkWidget *content_area;
- GtkWidget *action_area;
+ GtkWidget *action_area, *vbox, *hbox, *align;
filename = empathy_file_lookup ("empathy-accounts-dialog.ui", "src");
"alignment_settings", &priv->alignment_settings,
"alignment_infobar", &priv->alignment_infobar,
"treeview", &priv->treeview,
- "image_type", &priv->image_type,
- "label_name", &priv->label_name,
"button_add", &priv->button_add,
+ "button_remove", &priv->button_remove,
"button_import", &priv->button_import,
"hbox_protocol", &priv->hbox_protocol,
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,
NULL);
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-#ifdef HAVE_MOBLIN
+#ifdef HAVE_MEEGO
gtk_widget_hide (action_area);
-#endif
+ gtk_widget_hide (priv->button_remove);
+#endif /* HAVE_MEEGO */
+
+ /* Remove button is unsensitive until we have a selected account */
+ gtk_widget_set_sensitive (priv->button_remove, FALSE);
priv->combobox_protocol = empathy_protocol_chooser_new ();
gtk_box_pack_start (GTK_BOX (priv->hbox_protocol), priv->combobox_protocol,
gtk_window_set_transient_for (GTK_WINDOW (dialog),
priv->parent_window);
- /* set up spinner */
- priv->throbber = ephy_spinner_new ();
- ephy_spinner_set_size (EPHY_SPINNER (priv->throbber), GTK_ICON_SIZE_SMALL_TOOLBAR);
-
priv->infobar = gtk_info_bar_new ();
gtk_container_add (GTK_CONTAINER (priv->alignment_infobar),
priv->infobar);
gtk_widget_show (priv->infobar);
+ content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (priv->infobar));
+
+ 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);
+
+ /* 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);
+
+ /* 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);
+
+ /* set up spinner */
+ priv->throbber = ephy_spinner_new ();
+ ephy_spinner_set_size (EPHY_SPINNER (priv->throbber), GTK_ICON_SIZE_SMALL_TOOLBAR);
+
priv->image_status = gtk_image_new_from_icon_name (
empathy_icon_name_for_presence (
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);
- content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (priv->infobar));
- gtk_box_pack_start (GTK_BOX (content_area), priv->throbber,
- FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (content_area), priv->image_status,
- FALSE, FALSE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), priv->label_status);
+ 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);
/* Tweak the dialog */
gtk_window_set_title (GTK_WINDOW (dialog), _("Accounts"));
{
EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (obj);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ GtkTreeModel *model;
if (priv->dispose_has_run)
return;
priv->dispose_has_run = TRUE;
/* Disconnect signals */
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+ g_signal_handlers_disconnect_by_func (model,
+ accounts_dialog_accounts_model_row_inserted_cb, dialog);
+ g_signal_handlers_disconnect_by_func (model,
+ accounts_dialog_accounts_model_row_deleted_cb, dialog);
+
g_signal_handlers_disconnect_by_func (priv->account_manager,
accounts_dialog_account_validity_changed_cb,
dialog);
G_OBJECT_CLASS (empathy_accounts_dialog_parent_class)->dispose (obj);
}
-static GObject *
-do_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
-{
- GObject *retval;
-
- if (dialog_singleton)
- {
- retval = G_OBJECT (dialog_singleton);
- }
- else
- {
- retval =
- G_OBJECT_CLASS (empathy_accounts_dialog_parent_class)->constructor
- (type, n_props, props);
-
- dialog_singleton = EMPATHY_ACCOUNTS_DIALOG (retval);
- g_object_add_weak_pointer (retval, (gpointer) &dialog_singleton);
- }
-
- return retval;
-}
-
static void
do_get_property (GObject *object,
guint property_id,
EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (object);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
gboolean import_asked;
+ GtkTreeModel *model;
accounts_dialog_build_ui (dialog);
accounts_dialog_model_setup (dialog);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+ g_signal_connect (model, "row-inserted",
+ (GCallback) accounts_dialog_accounts_model_row_inserted_cb, dialog);
+ g_signal_connect (model, "row-deleted",
+ (GCallback) accounts_dialog_accounts_model_row_deleted_cb, dialog);
+
/* Set up signalling */
priv->account_manager = tp_account_manager_dup ();
GObjectClass *oclass = G_OBJECT_CLASS (klass);
GParamSpec *param_spec;
- oclass->constructor = do_constructor;
oclass->dispose = do_dispose;
oclass->constructed = do_constructed;
oclass->set_property = do_set_property;
return GTK_WIDGET (dialog);
}
+
+void
+empathy_accounts_dialog_show_application (GdkScreen *screen,
+ GChildWatchFunc application_exit_cb,
+ gpointer user_data,
+ TpAccount *selected_account,
+ gboolean if_needed,
+ gboolean hidden)
+{
+ gint command_pid;
+ GError *error = NULL;
+ gchar *argv[4] = { NULL, };
+ gint i = 0;
+ gchar *account_option = NULL;
+ gchar *path;
+
+ 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;
+
+ if (selected_account)
+ {
+ 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;
+ }
+
+ if (if_needed)
+ argv[i++] = "--if-needed";
+
+ if (hidden)
+ argv[i++] = "--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, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
+ &command_pid, &error);
+ if (error)
+ {
+ g_warning ("Failed to open accounts dialog: %s", error->message);
+ g_error_free (error);
+ }
+
+ /* XXX: unportable cast to GPid; then again, gdk_spawn_on_screen() seems
+ * unportable since it always takes a gint* for the PID */
+ if (application_exit_cb)
+ g_child_watch_add ((GPid) command_pid, application_exit_cb, NULL);
+
+ g_free (account_option);
+ g_free (path);
+}
projects / empathy.git / blobdiff