Mercurial > hg
changeset 652:b243d3b3ff1b
We do not need buddy_isresource() anymore
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 07 Jan 2006 10:56:46 +0100 |
parents | 936df057dda0 |
children | d5db5be78eb0 |
files | mcabber/src/commands.c mcabber/src/jabglue.c mcabber/src/roster.c mcabber/src/roster.h mcabber/src/screen.c |
diffstat | 5 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/src/commands.c Sat Jan 07 10:32:55 2006 +0100 +++ b/mcabber/src/commands.c Sat Jan 07 10:56:46 2006 +0100 @@ -598,7 +598,7 @@ if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM) { // This is a chatroom // If there are resources, we haven't left - if (buddy_isresource(BUDDATA(current_buddy))) { + if (buddy_getinsideroom(BUDDATA(current_buddy))) { scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); return; } @@ -1541,7 +1541,7 @@ } // Quick check: if there are resources, we haven't left - if (buddy_isresource(bud)) { + if (buddy_getinsideroom(bud)) { scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); return; }
--- a/mcabber/src/jabglue.c Sat Jan 07 10:32:55 2006 +0100 +++ b/mcabber/src/jabglue.c Sat Jan 07 10:56:46 2006 +0100 @@ -240,7 +240,7 @@ char *to; struct T_presence *pres = presencedata; - if (!buddy_isresource(room)) + if (!buddy_getinsideroom(room)) return; jid = buddy_getjid(room);
--- a/mcabber/src/roster.c Sat Jan 07 10:32:55 2006 +0100 +++ b/mcabber/src/roster.c Sat Jan 07 10:56:46 2006 +0100 @@ -1004,6 +1004,7 @@ return reslist; } +/* // buddy_isresource(roster_data) // Return true if there is at least one resource // (which means, for a room, that it isn't empty) @@ -1016,6 +1017,7 @@ return TRUE; return FALSE; } +*/ // buddy_resource_setname(roster_data, oldname, newname) // Useful for nickname change in a MUC room
--- a/mcabber/src/roster.h Sat Jan 07 10:32:55 2006 +0100 +++ b/mcabber/src/roster.h Sat Jan 07 10:56:46 2006 +0100 @@ -123,7 +123,7 @@ const char *buddy_getstatusmsg(gpointer rosterdata, const char *resname); time_t buddy_getstatustime(gpointer rosterdata, const char *resname); gchar buddy_getresourceprio(gpointer rosterdata, const char *resname); -int buddy_isresource(gpointer rosterdata); +//int buddy_isresource(gpointer rosterdata); GSList *buddy_getresources(gpointer rosterdata); void buddy_resource_setname(gpointer rosterdata, const char *resname, const char *newname);