Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/otr.c @ 1420:08f641e91f94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not use "jid" as a variable name
author Mikael Berthe <mikael@lilotux.net>
date Sun, 17 Feb 2008 19:14:56 +0100
parents 07816313073b
children a8b924b5474c
comparison
equal deleted inserted replaced
1419:fb438482b28e 1420:08f641e91f94
110 static void otr_startstop(const char * buddy, int start); 110 static void otr_startstop(const char * buddy, int start);
111 static void otr_handle_smp_tlvs(OtrlTLV * tlvs, ConnContext * ctx); 111 static void otr_handle_smp_tlvs(OtrlTLV * tlvs, ConnContext * ctx);
112 112
113 static char * otr_get_dir(void); 113 static char * otr_get_dir(void);
114 114
115 void otr_init(const char *jid) 115 void otr_init(const char *fjid)
116 { 116 {
117 char *root; 117 char *root;
118 118
119 otr_is_enabled = !!settings_opt_get_int("otr"); 119 otr_is_enabled = !!settings_opt_get_int("otr");
120 120
124 OTRL_INIT; 124 OTRL_INIT;
125 125
126 userstate = otrl_userstate_create (); 126 userstate = otrl_userstate_create ();
127 127
128 root = otr_get_dir(); 128 root = otr_get_dir();
129 account = jidtodisp(jid); 129 account = jidtodisp(fjid);
130 keyfile = g_strdup_printf("%s%s.key", root, account); 130 keyfile = g_strdup_printf("%s%s.key", root, account);
131 fprfile = g_strdup_printf("%s%s.fpr", root, account); 131 fprfile = g_strdup_printf("%s%s.fpr", root, account);
132 g_free(root); 132 g_free(root);
133 133
134 if (otrl_privkey_read(userstate, keyfile)){ 134 if (otrl_privkey_read(userstate, keyfile)){