*/
#include "config.h"
-
-#include <string.h>
+#include "empathy-account-chooser.h"
#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-ui-utils.h"
-#include "empathy-account-chooser.h"
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/**
* SECTION:empathy-account-chooser
{
FilterResultCallbackData *data;
+ g_return_val_if_fail (self != NULL, NULL);
+ g_return_val_if_fail (account != NULL, NULL);
+ g_return_val_if_fail (iter != NULL, NULL);
+
data = g_slice_new0 (FilterResultCallbackData);
data->self = g_object_ref (self);
data->account = g_object_ref (account);
return;
}
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
for (l = accounts; l != NULL; l = l->next)
{
self, 0);
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
if (self->priv->select_when_ready != NULL)
{
GtkCellRenderer *renderer;
GtkComboBox *combobox;
+ if (G_OBJECT_CLASS (empathy_account_chooser_parent_class)->constructed)
+ G_OBJECT_CLASS
+ (empathy_account_chooser_parent_class)->constructed (object);
+
/* Set up combo box with new store */
combobox = GTK_COMBO_BOX (self);
store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
icon_name = tp_account_get_icon_name (account);
- pixbuf = empathy_pixbuf_from_icon_name (icon_name,
+ pixbuf = tpaw_pixbuf_from_icon_name (icon_name,
GTK_ICON_SIZE_BUTTON);
gtk_list_store_set (store, iter,