Wireshark · Ethereal-dev: RE: [Ethereal-dev] Re: [Ethereal-cvs] cvs commit: ethereal/gtkproto_dlg.c

["Peter Kjellerstedt" <peter.kjellerstedt@xxxxxxxx>]

> -----Original Message-----
> From: ethereal-dev-bounces@xxxxxxxxxxxx 
> [mailto:ethereal-dev-bounces@xxxxxxxxxxxx] On Behalf Of Richard Sharpe
> Sent: Sunday, January 04, 2004 07:26
> To: ethereal-dev@xxxxxxxxxxxx
> Cc: ethereal-cvs@xxxxxxxxxxxx
> Subject: [Ethereal-dev] Re: [Ethereal-cvs] cvs commit: 
> ethereal/gtkproto_dlg.c
> 
> On Sat, 3 Jan 2004, Guy Harris wrote:
> 
> > guy         2004/01/03 20:24:58 CST
> > 
> >   Modified files:
> >     gtk                  proto_dlg.c 
> >   Log:
> >   A missing piece of Tadaaki Nagao's patches to add a global
"disabled
> >   protocols" file.
> >   
> >   Revision  Changes    Path
> >   1.28      +2 -2      ethereal/gtk/proto_dlg.c
> 
> Hmmm, this is strange ... I just did:
> 
>     cvs diff -r 1.28 gtk/proto_dlg.c
> 
> And got:
> 
> Index: gtk/proto_dlg.c
> ===================================================================
> RCS file: /cvsroot/ethereal/gtk/proto_dlg.c,v
> retrieving revision 1.28
> diff -r1.28 proto_dlg.c
> 3c3
> <  * $Id: proto_dlg.c,v 1.28 2004/01/04 02:24:58 guy Exp $
> ---
> >  * $Id: proto_dlg.c,v 1.27 2003/11/16 23:17:26 guy Exp $
> 
> Which suggests that the only difference between what I have 
> and what guy has is the rcs ID line ...
> 
> Regards

Which would happen if you already had the change, but forgot 
to commit it.

I get the following with 'cvs diff -u -r 1.27 -r 1.28 proto_dlg.c':

Index: proto_dlg.c
===================================================================
RCS file: /cvsroot/ethereal/gtk/proto_dlg.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- proto_dlg.c 16 Nov 2003 23:17:26 -0000      1.27
+++ proto_dlg.c 4 Jan 2004 02:24:58 -0000       1.28
@@ -1,6 +1,6 @@
 /* proto_dlg.c
  *
- * $Id: proto_dlg.c,v 1.27 2003/11/16 23:17:26 guy Exp $
+ * $Id: proto_dlg.c,v 1.28 2004/01/04 02:24:58 guy Exp $
  *
  * Laurent Deniel <laurent.deniel@xxxxxxx>
  *
@@ -567,7 +567,7 @@
 
   for (i = proto_get_first_protocol(&cookie); i != -1;
        i = proto_get_next_protocol(&cookie)) {
-      if (proto_can_disable_protocol(i)) {
+      if (proto_can_toggle_protocol(i)) {
         p = g_malloc(sizeof(protocol_data_t));
         protocol = find_protocol_by_id(i);
         p->name = proto_get_protocol_name(i);

//Peter