Mercurial > pidgin
comparison src/oscar.c @ 1593:ec31e23aadc7
[gaim-migrate @ 1603]
libfaim updates and a bug fix for bad password.
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Fri, 16 Mar 2001 14:29:54 +0000 |
parents | 4fcd012c0a6a |
children | 78ec12439e0a |
comparison
equal
deleted
inserted
replaced
1592:41cecde078c1 | 1593:ec31e23aadc7 |
---|---|
530 hide_login_progress(gc, _("Authentication Failed")); | 530 hide_login_progress(gc, _("Authentication Failed")); |
531 break; | 531 break; |
532 } | 532 } |
533 debug_printf("Login Error Code 0x%04x\n", errorcode); | 533 debug_printf("Login Error Code 0x%04x\n", errorcode); |
534 debug_printf("Error URL: %s\n", errurl); | 534 debug_printf("Error URL: %s\n", errurl); |
535 aim_conn_kill(sess, &command->conn); | |
535 signoff(gc); | 536 signoff(gc); |
536 return 0; | 537 return 0; |
537 } | 538 } |
538 | 539 |
539 | 540 |
2107 return 1; | 2108 return 1; |
2108 } | 2109 } |
2109 | 2110 |
2110 static int gaim_directim_incoming(struct aim_session_t *sess, struct command_rx_struct *command, ...) { | 2111 static int gaim_directim_incoming(struct aim_session_t *sess, struct command_rx_struct *command, ...) { |
2111 va_list ap; | 2112 va_list ap; |
2112 char *sn = NULL, *msg = NULL; | 2113 char *msg = NULL; |
2113 struct aim_conn_t *conn; | 2114 struct aim_conn_t *conn; |
2115 struct aim_directim_priv *priv; | |
2114 struct gaim_connection *gc = sess->aux_data; | 2116 struct gaim_connection *gc = sess->aux_data; |
2115 | 2117 |
2116 va_start(ap, command); | 2118 va_start(ap, command); |
2117 conn = va_arg(ap, struct aim_conn_t *); | 2119 conn = va_arg(ap, struct aim_conn_t *); |
2118 sn = va_arg(ap, char *); | |
2119 msg = va_arg(ap, char *); | 2120 msg = va_arg(ap, char *); |
2120 va_end(ap); | 2121 va_end(ap); |
2121 | 2122 |
2122 debug_printf("Got DirectIM message from %s\n", sn); | 2123 if (!(priv = conn->priv)) { |
2123 | 2124 return -1; |
2124 serv_got_im(gc, sn, msg, 0); | 2125 } |
2126 | |
2127 debug_printf("Got DirectIM message from %s\n", priv->sn); | |
2128 | |
2129 serv_got_im(gc, priv->sn, msg, 0); | |
2125 | 2130 |
2126 return 1; | 2131 return 1; |
2127 } | 2132 } |
2128 | 2133 |
2129 static int gaim_directim_disconnect(struct aim_session_t *sess, struct command_rx_struct *command, ...) { | 2134 static int gaim_directim_disconnect(struct aim_session_t *sess, struct command_rx_struct *command, ...) { |
2156 return 1; | 2161 return 1; |
2157 } | 2162 } |
2158 | 2163 |
2159 static int gaim_directim_typing(struct aim_session_t *sess, struct command_rx_struct *command, ...) { | 2164 static int gaim_directim_typing(struct aim_session_t *sess, struct command_rx_struct *command, ...) { |
2160 va_list ap; | 2165 va_list ap; |
2161 char *sn; | 2166 struct aim_conn_t *conn; |
2162 | 2167 struct aim_directim_priv *priv; |
2163 va_start(ap, command); | 2168 |
2164 sn = va_arg(ap, char *); | 2169 va_start(ap, command); |
2165 va_end(ap); | 2170 conn = va_arg(ap, struct aim_conn_t *); |
2171 va_end(ap); | |
2172 | |
2173 if (!(priv = conn->priv)) { | |
2174 return -1; | |
2175 } | |
2166 | 2176 |
2167 /* I had to leave this. It's just too funny. It reminds me of my sister. */ | 2177 /* I had to leave this. It's just too funny. It reminds me of my sister. */ |
2168 debug_printf("ohmigod! %s has started typing (DirectIM). He's going to send you a message! *squeal*\n", sn); | 2178 debug_printf("ohmigod! %s has started typing (DirectIM). He's going to send you a message! *squeal*\n", priv->sn); |
2169 | 2179 |
2170 return 1; | 2180 return 1; |
2171 } | 2181 } |
2172 | 2182 |
2173 struct ask_do_dir_im { | 2183 struct ask_do_dir_im { |