[svn] Merge old trunk r2767:
Copy channel name from command on lowerTS JOIN/SJOIN, this makes the capitalization of the channel name timestamped like modes are.
This commit is contained in:
parent
f1e35c19a7
commit
1117fbd3d5
4 changed files with 25 additions and 5 deletions
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
|||
jilles 2007/04/26 23:01:16 UTC (20070426-3432)
|
||||
Log:
|
||||
Merge old trunk r2065,r2067:
|
||||
channel_modes(): get rid of the trailing space
|
||||
also make the *pbuf check work like it should
|
||||
(don't call IsMember another time if we already
|
||||
gave one parameter)
|
||||
simplify a bit more, update comments
|
||||
|
||||
|
||||
Changes: Modified:
|
||||
+13 -13 trunk/src/channel.c (File Modified)
|
||||
|
||||
|
||||
jilles 2007/04/25 15:22:28 UTC (20070425-3426)
|
||||
Log:
|
||||
webirc bugfix
|
||||
|
|
|
@ -1 +1 @@
|
|||
#define SERNO "20070425-3426"
|
||||
#define SERNO "20070426-3432"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*
|
||||
* $Id: m_join.c 3410 2007-04-14 21:53:28Z jilles $
|
||||
* $Id: m_join.c 3434 2007-04-28 23:47:25Z jilles $
|
||||
*/
|
||||
|
||||
#include "stdinc.h"
|
||||
|
@ -62,7 +62,7 @@ mapi_hlist_av1 join_hlist[] = {
|
|||
{ NULL, NULL },
|
||||
};
|
||||
|
||||
DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3410 $");
|
||||
DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3434 $");
|
||||
|
||||
static void do_join_0(struct Client *client_p, struct Client *source_p);
|
||||
static int check_channel_name_loc(struct Client *source_p, const char *name);
|
||||
|
@ -480,6 +480,9 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
|
|||
":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
|
||||
me.name, chptr->chname, chptr->chname,
|
||||
(long) oldts, (long) newts);
|
||||
/* Update capitalization in channel name, this makes the
|
||||
* capitalization timestamped like modes are -- jilles */
|
||||
strcpy(chptr->chname, parv[2]);
|
||||
if(*modebuf != '\0')
|
||||
sendto_channel_local(ALL_MEMBERS, chptr,
|
||||
":%s MODE %s %s %s",
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*
|
||||
* $Id: m_sjoin.c 3289 2007-03-28 14:21:37Z jilles $
|
||||
* $Id: m_sjoin.c 3434 2007-04-28 23:47:25Z jilles $
|
||||
*/
|
||||
|
||||
#include "stdinc.h"
|
||||
|
@ -50,7 +50,7 @@ struct Message sjoin_msgtab = {
|
|||
|
||||
mapi_clist_av1 sjoin_clist[] = { &sjoin_msgtab, NULL };
|
||||
|
||||
DECLARE_MODULE_AV1(sjoin, NULL, NULL, sjoin_clist, NULL, NULL, "$Revision: 3289 $");
|
||||
DECLARE_MODULE_AV1(sjoin, NULL, NULL, sjoin_clist, NULL, NULL, "$Revision: 3434 $");
|
||||
|
||||
/*
|
||||
* ms_sjoin
|
||||
|
@ -351,6 +351,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
|
|||
":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
|
||||
me.name, chptr->chname, chptr->chname,
|
||||
(long) oldts, (long) newts);
|
||||
/* Update capitalization in channel name, this makes the
|
||||
* capitalization timestamped like modes are -- jilles */
|
||||
strcpy(chptr->chname, parv[2]);
|
||||
}
|
||||
|
||||
if(*modebuf != '\0')
|
||||
|
|
Loading…
Reference in a new issue