aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2013-05-06 21:02:09 +0800
committerMarco Barisione <marco.barisione@collabora.co.uk>2013-08-20 18:03:05 +0800
commit88819ece017f0693803f33bb560e4d01140174c1 (patch)
treeeff64c70d25e3a59d13d74ecbb1099e6b6860890 /src
parentdc5ad68355fa55261f24098d9be184a2c6f6f459 (diff)
downloadgsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.tar
gsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.tar.gz
gsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.tar.bz2
gsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.tar.lz
gsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.tar.xz
gsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.tar.zst
gsoc2013-empathy-88819ece017f0693803f33bb560e4d01140174c1.zip
tpaw-utils: move empathy_connect_new_account to tp-aw and rename it
This commit also changes the licence of the moved code (all copyrighted by Collabora Ltd.) from GPL to LGPL. https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'src')
-rw-r--r--src/empathy-accounts-dialog.c3
-rw-r--r--src/empathy-import-widget.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 409a9ce38..bf3934502 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -29,6 +29,7 @@
#include <glib/gi18n-lib.h>
#include <tp-account-widgets/tpaw-account-widget.h>
+#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-accounts-common.h"
#include "empathy-import-dialog.h"
@@ -212,7 +213,7 @@ accounts_dialog_enable_account_cb (GObject *object,
{
am = tp_account_manager_dup ();
- empathy_connect_new_account (account, am);
+ tpaw_connect_new_account (account, am);
g_object_unref (am);
}
}
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 0103b6a8f..400a00629 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -26,6 +26,7 @@
#include "empathy-import-widget.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
@@ -169,7 +170,7 @@ import_widget_create_account_cb (GObject *source,
if (tp_account_is_enabled (account))
{
account_manager = tp_account_manager_dup ();
- empathy_connect_new_account (account, account_manager);
+ tpaw_connect_new_account (account, account_manager);
g_object_unref (account_manager);
}