A patch spread across many files to let Ethereal compile under GTK+-1.1.x.

Tests for GTK versions are done during compilation, not during "./configure".
The big problems have been taken care of in this patch (functional change
in the packet clist and conversion of menu_factory to item_factory), but
plenty of smaller problems with dialogue boxes abound. I have fixed
a small problem with file_open*(), but have left 2 comments in just in case
I'm not going about this the right way. Can someone verify?

svn path=/trunk/; revision=127

1 files changed, 12 insertions, 2 deletions

diff --git a/file.c b/file.c
index c6ccb305ea..8484751721 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.13 1998/11/17 04:28:46 gerald Exp $
+ * $Id: file.c,v 1.14 1998/12/17 05:42:23 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -56,8 +56,8 @@
 # include <netinet/in.h>
 #endif
 
-#include "menu.h"
 #include "ethereal.h"
+#include "menu.h"
 #include "packet.h"
 #include "file.h"
 #include "util.h"
@@ -294,16 +294,26 @@ load_cap_file(char *fname, capture_file *cf) {
     g_free(load_msg);
 
     name_ptr[-1] = '\0';
+#ifdef USE_ITEM
+    set_menu_sensitivity("/File/Close", TRUE);
+    set_menu_sensitivity("/File/Reload", TRUE);
+#else
     set_menu_sensitivity("<Main>/File/Close", TRUE);
     set_menu_sensitivity("<Main>/File/Reload", 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("<Main>/File/Close", FALSE);
     set_menu_sensitivity("<Main>/File/Reload", FALSE);
+#else
+    set_menu_sensitivity("<Main>/File/Close", FALSE);
+    set_menu_sensitivity("<Main>/File/Reload", FALSE);
+#endif
   }
 
   return err;