/* empathy-import-widget.c */
-#include "empathy-import-dialog.h"
+#include "config.h"
#include "empathy-import-widget.h"
-#include "empathy-import-pidgin.h"
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
-#include <glib/gi18n.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT)
};
enum {
- PROP_APPLICATION_ID = 1
+ PROP_APPLICATION_ID = 1,
+ PROP_CMS
};
typedef struct {
GtkWidget *vbox;
GtkWidget *treeview;
+ GtkWidget *scrolledwindow;
GList *accounts;
EmpathyImportApplication app_id;
- EmpathyConnectionManagers *cms;
+ TpawConnectionManagers *cms;
gboolean dispose_run;
} EmpathyImportWidgetPriv;
return FALSE;
}
+#define MAX_TREEVIEW_HEIGHT 300
+
static void
-account_manager_prepared_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+import_widget_add_accounts_to_model (EmpathyImportWidget *self)
{
- TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
- EmpathyImportWidget *self = user_data;
+ TpAccountManager *manager;
GtkTreeModel *model;
- GtkTreeIter iter;
GList *l;
EmpathyImportWidgetPriv *priv = GET_PRIV (self);
- GError *error = NULL;
+ gint min, natural;
- if (!tp_account_manager_prepare_finish (manager, result, &error))
- {
- DEBUG ("Failed to prepare account manager: %s", error->message);
- g_error_free (error);
- return;
- }
+ manager = tp_account_manager_dup ();
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
value = g_hash_table_lookup (data->settings, "account");
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
/* Only set the "Import" cell to be active if there isn't already an
* account set up with the same account id. */
import = !import_widget_account_id_in_list (accounts,
g_value_get_string (value));
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ gtk_list_store_insert_with_values (GTK_LIST_STORE (model), NULL, -1,
COL_IMPORT, import,
COL_PROTOCOL, data->protocol,
COL_NAME, g_value_get_string (value),
COL_SOURCE, data->source,
COL_ACCOUNT_DATA, data,
-1);
- }
-}
-static void
-import_widget_add_accounts_to_model (EmpathyImportWidget *self)
-{
- TpAccountManager *manager;
-
- manager = tp_account_manager_dup ();
+ }
- tp_account_manager_prepare_async (manager, NULL,
- account_manager_prepared_cb, self);
+ /* Display as much rows as possible */
+ gtk_widget_get_preferred_height (priv->treeview, &min, &natural);
+ gtk_widget_set_size_request (priv->scrolledwindow, -1,
+ MIN (natural, MAX_TREEVIEW_HEIGHT));
g_object_unref (manager);
}
GAsyncResult *result,
gpointer user_data)
{
+ TpAccountManager *account_manager;
TpAccount *account;
GError *error = NULL;
EmpathyImportWidget *self = user_data;
DEBUG ("account created\n");
+ if (tp_account_is_enabled (account))
+ {
+ account_manager = tp_account_manager_dup ();
+ tpaw_connect_new_account (account, account_manager);
+ g_object_unref (account_manager);
+ }
+
g_object_unref (self);
}
EmpathyImportAccountData *data)
{
TpAccountManager *account_manager;
- gchar *display_name;
+ gchar *display_name = NULL;
GHashTable *properties;
GValue *username;
/* Set the display name of the account */
username = g_hash_table_lookup (data->settings, "account");
- display_name = g_strdup_printf ("%s (%s)",
- data->protocol,
- g_value_get_string (username));
+
+ if (!tp_strdiff (data->protocol, "irc"))
+ {
+ const gchar *server;
+
+ server = tp_asv_get_string (data->settings, "server");
+
+ if (server != NULL)
+ display_name = g_strdup_printf ("%s on %s",
+ g_value_get_string (username), server);
+ }
+
+ if (display_name == NULL)
+ {
+ display_name = g_strdup_printf ("%s (%s)",
+ data->protocol, g_value_get_string (username));
+ }
DEBUG ("display name: %s\n", display_name);
- properties = g_hash_table_new (NULL, NULL);
+ properties = tp_asv_new (NULL, NULL);
+ tp_asv_set_boolean (properties, TP_IFACE_ACCOUNT ".Enabled", data->enabled);
tp_account_manager_create_account_async (account_manager,
(const gchar*) data->connection_manager, data->protocol, display_name,
import_widget_add_accounts_to_model (self);
}
-static void
-import_widget_cms_ready_cb (EmpathyConnectionManagers *cms,
- const GError *error,
- gpointer user_data)
-{
- EmpathyImportWidget *self = user_data;
-
- if (error != NULL)
- return;
-
- import_widget_set_up_account_list (self);
-}
-
static void
import_widget_destroy_cb (GtkWidget *w,
EmpathyImportWidget *self)
case PROP_APPLICATION_ID:
g_value_set_int (value, priv->app_id);
break;
+ case PROP_CMS:
+ g_value_set_object (value, priv->cms);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
case PROP_APPLICATION_ID:
priv->app_id = g_value_get_int (value);
break;
+ case PROP_CMS:
+ priv->cms = g_value_dup_object (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
gchar *filename;
filename = empathy_file_lookup ("empathy-import-dialog.ui", "src");
- gui = empathy_builder_get_file (filename,
+ gui = tpaw_builder_get_file (filename,
"widget_vbox", &priv->vbox,
"treeview", &priv->treeview,
+ "scrolledwindow", &priv->scrolledwindow,
NULL);
g_free (filename);
- empathy_builder_unref_and_keep_widget (gui, priv->vbox);
+ tpaw_builder_unref_and_keep_widget (gui, priv->vbox);
g_signal_connect (priv->vbox, "destroy",
G_CALLBACK (import_widget_destroy_cb), self);
- empathy_connection_managers_call_when_ready (priv->cms,
- import_widget_cms_ready_cb, self);
+ import_widget_set_up_account_list (self);
}
static void
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (oclass, PROP_APPLICATION_ID, param_spec);
+ param_spec = g_param_spec_object ("cms",
+ "TpawConnectionManagers", "TpawConnectionManagers",
+ TPAW_TYPE_CONNECTION_MANAGERS,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+ g_object_class_install_property (oclass, PROP_CMS, param_spec);
+
g_type_class_add_private (klass, sizeof (EmpathyImportWidgetPriv));
}
EmpathyImportWidgetPriv);
self->priv = priv;
-
- priv->cms = empathy_connection_managers_dup_singleton ();
}
EmpathyImportWidget *
-empathy_import_widget_new (EmpathyImportApplication id)
+empathy_import_widget_new (EmpathyImportApplication id,
+ TpawConnectionManagers *cms)
{
- return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET, "application-id", id, NULL);
+ g_return_val_if_fail (TPAW_IS_CONNECTION_MANAGERS (cms), NULL);
+
+ return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET,
+ "application-id", id,
+ "cms", cms,
+ NULL);
}
GtkWidget *
projects / empathy.git / blobdiff