comparison src/oscar.c @ 1871:4836d30127df

[gaim-migrate @ 1881] i'm a moron committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 21 May 2001 05:54:26 +0000
parents a49ed23b3c02
children a02584b98823
comparison
equal deleted inserted replaced
1870:28921530e20b 1871:4836d30127df
949 if (tstconn->fd != source) 949 if (tstconn->fd != source)
950 tstconn->fd = source; 950 tstconn->fd = source;
951 951
952 aim_auth_sendcookie(sess, tstconn, tstconn->priv); 952 aim_auth_sendcookie(sess, tstconn, tstconn->priv);
953 g_free(tstconn->priv); 953 g_free(tstconn->priv);
954 tstconn->priv = NULL;
954 odata->cnpa = gdk_input_add(tstconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, 955 odata->cnpa = gdk_input_add(tstconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
955 oscar_callback, tstconn); 956 oscar_callback, tstconn);
956 debug_printf("chatnav: connected\n"); 957 debug_printf("chatnav: connected\n");
957 } 958 }
958 959
975 if (tstconn->fd != source) 976 if (tstconn->fd != source)
976 tstconn->fd = source; 977 tstconn->fd = source;
977 978
978 aim_auth_sendcookie(sess, tstconn, tstconn->priv); 979 aim_auth_sendcookie(sess, tstconn, tstconn->priv);
979 g_free(tstconn->priv); 980 g_free(tstconn->priv);
981 tstconn->priv = NULL;
980 odata->cnpa = gdk_input_add(tstconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, 982 odata->cnpa = gdk_input_add(tstconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
981 oscar_callback, tstconn); 983 oscar_callback, tstconn);
982 debug_printf("chatnav: connected\n"); 984 debug_printf("chatnav: connected\n");
983 } 985 }
984 986
1006 oscar_callback, tstconn); 1008 oscar_callback, tstconn);
1007 odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon); 1009 odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);
1008 aim_chat_attachname(tstconn, ccon->name); 1010 aim_chat_attachname(tstconn, ccon->name);
1009 aim_auth_sendcookie(sess, tstconn, ccon->priv); 1011 aim_auth_sendcookie(sess, tstconn, ccon->priv);
1010 g_free(ccon->priv); 1012 g_free(ccon->priv);
1013 ccon->priv = NULL;
1011 } 1014 }
1012 int gaim_handle_redirect(struct aim_session_t *sess, 1015 int gaim_handle_redirect(struct aim_session_t *sess,
1013 struct command_rx_struct *command, ...) { 1016 struct command_rx_struct *command, ...) {
1014 va_list ap; 1017 va_list ap;
1015 int serviceid; 1018 int serviceid;
1056 user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS], 1059 user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS],
1057 oscar_auth_connect, gc); 1060 oscar_auth_connect, gc);
1058 if (fd < 0) { 1061 if (fd < 0) {
1059 if (tstconn->priv) 1062 if (tstconn->priv)
1060 g_free(tstconn->priv); 1063 g_free(tstconn->priv);
1064 tstconn->priv = NULL;
1061 aim_conn_kill(sess, &tstconn); 1065 aim_conn_kill(sess, &tstconn);
1062 debug_printf("unable to reconnect with authorizer\n"); 1066 debug_printf("unable to reconnect with authorizer\n");
1063 g_free(host); 1067 g_free(host);
1064 return 1; 1068 return 1;
1065 } 1069 }
1081 user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS], 1085 user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS],
1082 oscar_chatnav_connect, gc); 1086 oscar_chatnav_connect, gc);
1083 if (fd < 0) { 1087 if (fd < 0) {
1084 if (tstconn->priv) 1088 if (tstconn->priv)
1085 g_free(tstconn->priv); 1089 g_free(tstconn->priv);
1090 tstconn->priv = NULL;
1086 aim_conn_kill(sess, &tstconn); 1091 aim_conn_kill(sess, &tstconn);
1087 debug_printf("unable to connect to chatnav server\n"); 1092 debug_printf("unable to connect to chatnav server\n");
1088 g_free(host); 1093 g_free(host);
1089 return 1; 1094 return 1;
1090 } 1095 }