comparison: src/protocols/silc/silc.c
src/protocols/silc/silc.c
- changeset 10246
- aa5bff72f94c
- parent 10225
- 0dfea1bc8695
- child 10341
- 92c66f97b73f
equal
deleted
inserted
replaced
| 10245:81654bee87e8 | 10246:aa5bff72f94c |
|---|---|
| 840 SilcGaimIM im = context; | 840 SilcGaimIM im = context; |
| 841 GaimConversation *convo; | 841 GaimConversation *convo; |
| 842 char tmp[256], *nickname = NULL; | 842 char tmp[256], *nickname = NULL; |
| 843 SilcClientEntry client_entry; | 843 SilcClientEntry client_entry; |
| 844 | 844 |
| 845 convo = gaim_find_conversation_with_account(im->nick, sg->account); | 845 convo = gaim_find_conversation_with_account(GAIM_CONV_IM, im->nick, |
| 846 sg->account); | |
| 846 if (!convo) | 847 if (!convo) |
| 847 return; | 848 return; |
| 848 | 849 |
| 849 if (!clients) | 850 if (!clients) |
| 850 goto err; | 851 goto err; |
| 977 | 978 |
| 978 if (gc == NULL) | 979 if (gc == NULL) |
| 979 return GAIM_CMD_RET_FAILED; | 980 return GAIM_CMD_RET_FAILED; |
| 980 | 981 |
| 981 if(args && args[0]) { | 982 if(args && args[0]) { |
| 982 convo = gaim_find_conversation_with_account(args[0], gc->account); | 983 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], |
| 984 gc->account); | |
| 983 } else | 985 } else |
| 984 convo = conv; | 986 convo = conv; |
| 985 | |
| 986 if (gaim_conversation_get_type(convo) != GAIM_CONV_CHAT) { | |
| 987 *error = g_strdup(_("Failed to leave channel")); | |
| 988 return GAIM_CMD_RET_FAILED; | |
| 989 } | |
| 990 | 987 |
| 991 id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)); | 988 id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)); |
| 992 | 989 |
| 993 if (id == 0) | 990 if (id == 0) |
| 994 return GAIM_CMD_RET_FAILED; | 991 return GAIM_CMD_RET_FAILED; |
