aboutsummaryrefslogtreecommitdiffstats
path: root/megaphone
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-07-30 23:35:38 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-07-30 23:35:38 +0800
commitc9ef23052d2e5007e6120dcc881d6c382fcf48d3 (patch)
tree04092618e0d66d391e2f0b8cf6c190e4b45fb84e /megaphone
parent237c4ac2d8d1b008a0c34aa24fc63eb3a1c0c91d (diff)
downloadgsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.tar
gsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.tar.gz
gsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.tar.bz2
gsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.tar.lz
gsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.tar.xz
gsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.tar.zst
gsoc2013-empathy-c9ef23052d2e5007e6120dcc881d6c382fcf48d3.zip
Chang the API of AccountManager to have the get lookup the account by name
EmpathyAccountManager used to have a _lookup function that looked up accounts by name and a _get function that lookup up accounts by connection. This is confusing, as looking up an account for a connection is less common rename have the _get_account be the same _lookup (but without returning a ref) and add a _get_account_for_connection function lookup by account
Diffstat (limited to 'megaphone')
-rw-r--r--megaphone/src/megaphone-applet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index 1ef88ebc1..c269c7c7d 100644
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -443,7 +443,7 @@ megaphone_applet_set_contact (MegaphoneApplet *applet,
/* Lookup the new contact */
if (str) {
strv = g_strsplit (str, "/", 2);
- priv->account = empathy_account_manager_lookup (priv->account_manager,
+ priv->account = empathy_account_manager_get_account (priv->account_manager,
strv[0]);
priv->id = strv[1];
g_free (strv[0]);
@@ -451,6 +451,7 @@ megaphone_applet_set_contact (MegaphoneApplet *applet,
}
if (priv->account) {
+ g_object_ref (priv->account);
connection = empathy_account_get_connection (priv->account);
if (connection) {
megaphone_applet_new_connection_cb (priv->account_manager,