#include <glib/gi18n-lib.h>
#include <tp-account-widgets/tpaw-account-widget.h>
#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-user-info.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-accounts-common.h"
#include "empathy-new-account-dialog.h"
#include "empathy-pkg-kit.h"
#include "empathy-ui-utils.h"
-#include "empathy-user-info.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
return FALSE;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+ if (selection == NULL)
+ return FALSE;
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return FALSE;
gtk_window_set_resizable (GTK_WINDOW (subdialog), FALSE);
priv->setting_widget = (TpawAccountWidget *)
- tpaw_account_widget_new_for_protocol (settings, FALSE);
+ tpaw_account_widget_new_for_protocol (settings, NULL, FALSE);
g_object_add_weak_pointer (G_OBJECT (priv->setting_widget),
(gpointer *) &priv->setting_widget);
}
else if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER))
{
- empathy_launch_external_app ("gnome-credentials-panel.desktop",
+ empathy_launch_external_app ("unity-credentials-panel.desktop",
NULL, NULL);
return;
}
gtk_widget_show (priv->dialog_content);
alig = gtk_alignment_new (0.5, 0, 1, 1);
- priv->user_info = empathy_user_info_new (account);
+ priv->user_info = tpaw_user_info_new (account);
gtk_container_add (GTK_CONTAINER (alig), priv->user_info);
gtk_box_pack_start (GTK_BOX (priv->dialog_content), alig, TRUE, TRUE, 0);
gtk_widget_show (alig);
gtk_box_pack_end (GTK_BOX (priv->dialog_content), bbox, FALSE, TRUE, 0);
gtk_widget_show (bbox);
- button = gtk_button_new_with_mnemonic (_("_Edit Connection Parameters..."));
+ button = gtk_button_new_with_mnemonic (_("_Edit Connection Parameters…"));
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, TRUE, 0);
gtk_widget_show (button);
g_signal_connect_swapped (button, "clicked",
if (priv->user_info != NULL)
{
- empathy_user_info_apply_async ((EmpathyUserInfo *) priv->user_info,
+ tpaw_user_info_apply_async ((TpawUserInfo *) priv->user_info,
NULL, NULL);
priv->user_info = NULL;
}
pixbuf = g_hash_table_lookup (priv->icons_cache, icon_name);
if (pixbuf == NULL)
{
- pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+ pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
if (pixbuf == NULL)
return NULL;
if (priv->user_info != NULL)
{
- empathy_user_info_apply_async ((EmpathyUserInfo *) priv->user_info,
+ tpaw_user_info_apply_async ((TpawUserInfo *) priv->user_info,
NULL, NULL);
priv->user_info = NULL;
}
args = g_strdup_printf ("account-details=%u", g_value_get_uint (value));
}
- empathy_launch_external_app ("gnome-credentials-panel.desktop", args, NULL);
+ empathy_launch_external_app ("unity-credentials-panel.desktop", args, NULL);
g_free (args);
out: