From d21faa46097f9a4bfcef92c9355427c103beb549 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 23:33:50 +0000 Subject: mucwin_room_disco_info takes ProfMucWin --- src/ui/mucwin.c | 64 ++++++++++++++++++++++++++++----------------------------- src/ui/ui.h | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/ui') diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index d5723fe8..279566ba 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -153,43 +153,43 @@ mucwin_room_info_error(ProfMucWin *mucwin, const char *const error) } void -mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features) +mucwin_room_disco_info(ProfMucWin *mucwin, GSList *identities, GSList *features) { - ProfWin *window = (ProfWin*)wins_get_muc(roomjid); - if (window) { - if ((identities && (g_slist_length(identities) > 0)) || - (features && (g_slist_length(features) > 0))) { - if (identities) { - win_print(window, '!', 0, NULL, 0, 0, "", "Identities:"); - } - while (identities) { - DiscoIdentity *identity = identities->data; // anme trpe, cat - GString *identity_str = g_string_new(" "); - if (identity->name) { - identity_str = g_string_append(identity_str, identity->name); - identity_str = g_string_append(identity_str, " "); - } - if (identity->type) { - identity_str = g_string_append(identity_str, identity->type); - identity_str = g_string_append(identity_str, " "); - } - if (identity->category) { - identity_str = g_string_append(identity_str, identity->category); - } - win_print(window, '!', 0, NULL, 0, 0, "", identity_str->str); - g_string_free(identity_str, TRUE); - identities = g_slist_next(identities); - } + assert(mucwin != NULL); - if (features) { - win_print(window, '!', 0, NULL, 0, 0, "", "Features:"); + ProfWin *window = (ProfWin*)mucwin; + if ((identities && (g_slist_length(identities) > 0)) || + (features && (g_slist_length(features) > 0))) { + if (identities) { + win_print(window, '!', 0, NULL, 0, 0, "", "Identities:"); + } + while (identities) { + DiscoIdentity *identity = identities->data; // anme trpe, cat + GString *identity_str = g_string_new(" "); + if (identity->name) { + identity_str = g_string_append(identity_str, identity->name); + identity_str = g_string_append(identity_str, " "); } - while (features) { - win_vprint(window, '!', 0, NULL, 0, 0, "", " %s", features->data); - features = g_slist_next(features); + if (identity->type) { + identity_str = g_string_append(identity_str, identity->type); + identity_str = g_string_append(identity_str, " "); } - win_print(window, '-', 0, NULL, 0, 0, "", ""); + if (identity->category) { + identity_str = g_string_append(identity_str, identity->category); + } + win_print(window, '!', 0, NULL, 0, 0, "", identity_str->str); + g_string_free(identity_str, TRUE); + identities = g_slist_next(identities); } + + if (features) { + win_print(window, '!', 0, NULL, 0, 0, "", "Features:"); + } + while (features) { + win_vprint(window, '!', 0, NULL, 0, 0, "", " %s", features->data); + features = g_slist_next(features); + } + win_print(window, '-', 0, NULL, 0, 0, "", ""); } } diff --git a/src/ui/ui.h b/src/ui/ui.h index b8115e8a..c7f6ec2e 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -182,7 +182,7 @@ void mucwin_info(ProfMucWin *mucwin); void mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role); void mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation); void mucwin_room_info_error(ProfMucWin *mucwin, const char *const error); -void mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features); +void mucwin_room_disco_info(ProfMucWin *mucwin, GSList *identities, GSList *features); void mucwin_occupant_kicked(const char *const roomjid, const char *const nick, const char *const actor, const char *const reason); void mucwin_occupant_banned(const char *const roomjid, const char *const nick, const char *const actor, -- cgit 1.4.1-2-gfad0 #n50'>50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203