# HG changeset patch # User Mikael Berthe # Date 1203272096 -3600 # Node ID 08f641e91f945385b70c7ccd3eeb3a6846dc5ce6 # Parent fb438482b28e27048564bc06ce19ee340814e613 Do not use "jid" as a variable name diff -r fb438482b28e -r 08f641e91f94 mcabber/src/otr.c --- a/mcabber/src/otr.c Tue Feb 12 20:32:37 2008 +0100 +++ b/mcabber/src/otr.c Sun Feb 17 19:14:56 2008 +0100 @@ -112,7 +112,7 @@ static char * otr_get_dir(void); -void otr_init(const char *jid) +void otr_init(const char *fjid) { char *root; @@ -126,7 +126,7 @@ userstate = otrl_userstate_create (); root = otr_get_dir(); - account = jidtodisp(jid); + account = jidtodisp(fjid); keyfile = g_strdup_printf("%s%s.key", root, account); fprfile = g_strdup_printf("%s%s.fpr", root, account); g_free(root);