diff libgaim/protocols/qq/group_opt.c @ 14404:8ff8f1c897b5

[gaim-migrate @ 17112] Fixed chat support. committer: Tailor Script <[e-mail]>

--- a/libgaim/protocols/qq/group_opt.c	Fri Sep 01 10:05:30 2006 +0000
+++ b/libgaim/protocols/qq/group_opt.c	Fri Sep 01 11:03:18 2006 +0000
@@ -26,9 +26,8 @@
 
 #include "buddy_info.h"
 #include "char_conv.h"
-/*#include "group_admindlg.h"	*/
 #include "group_find.h"
-#include "group_hash.h"
+#include "group_internal.h"
 #include "group_info.h"
 #include "group_join.h"
 #include "group_network.h"
@@ -108,7 +107,7 @@
 {
 	qq_group *group;
 	g_return_if_fail(g != NULL && g->gc != NULL && g->internal_group_id > 0 && g->member > 0);
-	group = qq_group_find_by_internal_group_id(g->gc, g->internal_group_id);
+	group = qq_group_find_by_id(g->gc, g->internal_group_id, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 	qq_send_cmd_group_auth(g->gc, group, QQ_GROUP_AUTH_REQUEST_REJECT, g->member, msg_utf8);
 	g_free(g);
@@ -148,7 +147,7 @@
 {
 	qq_group *group;
 	g_return_if_fail(g != NULL && g->gc != NULL && g->internal_group_id > 0 && g->member > 0);
-	group = qq_group_find_by_internal_group_id(g->gc, g->internal_group_id);
+	group = qq_group_find_by_id(g->gc, g->internal_group_id, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 	qq_send_cmd_group_auth(g->gc, group, QQ_GROUP_AUTH_REQUEST_APPROVE, g->member, "");
 	qq_group_find_or_add_member(g->gc, group, g->member);
@@ -221,7 +220,7 @@
 	g_return_if_fail(internal_group_id > 0);
 
 	/* we should have its info locally */
-	group = qq_group_find_by_internal_group_id(gc, internal_group_id);
+	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 
 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "Succeed in modify members for Qun %d\n", group->external_group_id);
@@ -290,7 +289,7 @@
 	g_return_if_fail(internal_group_id > 0);
 
 	/* we should have its info locally */
-	group = qq_group_find_by_internal_group_id(gc, internal_group_id);
+	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 
 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "Succeed in modify info for Qun %d\n", group->external_group_id);
@@ -345,10 +344,10 @@
 	qq_group *group;
 	g_return_if_fail(g != NULL && g->gc != NULL && g->uid > 0);
 
-	group = qq_group_find_by_internal_group_id(g->gc, g->uid);
+	group = qq_group_find_by_id(g->gc, g->uid, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 
-	/* XXX insert UI code here */
+	/* TODO insert UI code here */
 	/* qq_group_detail_window_show(g->gc, group); */
 	g_free(g);
 }
@@ -368,7 +367,7 @@
 	read_packet_dw(data, cursor, len, &external_group_id);
 	g_return_if_fail(internal_group_id > 0 && external_group_id);
 
-	group = qq_group_create_by_id(gc, internal_group_id, external_group_id);
+	group = qq_group_create_internal_record(gc, internal_group_id, external_group_id, NULL);
 	group->my_status = QQ_GROUP_MEMBER_STATUS_IS_ADMIN;
 	group->creator_uid = qd->uid;
 	qq_group_refresh(gc, group);
@@ -427,7 +426,7 @@
 	g_return_if_fail(internal_group_id > 0);
 
 	/* we should have its info locally */
-	group = qq_group_find_by_internal_group_id(gc, internal_group_id);
+	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 
 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "Succeed in activate Qun %d\n", group->external_group_id);
@@ -445,7 +444,7 @@
 	internal_group_id = strtol(internal_group_id_ptr, NULL, 10);
 	g_return_if_fail(internal_group_id > 0);
 
-	group = qq_group_find_by_internal_group_id(gc, internal_group_id);
+	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
 	g_return_if_fail(group != NULL);
 
 	/* XXX insert UI code here */