Add an ifdef and "dont apply patch twice".

svn path=/trunk/; revision=14563

1 files changed, 1 insertions, 95 deletions

diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c
index be5d064d4c..c8835a73b4 100644
--- a/gtk/conversations_jxta.c
+++ b/gtk/conversations_jxta.c
@@ -2,7 +2,7 @@
  * conversations_jxta  copyright (c) 2005 Mike Duigou <bondolo@jxta.org>
  * copied from conversations_sctp.c
  * 
- * $Id:$
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -93,98 +93,4 @@ register_tap_listener_jxta_conversation(void)
 
     register_conversation_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_conversation_packet);
 }
-/* conversations_jxta.c
- * conversations_jxta  copyright (c) 2005 Mike Duigou <bondolo@jxta.org>
- * copied from conversations_sctp.c
- * 
- * $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.
- */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
-#include "tap_menu.h"
-#include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
-#include <epan/dissectors/packet-jxta.h>
-
-
-static int
-jxta_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
-{
-	const jxta_tap_header *jxtahdr = (const jxta_tap_header *) vip;
-
-	add_conversation_table_data((conversations_table *)pct, 
-		&jxtahdr->src_address, 
-		&jxtahdr->dest_address, 
-		0, 
-		0, 
-		1, 
-		jxtahdr->size, 
-		SAT_NONE, 
-		PT_NONE);
-
-
-	return 1;
-}
-
-static void
-jxta_conversation_init(char *optarg)
-{
-	char *filter=NULL;
-
-	if(!strncmp(optarg,"conv,jxta,",10)){
-		filter=optarg+10;
-	} else {
-		filter=NULL;
-	}
-
-	init_conversation_table(TRUE, "JXTA", "jxta", filter, jxta_conversation_packet);
-
-}
-
-
-static void
-jxta_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-	jxta_conversation_init("conv,jxta");
-}
-
-
-void
-register_tap_listener_jxta_conversation(void)
-{
-	register_tap_listener_cmd_arg("conv,jxta", jxta_conversation_init);
-
-	register_tap_menu_item("JXTA", REGISTER_TAP_GROUP_CONVERSATION_LIST,
-	    jxta_conversation_cb, NULL, NULL, NULL);
-
-    register_conversation_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_conversation_packet);
-}