devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Show message when removing contact from group when not in group

Browse Source
This commit is contained in:
James Booth
2013-06-23 16:35:13 +01:00
parent 265fff8f40
commit dace47e5d3
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/profanity.c
View File

@@ -149,10 +149,18 @@ prof_handle_duck_result(const char * const result)
} }
void void
prof_handle_already_in_group(const char * const barejid, prof_handle_already_in_group(const char * const contact,
const char * const group) const char * const group)
{ {
ui_contact_already_in_group(barejid, group); ui_contact_already_in_group(contact, group);
ui_current_page_off();
}
void
prof_handle_not_in_group(const char * const contact,
const char * const group)
{
ui_contact_not_in_group(contact, group);
ui_current_page_off(); ui_current_page_off();
} }

3
src/profanity.h
View File

@@ -82,6 +82,7 @@ void prof_handle_duck_help(const char * const result);
void prof_handle_duck_result(const char * const result); void prof_handle_duck_result(const char * const result);
void prof_handle_roster_add(const char * const barejid, const char * const name); void prof_handle_roster_add(const char * const barejid, const char * const name);
void prof_handle_roster_remove(const char * const barejid); void prof_handle_roster_remove(const char * const barejid);
void prof_handle_already_in_group(const char * const barejid, const char * const group); void prof_handle_already_in_group(const char * const contact, const char * const group);
void prof_handle_not_in_group(const char * const contact, const char * const group);
#endif #endif

10
src/ui/core.c
View File

@@ -456,9 +456,15 @@ ui_roster_remove(const char * const barejid)
} }
void void
ui_contact_already_in_group(const char * const barejid, const char * const group) ui_contact_already_in_group(const char * const contact, const char * const group)
{ {
cons_show("%s already in group %s", barejid, group); cons_show("%s already in group %s", contact, group);
}
void
ui_contact_not_in_group(const char * const contact, const char * const group)
{
cons_show("%s is not currently in group %s", contact, group);
} }
void void

3
src/ui/ui.h
View File

@@ -114,7 +114,8 @@ void ui_room_member_presence(const char * const room,
const char * const nick, const char * const show, const char * const status); const char * const nick, const char * const show, const char * const status);
void ui_roster_add(const char * const barejid, const char * const name); void ui_roster_add(const char * const barejid, const char * const name);
void ui_roster_remove(const char * const barejid); void ui_roster_remove(const char * const barejid);
void ui_contact_already_in_group(const char * const barejid, const char * const group); void ui_contact_already_in_group(const char * const contact, const char * const group);
void ui_contact_not_in_group(const char * const contact, const char * const group);
// contact status functions // contact status functions
void ui_status_room(const char * const contact); void ui_status_room(const char * const contact);

5
src/xmpp/roster.c
View File

@@ -326,6 +326,11 @@ roster_remove_from_group(const char * const group, const char * const barejid)
if (contact != NULL) { if (contact != NULL) {
if (!p_contact_in_group(contact, group)) { if (!p_contact_in_group(contact, group)) {
if (p_contact_name(contact) != NULL) {
prof_handle_not_in_group(p_contact_name(contact), group);
} else {
prof_handle_not_in_group(p_contact_barejid(contact), group);
}
return; return;
} }