diff libpurple/protocols/qq/group_join.c @ 24021:6408be948d56

disapproval of revision '92d52eef2994d2697999177804e3665989cfa352'

--- a/libpurple/protocols/qq/group_join.c	Thu Sep 11 13:29:26 2008 +0000
+++ b/libpurple/protocols/qq/group_join.c	Mon Sep 15 03:03:59 2008 +0000
@@ -65,7 +65,7 @@
 }
 
 /* send packet to join a group without auth */
-void qq_request_room_join(PurpleConnection *gc, qq_group *group)
+void qq_send_cmd_group_join_group(PurpleConnection *gc, qq_group *group)
 {
 	g_return_if_fail(group != NULL);
 
@@ -79,12 +79,8 @@
 	case QQ_ROOM_AUTH_TYPE_NEED_AUTH:
 		break;
 	case QQ_ROOM_AUTH_TYPE_NO_ADD:
-		if (group->my_role == QQ_ROOM_ROLE_NO
-				&& group->my_role == QQ_ROOM_ROLE_REQUESTING) {
-			purple_notify_warning(gc, NULL, _("The Qun does not allow others to join"), NULL);
-			return;
-		}
-		break;
+		purple_notify_warning(gc, NULL, _("The Qun does not allow others to join"), NULL);
+		return;
 	default:
 		purple_debug_error("QQ", "Unknown room auth type: %d\n", group->auth_type);
 		break;
@@ -249,8 +245,7 @@
 		qq_group_refresh(gc, group);
 		/* this must be shown before getting online members */
 		qq_group_conv_show_window(gc, group);
-		/* qq_update_room(gc, 0, group->id); */
-		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_ONLINES, group->id);
+		qq_room_update(gc, 0, group->id);
 		break;
 	case QQ_ROOM_JOIN_NEED_AUTH:
 		purple_debug_info("QQ",
@@ -290,7 +285,7 @@
 
 	group = qq_room_search_ext_id(gc, ext_id);
 	if (group) {
-		qq_request_room_join(gc, group);
+		qq_send_cmd_group_join_group(gc, group);
 	} else {
 		qq_set_pending_id(&qd->joining_groups, ext_id, TRUE);
 		qq_send_cmd_group_search_group(gc, ext_id);