As the gtk2 directory is no longer needed (GTK1 and 2 are using the same sources...

[obnox/wireshark/wip.git] / packet-data.c

diff --git a/packet-data.c b/packet-data.c
index 7b01c9504f9b33098969acb52b795e93b7798547..29c190e524fde0ec691b584a32ce3dc7f7c12e25 100644 (file)
--- a/packet-data.c
+++ b/packet-data.c
@@ -2,22 +2,22 @@
  * Routines for raw data (default case)
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-data.c,v 1.28 2002/04/04 05:16:14 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -27,12 +27,9 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <glib.h>
 #include <epan/packet.h>
+#include "packet-data.h"
 
 /* proto_data cannot be static because it's referenced in the
  * print routines
@@ -40,7 +37,7 @@
 int proto_data = -1;
 
 static void
-dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
+dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
 {
        int bytes;
 
@@ -70,5 +67,5 @@ proto_register_data(void)
         * "Data" is used to dissect something whose normal dissector
         * is disabled, so it cannot itself be disabled.
         */
-       proto_set_cant_disable(proto_data);
+       proto_set_cant_toggle(proto_data);
 }