Mercurial > pidgin.yaz
comparison libpurple/protocols/qq/group.c @ 21570:dccfd999ffe7
merge of '76c07fcb434a2a7aa289734bb221c171a376d73b'
and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sat, 17 Nov 2007 17:27:48 +0000 |
parents | a20ef7180680 |
children | 5f454b975a99 |
comparison
equal
deleted
inserted
replaced
21325:d7a43e142c6e | 21570:dccfd999ffe7 |
---|---|
114 | 114 |
115 fields = g_list_append(fields, f); | 115 fields = g_list_append(fields, f); |
116 purple_roomlist_set_fields(rl, fields); | 116 purple_roomlist_set_fields(rl, fields); |
117 purple_roomlist_set_in_progress(qd->roomlist, TRUE); | 117 purple_roomlist_set_in_progress(qd->roomlist, TRUE); |
118 | 118 |
119 purple_request_input_with_hint(gc, _("QQ Qun"), | 119 purple_request_input(gc, _("QQ Qun"), |
120 _("Please enter external group ID"), | 120 _("Please enter external group ID"), |
121 _("You can only search for permanent QQ groups\n"), | 121 _("You can only search for permanent QQ groups\n"), |
122 NULL, FALSE, FALSE, NULL, | 122 NULL, FALSE, FALSE, NULL, |
123 _("Search"), G_CALLBACK(_qq_group_search_callback), | 123 _("Search"), G_CALLBACK(_qq_group_search_callback), |
124 _("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback), | 124 _("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback), |
125 purple_connection_get_account(gc), NULL, NULL, | 125 purple_connection_get_account(gc), NULL, NULL, |
126 PURPLE_REQUEST_UI_HINT_CONV, gc); | 126 gc); |
127 | 127 |
128 return qd->roomlist; | 128 return qd->roomlist; |
129 } | 129 } |
130 | 130 |
131 /* free roomlist space, I have no idea when this one is called ... */ | 131 /* free roomlist space, I have no idea when this one is called ... */ |