aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-chatrooms-window.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-07-01 21:21:29 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-07-01 21:21:29 +0800
commit0a41b6b31705626c71047261b91afdac711dead7 (patch)
treee51c864f00c5966a5bcb903d2b4c35324bf968b7 /src/empathy-chatrooms-window.c
parenta980a2b3eaa634981b0ebfe950f50b515e43cf4a (diff)
parent1a74f07d19bdbdbf0aa62587343b64f636ec7b20 (diff)
downloadgsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar
gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.gz
gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.bz2
gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.lz
gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.xz
gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.zst
gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.zip
Merge branch 'empathy-account'
Diffstat (limited to 'src/empathy-chatrooms-window.c')
-rw-r--r--src/empathy-chatrooms-window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index a0fb8e6ec..3b5dd1f77 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -308,7 +308,7 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window,
GtkTreeIter iter;
GtkTreeViewColumn *column;
EmpathyAccountChooser *account_chooser;
- McAccount *account;
+ EmpathyAccount *account;
GList *chatrooms, *l;
view = GTK_TREE_VIEW (window->treeview);
@@ -506,7 +506,7 @@ chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager,
EmpathyChatroomsWindow *window)
{
EmpathyAccountChooser *account_chooser;
- McAccount *account;
+ EmpathyAccount *account;
account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);
account = empathy_account_chooser_dup_account (account_chooser);