Mercurial > pidgin.yaz

comparison libpurple/protocols/oscar/flap_connection.c @ 21358:ba41f2a60253

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename: * PurpleDisconnectReason to PurpleConnectionError; * elements of that enum from PURPLE_REASON_* to PURPLE_CONNECTION_ERROR_*; * purple_connection_reason_is_fatal to purple_connection_error_is_fatal.
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 14 Oct 2007 21:08:42 +0000
parents efa448405f3d
children 38cc722159ff
comparison
equal deleted inserted replaced
21357:5a3242b676ad 21358:ba41f2a60253
378 if (account && !account->disconnecting && 378 if (account && !account->disconnecting &&
379 ((od->oscar_connections == NULL) || (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE)))) 379 ((od->oscar_connections == NULL) || (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE))))
380 { 380 {
381 /* No more FLAP connections! Sign off this PurpleConnection! */ 381 /* No more FLAP connections! Sign off this PurpleConnection! */
382 gchar *tmp; 382 gchar *tmp;
383 PurpleDisconnectReason reason = PURPLE_REASON_NETWORK_ERROR; 383 PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
384 384
385 if (conn->disconnect_code == 0x0001) { 385 if (conn->disconnect_code == 0x0001) {
386 reason = PURPLE_REASON_NAME_IN_USE; 386 reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
387 tmp = g_strdup(_("You have signed on from another location.")); 387 tmp = g_strdup(_("You have signed on from another location."));
388 if (!purple_account_get_remember_password(account)) 388 if (!purple_account_get_remember_password(account))
389 purple_account_set_password(account, NULL); 389 purple_account_set_password(account, NULL);
390 } else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED) 390 } else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
391 tmp = g_strdup(_("Server closed the connection.")); 391 tmp = g_strdup(_("Server closed the connection."));