Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/otr.c @ 1729:e6e89b1d7831

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor style and header updates
author Mikael Berthe <mikael@lilotux.net>
date Sun, 28 Feb 2010 15:19:27 +0100
parents 41c26b7d2890
children e4378fbab5d7
comparison
equal deleted inserted replaced
1728:15b3834cbe5f 1729:e6e89b1d7831
117 117
118 void otr_init(const char *fjid) 118 void otr_init(const char *fjid)
119 { 119 {
120 char *root; 120 char *root;
121 121
122 if (userstate) //already initialised 122 if (userstate) // already initialised
123 return; 123 return;
124 124
125 otr_is_enabled = !!settings_opt_get_int("otr"); 125 otr_is_enabled = !!settings_opt_get_int("otr");
126 126
127 if (!otr_is_enabled) 127 if (!otr_is_enabled)
165 * is linked to both gnutls and libotr, libgcrypt will 165 * is linked to both gnutls and libotr, libgcrypt will
166 * segfault when we call otrl_userstate_free(). 166 * segfault when we call otrl_userstate_free().
167 * This is reported to be a bug in libgcrypt :-/ 167 * This is reported to be a bug in libgcrypt :-/
168 * Mikael 168 * Mikael
169 */ 169 */
170 #if defined(HAVE_GNUTLS) && !defined(HAVE_OPENSSL) //TODO: broken now 170 #if defined(HAVE_GNUTLS) && !defined(HAVE_OPENSSL) // TODO: broken now
171 if (!settings_opt_get_int("ssl")) 171 if (!settings_opt_get_int("ssl"))
172 #endif 172 #endif
173 otrl_userstate_free(userstate); 173 otrl_userstate_free(userstate);
174 174
175 userstate = NULL; 175 userstate = NULL;