* Authors: Martyn Russell <martyn@imendio.com>
* Xavier Claessens <xclaesse@gmail.com>
* Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
+ * Jonathan Tellier <jonathan.tellier@gmail.com>
*/
#include <config.h>
#include <libempathy-gtk/empathy-account-widget.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-conf.h>
+#include <libempathy-gtk/empathy-images.h>
#include "empathy-accounts-dialog.h"
-#if 0
-/* FIXME MC-5 */
#include "empathy-import-dialog.h"
-#endif
+#include "empathy-import-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include <libempathy/empathy-debug.h>
GtkWidget *treeview;
GtkWidget *button_add;
- GtkWidget *button_remove;
- GtkWidget *button_import;
GtkWidget *frame_new_account;
GtkWidget *combobox_protocol;
} EmpathyAccountsDialogPriv;
enum {
- COL_ENABLED,
COL_NAME,
COL_STATUS,
COL_ACCOUNT_POINTER,
PROP_PARENT = 1
};
-static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
+static EmpathyAccountSettings * accounts_dialog_model_get_selected_settings (
+ EmpathyAccountsDialog *dialog);
+
+static void accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog);
+
+static void accounts_dialog_update (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings);
-#if 0
-/* FIXME MC-5 */
-static void accounts_dialog_button_import_clicked_cb (GtkWidget *button,
- EmpathyAccountsDialog *dialog);
-#endif
+static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
+ EmpathyAccountSettings *settings);
static void
accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
- EmpathyAccountSettings *settings)
+ const gchar *display_name)
{
gchar *text;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- text = g_markup_printf_escaped ("<big><b>%s</b></big>",
- empathy_account_settings_get_display_name (settings));
+ text = g_markup_printf_escaped ("<big><b>%s</b></big>", display_name);
gtk_label_set_markup (GTK_LABEL (priv->label_name), text);
g_free (text);
}
+static void
+empathy_account_dialog_widget_cancelled_cb (EmpathyAccountWidget *widget_object,
+ EmpathyAccountsDialog *dialog)
+{
+ GtkTreeView *view;
+ GtkTreeModel *model;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ EmpathyAccountSettings *settings;
+ EmpathyAccount *account;
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+ view = GTK_TREE_VIEW (priv->treeview);
+ selection = gtk_tree_view_get_selection (view);
+
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return;
+
+ gtk_tree_model_get (model, &iter,
+ COL_ACCOUNT_SETTINGS_POINTER, &settings,
+ COL_ACCOUNT_POINTER, &account, -1);
+
+ empathy_account_settings_discard_changes (settings);
+
+ if (account == NULL)
+ {
+ /* We were creating an account. We remove the selected row */
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+ }
+ else
+ {
+ /* We were modifying an account. We discard the changes by reloading the
+ * settings and the UI. */
+ accounts_dialog_update_settings (dialog, settings);
+ g_object_unref (account);
+ }
+
+ if (settings != NULL)
+ g_object_unref (settings);
+}
+
+static void
+empathy_account_dialog_account_created_cb (EmpathyAccountWidget *widget_object,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountSettings *settings =
+ accounts_dialog_model_get_selected_settings (dialog);
+ accounts_dialog_update_settings (dialog, settings);
+
+ if (settings)
+ g_object_unref (settings);
+}
+
static GtkWidget *
-get_account_setup_widget (EmpathyAccountSettings *settings)
+get_account_setup_widget (EmpathyAccountSettings *settings,
+ EmpathyAccountWidget **widget_object)
{
- const gchar *cm = empathy_account_settings_get_cm (settings);
const gchar *proto = empathy_account_settings_get_protocol (settings);
+ EmpathyConnectionManagers *cm =
+ empathy_connection_managers_dup_singleton ();
+ GList *cms = empathy_connection_managers_get_cms (cm);
+ GList *l;
- struct {
- const gchar *cm;
- const gchar *proto;
- } dialogs[] = {
- { "gabble", "jabber" },
- { "butterfly", "msn" },
- { "salut", "local-xmpp" },
- { "idle", "irc" },
- { "haze", "icq" },
- { "haze", "aim" },
- { "haze", "yahoo" },
- { "haze", "groupwise" },
- { "sofiasip", "sip" },
- { NULL, NULL }
- };
- int i;
-
- for (i = 0; dialogs[i].cm != NULL; i++)
+ for (l = cms; l; l = l->next)
{
- if (!tp_strdiff (cm, dialogs[i].cm)
- && !tp_strdiff (proto, dialogs[i].proto))
- return empathy_account_widget_new_for_protocol (dialogs[i].proto,
- settings);
+ TpConnectionManager *tp_cm = l->data;
+ if (tp_connection_manager_has_protocol (tp_cm, proto))
+ {
+ g_object_unref (cm);
+ *widget_object = empathy_account_widget_new_for_protocol (proto,
+ settings, FALSE);
+ return empathy_account_widget_get_widget (*widget_object);
+ }
}
- return empathy_account_widget_new_for_protocol ("generic", settings);
+ g_object_unref (cm);
+ *widget_object = empathy_account_widget_new_for_protocol ("generic", settings,
+ FALSE);
+ return empathy_account_widget_get_widget (*widget_object);
}
static void
account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
{
+ EmpathyAccountWidget *widget_object = NULL;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
gchar *icon_name;
- priv->settings_widget = get_account_setup_widget (settings);
+ priv->settings_widget = get_account_setup_widget (settings, &widget_object);
+ g_signal_connect (widget_object, "account-created",
+ G_CALLBACK (empathy_account_dialog_account_created_cb), dialog);
+ g_signal_connect (widget_object, "cancelled",
+ G_CALLBACK (empathy_account_dialog_widget_cancelled_cb), dialog);
gtk_container_add (GTK_CONTAINER (priv->alignment_settings),
priv->settings_widget);
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image_type),
icon_name, GTK_ICON_SIZE_DIALOG);
gtk_widget_set_tooltip_text (priv->image_type,
- empathy_account_settings_get_protocol (settings));
-
- accounts_dialog_update_name_label (dialog, settings);
+ empathy_protocol_name_to_display_name
+ (empathy_account_settings_get_protocol (settings)));
- g_free (icon_name);
+ accounts_dialog_update_name_label (dialog,
+ empathy_account_settings_get_display_name (settings));
}
static void
cm = empathy_protocol_chooser_dup_selected (
EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
+ if (cm == NULL)
+ return;
+
+ if (proto == NULL)
+ {
+ g_object_unref (cm);
+ return;
+ }
+
if (tp_connection_manager_protocol_can_register (proto))
{
gtk_widget_show (priv->radiobutton_register);
EmpathyAccountsDialog *dialog)
{
GtkTreeView *view;
- GtkTreeSelection *selection;
GtkTreeModel *model;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
view = GTK_TREE_VIEW (priv->treeview);
model = gtk_tree_view_get_model (view);
- selection = gtk_tree_view_get_selection (view);
- gtk_tree_selection_unselect_all (selection);
gtk_widget_set_sensitive (priv->button_add, FALSE);
- gtk_widget_set_sensitive (priv->button_remove, FALSE);
gtk_widget_hide (priv->vbox_details);
gtk_widget_hide (priv->frame_no_protocol);
gtk_widget_show (priv->frame_new_account);
if (empathy_connection_managers_get_cms_num (priv->cms) > 0)
{
/* We have no account configured but we have some
- * profiles instsalled. The user obviously wants to add
+ * 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);
gtk_widget_hide (priv->frame_new_account);
gtk_widget_show (priv->frame_no_protocol);
gtk_widget_set_sensitive (priv->button_add, FALSE);
- gtk_widget_set_sensitive (priv->button_remove, FALSE);
return;
}
gtk_widget_hide (priv->frame_no_protocol);
gtk_widget_show (priv->vbox_details);
gtk_widget_set_sensitive (priv->button_add, TRUE);
- gtk_widget_set_sensitive (priv->button_remove, TRUE);
if (priv->settings_widget)
{
icon_name = empathy_account_settings_get_icon_name (settings);
pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
- g_free (icon_name);
-
if (pixbuf)
{
if (status == TP_CONNECTION_STATUS_DISCONNECTED ||
g_object_unref (pixbuf);
}
-static void
-accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer,
- gchar *path,
- EmpathyAccountsDialog *dialog)
-{
- EmpathyAccount *account;
- GtkTreeModel *model;
- GtkTreePath *treepath;
- GtkTreeIter iter;
- gboolean enabled;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
- treepath = gtk_tree_path_new_from_string (path);
- gtk_tree_model_get_iter (model, &iter, treepath);
- gtk_tree_model_get (model, &iter,
- COL_ACCOUNT_POINTER, &account,
- -1);
- gtk_tree_path_free (treepath);
-
- if (account == NULL)
- return;
-
- enabled = empathy_account_is_enabled (account);
- empathy_account_set_enabled (account, !enabled);
-
- DEBUG ("%s account %s", enabled ? "Disabled" : "Enable",
- empathy_account_get_display_name (account));
-
- g_object_unref (account);
-}
-
static gboolean
accounts_dialog_row_changed_foreach (GtkTreeModel *model,
GtkTreePath *path,
empathy_account_settings_set_display_name_async (settings, new_text,
NULL, NULL);
+ g_object_set (settings, "display-name-overridden", TRUE, NULL);
g_object_unref (settings);
}
+static void
+accounts_dialog_delete_account_response_cb (GtkDialog *message_dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ EmpathyAccount *account;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ EmpathyAccountsDialog *account_dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (account_dialog);
+
+ if (response_id == GTK_RESPONSE_YES)
+ {
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return;
+
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
+
+ if (account != NULL)
+ {
+ empathy_account_remove_async (account, NULL, NULL);
+ g_object_unref (account);
+ }
+
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+ accounts_dialog_model_select_first (account_dialog);
+ }
+
+ gtk_widget_destroy (GTK_WIDGET (message_dialog));
+}
+
+static void
+accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell,
+ const gchar *path_string,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccount *account;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkWidget *message_dialog;
+ 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);
+
+ if (account == NULL || !empathy_account_is_valid (account))
+ {
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+ accounts_dialog_model_select_first (dialog);
+ return;
+ }
+
+ message_dialog = gtk_message_dialog_new
+ (GTK_WINDOW (priv->window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("You are about to remove your %s account!\n"
+ "Are you sure you want to proceed?"),
+ empathy_account_get_display_name (account));
+
+ gtk_message_dialog_format_secondary_text
+ (GTK_MESSAGE_DIALOG (message_dialog),
+ _("Any associated conversations and chat rooms will NOT be "
+ "removed if you decide to proceed.\n"
+ "\n"
+ "Should you decide to add the account back at a later time, "
+ "they will still be available."));
+
+ gtk_dialog_add_button (GTK_DIALOG (message_dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_NO);
+ gtk_dialog_add_button (GTK_DIALOG (message_dialog),
+ GTK_STOCK_REMOVE,
+ GTK_RESPONSE_YES);
+
+ g_signal_connect (message_dialog, "response",
+ G_CALLBACK (accounts_dialog_delete_account_response_cb), dialog);
+
+ gtk_widget_show (message_dialog);
+
+ if (account != NULL)
+ g_object_unref (account);
+}
+
static void
accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
view = GTK_TREE_VIEW (priv->treeview);
- gtk_tree_view_set_headers_visible (view, TRUE);
-
- /* Enabled column */
- cell = gtk_cell_renderer_toggle_new ();
- gtk_tree_view_insert_column_with_attributes (view, -1,
- _("Enabled"),
- cell,
- "active", COL_ENABLED,
- NULL);
- g_signal_connect (cell, "toggled",
- G_CALLBACK (accounts_dialog_enable_toggled_cb),
- dialog);
+ gtk_tree_view_set_headers_visible (view, FALSE);
/* Account column */
column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_title (column, _("Accounts"));
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_append_column (view, column);
g_signal_connect (cell, "editing-started",
G_CALLBACK (accounts_dialog_name_editing_started_cb),
dialog);
+
+ /* Delete column */
+ cell = empathy_cell_renderer_activatable_new ();
+ gtk_tree_view_column_pack_start (column, cell, FALSE);
+ g_object_set (cell,
+ "icon-name", GTK_STOCK_DELETE,
+ NULL);
+
+ g_signal_connect (cell, "path-activated",
+ G_CALLBACK (accounts_dialog_view_delete_activated_cb),
+ dialog);
}
static EmpathyAccountSettings *
is_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
settings = accounts_dialog_model_get_selected_settings (dialog);
+
+ if (settings != NULL)
+ empathy_account_settings_discard_changes (settings);
+
accounts_dialog_update_settings (dialog, settings);
- if (settings)
+ if (settings != NULL)
g_object_unref (settings);
}
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
store = gtk_list_store_new (COL_COUNT,
- G_TYPE_BOOLEAN, /* enabled */
G_TYPE_STRING, /* name */
G_TYPE_UINT, /* status */
EMPATHY_TYPE_ACCOUNT, /* account */
return FALSE;
}
-static EmpathyAccount *
-accounts_dialog_model_get_selected_account (EmpathyAccountsDialog *dialog)
-{
- GtkTreeView *view;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- EmpathyAccount *account;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- view = GTK_TREE_VIEW (priv->treeview);
- selection = gtk_tree_view_get_selection (view);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- return NULL;
-
- gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
-
- return account;
-}
-
static void
accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
gtk_tree_selection_select_iter (selection, &iter);
}
-
-static gboolean
-accounts_dialog_model_remove_selected (EmpathyAccountsDialog *dialog)
-{
- GtkTreeView *view;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- EmpathyAccount *account;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- view = GTK_TREE_VIEW (priv->treeview);
- selection = gtk_tree_view_get_selection (view);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- return FALSE;
-
- gtk_tree_model_get (model, &iter,
- COL_ACCOUNT_POINTER, &account,
- -1);
-
- if (account != NULL)
- empathy_account_remove_async (account, NULL, NULL);
-
- return gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-}
-
static void
accounts_dialog_add (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COL_ENABLED, FALSE,
COL_NAME, name,
COL_STATUS, TP_CONNECTION_STATUS_DISCONNECTED,
COL_ACCOUNT_SETTINGS_POINTER, settings,
settings = empathy_account_settings_new_for_account (account);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COL_ENABLED, enabled,
COL_NAME, name,
COL_STATUS, status,
COL_ACCOUNT_POINTER, account,
accounts_dialog_get_settings_iter (dialog, settings, &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COL_ENABLED, enabled,
COL_NAME, name,
COL_STATUS, status,
COL_ACCOUNT_POINTER, account,
gboolean enabled)
{
GtkTreeModel *model;
- GtkTreeIter iter;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
/* Update the status in the model */
DEBUG ("Account %s is now %s",
empathy_account_get_display_name (account),
enabled ? "enabled" : "disabled");
-
- if (accounts_dialog_get_account_iter (dialog, account, &iter))
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COL_ENABLED, enabled,
- -1);
}
static void
selected_settings = accounts_dialog_model_get_selected_settings (dialog);
if (settings == selected_settings)
- accounts_dialog_update_name_label (dialog, settings);
+ accounts_dialog_update_name_label (dialog,
+ empathy_account_settings_get_display_name (settings));
+
+ if (settings)
+ g_object_unref (settings);
+
+ if (selected_settings)
+ g_object_unref (selected_settings);
}
static void
EmpathyAccountsDialog *dialog)
{
EmpathyAccountSettings *settings;
- gchar *str;
+ gchar *str;
+ const gchar *display_name;
TpConnectionManager *cm;
TpConnectionManagerProtocol *proto;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
cm = empathy_protocol_chooser_dup_selected (
EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
+ display_name = empathy_protocol_name_to_display_name (proto->name);
- /* Create account */
- /* To translator: %s is the protocol name */
- str = g_strdup_printf (_("New %s account"), proto->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);
EmpathyAccountSettings *settings;
settings = accounts_dialog_model_get_selected_settings (dialog);
- accounts_dialog_update (dialog, settings);
+ accounts_dialog_update_settings (dialog, settings);
+
+ if (settings)
+ g_object_unref (settings);
}
static void
empathy_url_show (button, "ghelp:empathy?empathy-create-account");
}
-static void
-accounts_dialog_button_remove_clicked_cb (GtkWidget *button,
- EmpathyAccountsDialog *dialog)
-{
- EmpathyAccount *account;
- GtkWidget *message_dialog;
- gint res;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- account = accounts_dialog_model_get_selected_account (dialog);
-
- if (account == NULL || !empathy_account_is_valid (account))
- {
- accounts_dialog_model_remove_selected (dialog);
- accounts_dialog_model_select_first (dialog);
- return;
- }
- message_dialog = gtk_message_dialog_new
- (GTK_WINDOW (priv->window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- _("You are about to remove your %s account!\n"
- "Are you sure you want to proceed?"),
- empathy_account_get_display_name (account));
-
- gtk_message_dialog_format_secondary_text
- (GTK_MESSAGE_DIALOG (message_dialog),
- _("Any associated conversations and chat rooms will NOT be "
- "removed if you decide to proceed.\n"
- "\n"
- "Should you decide to add the account back at a later time, "
- "they will still be available."));
-
- gtk_dialog_add_button (GTK_DIALOG (message_dialog),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_NO);
- gtk_dialog_add_button (GTK_DIALOG (message_dialog),
- GTK_STOCK_REMOVE,
- GTK_RESPONSE_YES);
-
- gtk_widget_show (message_dialog);
- res = gtk_dialog_run (GTK_DIALOG (message_dialog));
-
- if (res == GTK_RESPONSE_YES)
- {
- accounts_dialog_model_remove_selected (dialog);
- accounts_dialog_model_select_first (dialog);
- }
- gtk_widget_destroy (message_dialog);
-}
-
-#if 0
-/* FIXME MC-5 */
-static void
-accounts_dialog_button_import_clicked_cb (GtkWidget *button,
- EmpathyAccountsDialog *dialog)
-{
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- empathy_import_dialog_show (GTK_WINDOW (priv->window), TRUE);
-}
-#endif
-
static void
accounts_dialog_response_cb (GtkWidget *widget,
gint response,
EmpathyAccountsDialog *dialog)
{
- GList *accounts, *l;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
if (response == GTK_RESPONSE_CLOSE)
- {
- /* Delete incomplete accounts */
- accounts = empathy_account_manager_dup_accounts
- (priv->account_manager);
- for (l = accounts; l; l = l->next)
- {
- EmpathyAccount *account;
-
- account = l->data;
- if (!empathy_account_is_valid (account))
- /* FIXME: Warn the user the account is not
- * complete and is going to be removed.
- */
- empathy_account_manager_remove
- (priv->account_manager, account);
-
- g_object_unref (account);
- }
- g_list_free (accounts);
-
- gtk_widget_destroy (widget);
- }
+ gtk_widget_destroy (widget);
}
static void
{
accounts_dialog_set_selected_account
(dialog, priv->initial_selection);
+ g_object_unref (priv->initial_selection);
priv->initial_selection = NULL;
}
}
"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,
NULL);
g_free (filename);
"button_create", "clicked", accounts_dialog_button_create_clicked_cb,
"button_back", "clicked", accounts_dialog_button_back_clicked_cb,
"button_add", "clicked", accounts_dialog_button_add_clicked_cb,
- "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
-#if 0
- /* FIXME MC-5 */
- "button_import", "clicked", accounts_dialog_button_import_clicked_cb,
-#endif
"button_help", "clicked", accounts_dialog_button_help_clicked_cb,
NULL);
g_object_unref (gui);
priv->combobox_protocol = empathy_protocol_chooser_new ();
- gtk_box_pack_end (GTK_BOX (priv->hbox_type),
+ gtk_box_pack_start (GTK_BOX (priv->hbox_type),
priv->combobox_protocol,
TRUE, TRUE, 0);
gtk_widget_show (priv->combobox_protocol);
priv->cms = NULL;
}
+ if (priv->initial_selection != NULL)
+ g_object_unref (priv->initial_selection);
+ priv->initial_selection = NULL;
+
G_OBJECT_CLASS (empathy_accounts_dialog_parent_class)->dispose (obj);
}
if (dialog_singleton)
{
retval = G_OBJECT (dialog_singleton);
+ g_object_ref (retval);
}
else
{
EMPATHY_PREFS_IMPORT_ASKED, &import_asked);
-#if 0
- /* FIXME MC-5 */
- if (empathy_import_dialog_accounts_to_import ())
+ if (empathy_import_accounts_to_import ())
{
if (!import_asked)
{
+ GtkWidget *import_dialog;
+
empathy_conf_set_bool (empathy_conf_get (),
EMPATHY_PREFS_IMPORT_ASKED, TRUE);
- empathy_import_dialog_show (GTK_WINDOW (priv->window),
+ import_dialog = empathy_import_dialog_new (GTK_WINDOW (priv->window),
FALSE);
+ gtk_widget_show (import_dialog);
}
}
- else
- {
- gtk_widget_set_sensitive (priv->button_import, FALSE);
- }
-#endif
}
static void
priv = GET_PRIV (dialog);
- if (selected_account && empathy_connection_managers_is_ready (priv->cms))
- accounts_dialog_set_selected_account (dialog, selected_account);
- else
- /* save the selection to set it later when the cms
- * becomes ready.
- */
- priv->initial_selection = selected_account;
+ if (selected_account)
+ {
+ if (empathy_connection_managers_is_ready (priv->cms))
+ accounts_dialog_set_selected_account (dialog, selected_account);
+ else
+ /* save the selection to set it later when the cms
+ * becomes ready.
+ */
+ priv->initial_selection = g_object_ref (selected_account);
+ }
gtk_window_present (GTK_WINDOW (priv->window));
projects / empathy.git / blobdiff