Since ethereal is now dependent on GTK+-1.2.x (because of proto_tree and

display filter code, which uses features in GLIB-1.2.x), I removed
the vestigial code supporting old 1.0.x and 1.1.x GTK+ versions.

svn path=/trunk/; revision=360

NEWS

@@ -1,6 +1,9 @@
 Overview of changes in Ethereal 0.7.0:
 * Addition of RTSP and SDP dissectors (Jason)
 * New proto_tree and display filter system (Gilbert)
+* Updated SMB suport (Richard)
+* RADIUS dissector added (Johan)
+* Now compiles on Win32 (Gilbert)
 
 Overview of changes in Ethereal 0.6.3:
 * Capture dialogue window data bug-fix (Guy)

capture.c

@@ -1,7 +1,7 @@
 /* capture.c
  * Routines for packet capture windows
  *
- * $Id: capture.c,v 1.30 1999/07/09 04:18:32 gram Exp $
+ * $Id: capture.c,v 1.31 1999/07/13 03:08:03 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -558,15 +558,9 @@ capture(void) {
 			file_open_error_message(err, FALSE), cf.save_file);
     }
   }
-#ifdef USE_ITEM
   set_menu_sensitivity("/File/Save", TRUE);
   set_menu_sensitivity("/File/Save as", FALSE);
   set_menu_sensitivity("/Tools/Summary", TRUE);
-#else
-  set_menu_sensitivity("<Main>/File/Save", TRUE);
-  set_menu_sensitivity("<Main>/File/Save as", FALSE);
-  set_menu_sensitivity("<Main>/Tools/Summary", TRUE);
-#endif
 }
 
 static float

column.c

@@ -1,7 +1,7 @@
 /* column.c
  * Routines for handling column preferences
  *
- * $Id: column.c,v 1.15 1999/07/13 02:52:46 gram Exp $
+ * $Id: column.c,v 1.16 1999/07/13 03:08:03 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -384,11 +384,7 @@ column_prefs_show() {
   gtk_list_set_selection_mode(GTK_LIST(column_l), GTK_SELECTION_SINGLE);
   gtk_signal_connect(GTK_OBJECT(column_l), "selection_changed",
     GTK_SIGNAL_FUNC(column_sel_list_cb), main_vb);
-#ifdef GTK_HAVE_FEATURES_1_1_4
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(column_sc), column_l);
-#else
-  gtk_container_add(GTK_CONTAINER(column_sc), column_l);
-#endif
   gtk_widget_show(column_l);
 
   clp = g_list_first(prefs.col_list);

ethereal.c

@@ -1,6 +1,6 @@
 /* ethereal.c
  *
- * $Id: ethereal.c,v 1.53 1999/07/13 02:52:49 gram Exp $
+ * $Id: ethereal.c,v 1.54 1999/07/13 03:08:04 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -188,15 +188,9 @@ file_sel_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
 		cf_name);
   }
   g_free(cf_name);
-#ifdef USE_ITEM
-    set_menu_sensitivity("/File/Save", FALSE);
-    set_menu_sensitivity("/File/Save As...", TRUE);
-    set_menu_sensitivity("/Tools/Summary", TRUE);
-#else
-    set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save As...", TRUE);
-    set_menu_sensitivity("<Main>/Tools/Summary", TRUE);
-#endif
+  set_menu_sensitivity("/File/Save", FALSE);
+  set_menu_sensitivity("/File/Save As...", TRUE);
+  set_menu_sensitivity("/Tools/Summary", TRUE);
 }
 
 /* Update the progress bar */
@@ -428,15 +422,9 @@ file_open_cmd_cb(GtkWidget *w, gpointer data) {
 void
 file_close_cmd_cb(GtkWidget *widget, gpointer data) {
   close_cap_file(&cf, info_bar, file_ctx);
-#ifdef USE_ITEM
   set_menu_sensitivity("/File/Close", FALSE);
   set_menu_sensitivity("/File/Reload", FALSE);
   set_menu_sensitivity("/Tools/Summary", FALSE);
-#else
-  set_menu_sensitivity("<Main>/File/Close", FALSE);
-  set_menu_sensitivity("<Main>/File/Reload", FALSE);
-  set_menu_sensitivity("<Main>/Tools/Summary", FALSE);
-#endif
 }
 
 void
@@ -496,13 +484,8 @@ file_save_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
 		    file_open_error_message(err, FALSE), cf_name);
 	}
 
-#ifdef USE_ITEM
 	set_menu_sensitivity("/File/Save", FALSE);
 	set_menu_sensitivity("/File/Save As...", TRUE);
-#else
-	set_menu_sensitivity("<Main>/File/Save", FALSE);
-	set_menu_sensitivity("<Main>/File/Save As...", TRUE);
-#endif
 }
 
 static void
@@ -525,13 +508,8 @@ file_save_as_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
 		    file_open_error_message(err, FALSE), cf_name);
 	}
 
-#ifdef USE_ITEM
 	set_menu_sensitivity("/File/Save", FALSE);
 	set_menu_sensitivity("/File/Save As...", TRUE);
-#else
-	set_menu_sensitivity("<Main>/File/Save", FALSE);
-	set_menu_sensitivity("<Main>/File/Save As...", TRUE);
-#endif
 }
 
 /* Reload a file using the current display filter */
@@ -709,15 +687,8 @@ main(int argc, char *argv[])
   GtkWidget           *window, *main_vbox, *menubar, *u_pane, *l_pane,
                       *bv_table, *bv_hscroll, *bv_vscroll, *stat_hbox, 
                       *tv_scrollw, *filter_bt, *filter_te;
-#ifdef GTK_HAVE_FEATURES_1_1_0
   GtkAccelGroup *accel;
-#else
-  GtkAcceleratorTable *accel;
-#endif
-
-#ifdef GTK_HAVE_FEATURES_1_1_4
   GtkWidget	*packet_sw;
-#endif
   gint                 pl_size = 280, tv_size = 95, bv_size = 75;
   gchar               *rc_file, *cf_name = NULL;
   e_prefs             *prefs;
@@ -933,11 +904,7 @@ main(int argc, char *argv[])
 
   /* Menu bar */
   get_main_menu(&menubar, &accel);
-#ifdef GTK_HAVE_FEATURES_1_1_0
   gtk_window_add_accel_group(GTK_WINDOW(window), accel);
-#else
-  gtk_window_add_accelerator_table(GTK_WINDOW(window), accel);
-#endif
   gtk_box_pack_start(GTK_BOX(main_vbox), menubar, FALSE, TRUE, 0);
   gtk_widget_show(menubar);
 
@@ -955,11 +922,9 @@ main(int argc, char *argv[])
   packet_list = gtk_clist_new_with_titles(cf.cinfo.num_cols,
     cf.cinfo.col_title);
   gtk_clist_column_titles_passive(GTK_CLIST(packet_list));
-#ifdef GTK_HAVE_FEATURES_1_1_4
   packet_sw = gtk_scrolled_window_new(NULL, NULL);
   gtk_widget_show(packet_sw);
   gtk_container_add(GTK_CONTAINER(packet_sw), packet_list);
-#endif
   pl_style = gtk_style_new();
   gdk_font_unref(pl_style->font);
   pl_style->font = m_r_font;
@@ -977,11 +942,7 @@ main(int argc, char *argv[])
         GTK_JUSTIFY_RIGHT);
   }
   gtk_widget_set_usize(packet_list, -1, pl_size);
-#ifdef GTK_HAVE_FEATURES_1_1_4
   gtk_paned_add1(GTK_PANED(u_pane), packet_sw);
-#else
-  gtk_paned_add1(GTK_PANED(u_pane), packet_list);
-#endif
   gtk_widget_show(packet_list);
 
   /* Tree view */
@@ -993,12 +954,8 @@ main(int argc, char *argv[])
   gtk_widget_show(tv_scrollw);
 
   tree_view = gtk_tree_new();
-#ifdef GTK_HAVE_FEATURES_1_1_4
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tv_scrollw),
 		  tree_view);
-#else
-  gtk_container_add(GTK_CONTAINER(tv_scrollw), tree_view);
-#endif
   gtk_tree_set_selection_mode(GTK_TREE(tree_view), GTK_SELECTION_SINGLE);
   gtk_tree_set_view_lines(GTK_TREE(tree_view), FALSE);
   gtk_tree_set_view_mode(GTK_TREE(tree_view), TRUE);
@@ -1056,17 +1013,10 @@ main(int argc, char *argv[])
     GTK_SIGNAL_FUNC(filter_activate_cb), (gpointer) NULL);
   gtk_widget_show(filter_te);
 
-#ifdef USE_ITEM
   set_menu_object_data("/File/Open...", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("/File/Reload", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("/Tools/Follow TCP Stream", E_DFILTER_TE_KEY,
     filter_te);
-#else
-  set_menu_object_data("<Main>/File/Open...", E_DFILTER_TE_KEY, filter_te);
-  set_menu_object_data("<Main>/File/Reload", E_DFILTER_TE_KEY, filter_te);
-  set_menu_object_data("<Main>/Tools/Follow TCP Stream", E_DFILTER_TE_KEY,
-    filter_te);
-#endif
   info_bar = gtk_statusbar_new();
   main_ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(info_bar), "main");
   file_ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(info_bar), "file");
@@ -1095,13 +1045,8 @@ main(int argc, char *argv[])
 		cf_name);
     }
     cf_name[0] = '\0';
-#ifdef USE_ITEM
     set_menu_sensitivity("/File/Save As...", TRUE);
     set_menu_sensitivity("/Tools/Summary", TRUE);
-#else
-    set_menu_sensitivity("<Main>/File/Save As...", TRUE);
-    set_menu_sensitivity("<Main>/Tools/Summary", TRUE);
-#endif
   }
 
   /* If we failed to open the preferences file, pop up an alert box;

ethereal.h

@@ -1,7 +1,7 @@
 /* ethereal.h
  * Global defines, etc.
  *
- * $Id: ethereal.h,v 1.16 1999/07/13 02:52:49 gram Exp $
+ * $Id: ethereal.h,v 1.17 1999/07/13 03:08:04 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -73,19 +73,6 @@
   #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #endif
 
-/* Determine whether we use menu factories or item factories. This
- * code snippet is taken from cheops.h of cheops-0.57, a GPL'ed
- * network utility program Copyright (C) 1998, Mark Spencer
- */
-#if (GTK_MINOR_VERSION > 1) || ((GTK_MICRO_VERSION > 1) &&  (GTK_MINOR_VERSION > 0))
-	#define USE_ITEM
-	#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
-#else
-	#undef USE_ITEM
-	typedef void (*_GTK_MENU_FUNC_T)(GtkWidget *, void *);
-	#define GTK_MENU_FUNC(a) ((_GTK_MENU_FUNC_T)(a))
-#endif
-
 
 typedef struct _selection_info {
   GtkWidget *tree;

file.c

@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.37 1999/07/13 02:52:49 gram Exp $
+ * $Id: file.c,v 1.38 1999/07/13 03:08:05 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -238,35 +238,20 @@ load_cap_file(char *fname, capture_file *cf) {
     g_free(load_msg);
 
 /*    name_ptr[-1] = '\0';  Why is this here? It causes problems with capture files */
-#ifdef USE_ITEM
     set_menu_sensitivity("/File/Close", TRUE);
     set_menu_sensitivity("/File/Reload", TRUE);
     set_menu_sensitivity("/Tools/Summary", TRUE);
-#else
-    set_menu_sensitivity("<Main>/File/Close", TRUE);
-    set_menu_sensitivity("<Main>/File/Reload", TRUE);
-    set_menu_sensitivity("<Main>/Tools/Summary", TRUE);
-#endif
   } else {
     msg_len = strlen(name_ptr) + strlen(err_fmt) + 2;
     load_msg = g_realloc(load_msg, msg_len);
     snprintf(load_msg, msg_len, err_fmt, name_ptr);
     gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, load_msg);
     g_free(load_msg);
-#ifdef USE_ITEM
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Save", FALSE);
     set_menu_sensitivity("/File/Save As...", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
     set_menu_sensitivity("/Tools/Summary", FALSE);
-
-#else
-    set_menu_sensitivity("<Main>/File/Close", FALSE);
-    set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save As...", FALSE);
-    set_menu_sensitivity("<Main>/File/Reload", FALSE);
-    set_menu_sensitivity("<Main>/Tools/Summary", FALSE);
-#endif
   }
   return err;
 }
@@ -294,23 +279,13 @@ cap_file_input_cb (gpointer data, gint source, GdkInputCondition condition) {
 
     wtap_close(cf->wth);
     cf->wth = NULL;
-#ifdef USE_ITEM
     set_menu_sensitivity("/File/Open...", TRUE);
     set_menu_sensitivity("/File/Close", TRUE);
     set_menu_sensitivity("/File/Save As...", TRUE);
     set_menu_sensitivity("/File/Reload", TRUE);
     set_menu_sensitivity("/Capture/Start...", TRUE);
     set_menu_sensitivity("/Tools/Capture...", TRUE);
     set_menu_sensitivity("/Tools/Summary", TRUE);
-#else
-    set_menu_sensitivity("<Main>/File/Open...", TRUE);
-    set_menu_sensitivity("<Main>/File/Close", TRUE);
-    set_menu_sensitivity("<Main>/File/Save As...", TRUE);
-    set_menu_sensitivity("<Main>/File/Reload", TRUE);
-    set_menu_sensitivity("<Main>/Capture/Start...", TRUE);
-    set_menu_sensitivity("<Main>/Tools/Capture...", TRUE);
-    set_menu_sensitivity("<Main>/Tools/Summary", TRUE);
-#endif
     gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, " File: <none>");
     return;
   }
@@ -372,21 +347,12 @@ tail_cap_file(char *fname, capture_file *cf) {
   err = open_cap_file(fname, cf);
   if ((err == 0) && (cf->cd_t != WTAP_FILE_UNKNOWN)) {
 
-#ifdef USE_ITEM
     set_menu_sensitivity("/File/Open...", FALSE);
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
     set_menu_sensitivity("/Capture/Start...", FALSE);
     set_menu_sensitivity("/Tools/Capture...", FALSE);
     set_menu_sensitivity("/Tools/Summary", FALSE);
-#else
-    set_menu_sensitivity("<Main>/File/Open...", FALSE);
-    set_menu_sensitivity("<Main>/File/Close", FALSE);
-    set_menu_sensitivity("<Main>/File/Reload", FALSE);
-    set_menu_sensitivity("<Main>/Capture/Start...", FALSE);
-    set_menu_sensitivity("<Main>/Tools/Capture...", FALSE);
-    set_menu_sensitivity("<Main>/Tools/Summary", FALSE);
-#endif
 
     cf->fh = fopen(fname, "r");
     tail_timeout_id = -1;
@@ -400,19 +366,11 @@ tail_cap_file(char *fname, capture_file *cf) {
 		       " <live capture in progress>");
   }
   else {
-#ifdef USE_ITEM
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Save", FALSE);
     set_menu_sensitivity("/File/Save As...", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
     set_menu_sensitivity("/Tools/Summary", FALSE);
-#else
-    set_menu_sensitivity("<Main>/File/Close", FALSE);
-    set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save As...", FALSE);
-    set_menu_sensitivity("<Main>/File/Reload", FALSE);
-    set_menu_sensitivity("<Main>/Tools/Summary", FALSE);
-#endif
     close(sync_pipe[0]);
   }
   return err;

filter.c

@@ -1,7 +1,7 @@
 /* filter.c
  * Routines for managing filter sets
  *
- * $Id: filter.c,v 1.13 1999/07/13 02:52:50 gram Exp $
+ * $Id: filter.c,v 1.14 1999/07/13 03:08:05 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -181,12 +181,8 @@ filter_prefs_show(GtkWidget *w) {
   gtk_list_set_selection_mode(GTK_LIST(filter_l), GTK_SELECTION_SINGLE);
   gtk_signal_connect(GTK_OBJECT(filter_l), "selection_changed",
     GTK_SIGNAL_FUNC(filter_sel_list_cb), main_vb);
-#ifdef GTK_HAVE_FEATURES_1_1_4
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(filter_sc),
     filter_l);
-#else
-  gtk_container_add(GTK_CONTAINER(filter_sc), filter_l);
-#endif
   gtk_widget_show(filter_l);
 
   flp = g_list_first(fl);