Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/main.c @ 1058:c0d44a9a99bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code cleanup Cosmetics. Mostly get rid of "jid" variables, as it is a structure pointer defined in libjabber/jabber.h.
author Mikael Berthe <mikael@lilotux.net>
date Thu, 30 Nov 2006 19:51:09 +0100
parents 1ec7ec9bda60
children 230dca34dbea
comparison
equal deleted inserted replaced
1057:4cdf19d9c74e 1058:c0d44a9a99bc
65 65
66 void mcabber_connect(void) 66 void mcabber_connect(void)
67 { 67 {
68 const char *username, *password, *resource, *servername; 68 const char *username, *password, *resource, *servername;
69 const char *proxy_host; 69 const char *proxy_host;
70 char *jid; 70 char *bjid;
71 int ssl; 71 int ssl;
72 int sslverify = -1; 72 int sslverify = -1;
73 const char *sslvopt = NULL, *cafile = NULL, *capath = NULL, *ciphers = NULL; 73 const char *sslvopt = NULL, *cafile = NULL, *capath = NULL, *ciphers = NULL;
74 unsigned int port; 74 unsigned int port;
75 75
133 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " using proxy %s:%d", 133 scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " using proxy %s:%d",
134 proxy_host, proxy_port); 134 proxy_host, proxy_port);
135 } 135 }
136 } 136 }
137 137
138 jid = compose_jid(username, servername, resource); 138 bjid = compose_jid(username, servername, resource);
139 jc = jb_connect(jid, servername, port, ssl, password); 139 jc = jb_connect(bjid, servername, port, ssl, password);
140 g_free(jid); 140 g_free(bjid);
141 141
142 if (!jc) 142 if (!jc)
143 scr_LogPrint(LPRINT_LOGNORM, "Error connecting to (%s)", servername); 143 scr_LogPrint(LPRINT_LOGNORM, "Error connecting to (%s)", servername);
144 144
145 jb_reset_keepalive(); 145 jb_reset_keepalive();