{
EmpathyAccountWidgetIrc *settings;
gchar *dir, *user_file_with_path, *global_file_with_path;
- GtkBuilder *gui;
- GtkWidget *widget;
GtkListStore *store;
GtkCellRenderer *renderer;
- gchar *filename;
settings = g_slice_new0 (EmpathyAccountWidgetIrc);
- settings->settings = g_object_ref (account_settings);
+ settings->self = self;
- dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+ dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
user_file_with_path = g_build_filename (dir, IRC_NETWORKS_FILENAME, NULL);
g_free (dir);
gboolean result;
connection = empathy_account_get_connection (account);
+ if (connection == NULL)
+ return FALSE;
+ if (connection == NULL) {
+ return FALSE;
+ }
+
contact_manager = empathy_contact_manager_dup_singleton ();
- result = empathy_contact_manager_can_add (contact_manager, connection);
+ result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
g_object_unref (contact_manager);
return result;
{
const TpConnectionManagerProtocol *proto = *iter;
gchar *icon_name;
- gchar *display_name;
+ const gchar *display_name;
+ gchar *display_name_set;
- icon_name = g_strdup_printf ("im-%s", proto->name);
+ icon_name = empathy_protocol_icon_name (proto->name);
+ display_name = protocol_chooser_proto_name_to_display_name (proto->name);
+
+ if (display_name == NULL)
+ display_name = proto->name;
if (!tp_strdiff (cm->name, "haze"))
- display_name = g_strdup_printf ("%s (Haze)", proto->name);
+ display_name_set = g_strdup_printf ("%s (Haze)", display_name);
else
- display_name = g_strdup (proto->name);
+ display_name_set = g_strdup (display_name);
gtk_list_store_insert_with_values (priv->store, NULL, 0,
COL_ICON, icon_name,
void
empathy_account_manager_create_account_async (EmpathyAccountManager *manager,
- const gchar *connection_manager,
- const gchar *protocol, const gchar *display_name,
- GHashTable *parameters, GHashTable *properties,
- GAsyncReadyCallback callback, gpointer user_data)
+ const gchar *connection_manager,
+ const gchar *protocol,
+ const gchar *display_name,
+ GHashTable *parameters,
+ GHashTable *properties,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
- GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (manager),
- callback, user_data, empathy_account_manager_create_account_finish);
+ GSimpleAsyncResult *res;
+
+ res = g_simple_async_result_new
+ (G_OBJECT (manager), callback, user_data,
+ empathy_account_manager_create_account_finish);
tp_cli_account_manager_call_create_account (priv->tp_manager,
-1,