Mercurial > pidgin

comparison libpurple/protocols/oscar/flap_connection.c @ 18609:2774acdb1cff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move a call to purple_connection_error() from oscar.c to flap_connection.c, where it makes more sense.
author Mark Doliner <mark@kingant.net>
date Sun, 22 Jul 2007 08:28:55 +0000
parents a244c34ce59c
children 9f3a85a59939
comparison
equal deleted inserted replaced
18608:a244c34ce59c 18609:2774acdb1cff
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 if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED) 383 if (conn->disconnect_code == 0x0001) {
384 tmp = g_strdup(_("You have signed on from another location."));
385 od->gc->wants_to_die = TRUE;
386 } else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
384 tmp = g_strdup(_("Server closed the connection.")); 387 tmp = g_strdup(_("Server closed the connection."));
385 else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION) 388 else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
386 tmp = g_strdup_printf(_("Lost connection with server:\n%s"), 389 tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
387 conn->error_message); 390 conn->error_message);
388 else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA) 391 else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)