diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | capture.c | 8 | ||||
| -rw-r--r-- | column.c | 6 | ||||
| -rw-r--r-- | ethereal.c | 63 | ||||
| -rw-r--r-- | ethereal.h | 15 | ||||
| -rw-r--r-- | file.c | 44 | ||||
| -rw-r--r-- | filter.c | 6 | ||||
| -rw-r--r-- | menu.c | 196 | ||||
| -rw-r--r-- | menu.h | 7 | ||||
| -rw-r--r-- | summary.c | 9 | ||||
| -rw-r--r-- | summary.h | 4 |
11 files changed, 20 insertions, 341 deletions
@@ -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) @@ -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 @@ -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); diff --git a/ethereal.c b/ethereal.c index c1e9b8cc67..8348c72fdd 100644 --- a/ethereal.c +++ b/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; diff --git a/ethereal.h b/ethereal.h index 5849e89601..f1c739e5ad 100644 --- a/ethereal.h +++ b/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; @@ -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,7 +279,6 @@ 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); @@ -302,15 +286,6 @@ cap_file_input_cb (gpointer data, gint source, GdkInputCondition condition) { 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; @@ -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); @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.24 1999/07/09 04:18:35 gram Exp $ + * $Id: menu.c,v 1.25 1999/07/13 03:08:06 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -46,13 +46,7 @@ #include "print.h" #include "follow.h" -/* Much of this was take from the GTK+ tuturial at http://www.gtk.org */ -#ifndef USE_ITEM -static void menus_remove_accel (GtkWidget *, gchar *, gchar *); -static gint menus_install_accel (GtkWidget *, gchar *, gchar, gchar, gchar *); -#endif -#ifdef USE_ITEM GtkAccelGroup *grp; /* This is the GtkItemFactoryEntry structure used to generate new menus. Item 1: The menu path. The letter after the underscore indicates an @@ -114,103 +108,34 @@ static GtkItemFactoryEntry menu_items[] = {"/_Help", NULL, NULL, 0, "<LastBranch>" }, {"/Help/_About Ethereal...", NULL, GTK_MENU_FUNC(about_ethereal), 0, NULL} }; -#else -/* this is the GtkMenuEntry structure used to create new menus. The - * first member is the menu definition string. The second, the - * default accelerator key used to access this menu function with - * the keyboard. The third is the callback function to call when - * this menu item is selected (by the accelerator key, or with the - * mouse.) The last member is the data to pass to your callback function. - */ -static GtkMenuEntry menu_items[] = -{ - {"<Main>/File/Open...", "<control>O", file_open_cmd_cb, NULL}, - {"<Main>/File/Close", "<control>W", file_close_cmd_cb, NULL}, - {"<Main>/File/Save", "<control>S", file_save_cmd_cb, NULL}, - {"<Main>/File/Save As...", NULL, file_save_as_cmd_cb, NULL}, - {"<Main>/File/Reload", "<control>R", file_reload_cmd_cb, NULL}, - {"<Main>/File/<separator>", NULL, NULL, NULL}, - {"<Main>/File/Print Packet", "<control>P", file_print_cmd_cb, NULL}, - {"<Main>/File/<separator>", NULL, NULL, NULL}, - {"<Main>/File/Quit", "<control>Q", file_quit_cmd_cb, NULL}, - {"<Main>/Edit/Cut", "<control>X", NULL, NULL}, - {"<Main>/Edit/Copy", "<control>C", NULL, NULL}, - {"<Main>/Edit/Paste", "<control>V", NULL, NULL}, - {"<Main>/Edit/<separator>", NULL, NULL, NULL}, - {"<Main>/Edit/Find", "<control>F", NULL, NULL}, - {"<Main>/Edit/<separator>", NULL, NULL, NULL}, - {"<Main>/Edit/Preferences...", NULL, prefs_cb, (gpointer) E_PR_PG_NONE}, -#ifdef HAVE_LIBPCAP - {"<Main>/Capture/Start...", "<control>K", capture_prep_cb, NULL}, -#endif - {"<Main>/Display/Options...", NULL, display_opt_cb, NULL}, - {"<Main>/Display/Match Selected", NULL, match_selected_cb, NULL}, -#ifdef HAVE_LIBPCAP - {"<Main>/Tools/Capture...", NULL, capture_prep_cb, NULL}, -#endif - {"<Main>/Tools/Follow TCP Stream", NULL, follow_stream_cb, NULL}, -/* {"<Main>/Tools/Graph", NULL, NULL, NULL}, future use */ - {"<Main>/Tools/Summary", NULL, summary_prep_cb, NULL}, - {"<Main>/Help/About Ethereal...", NULL, about_ethereal, NULL} -}; -#endif /* calculate the number of menu_items */ static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); static int initialize = TRUE; -#ifdef USE_ITEM static GtkItemFactory *factory = NULL; -#else -static GtkMenuFactory *factory = NULL; -static GtkMenuFactory *subfactory[1]; -static GHashTable *entry_ht = NULL; -#endif void -#ifdef GTK_HAVE_FEATURES_1_1_0 get_main_menu(GtkWidget ** menubar, GtkAccelGroup ** table) { -#else -get_main_menu(GtkWidget ** menubar, GtkAcceleratorTable ** table) { -#endif -#ifdef USE_ITEM grp = gtk_accel_group_new(); -#endif if (initialize) menus_init(); -#ifdef USE_ITEM if (menubar) *menubar = factory->widget; -#else - if (menubar) - *menubar = subfactory[0]->widget; -#endif if (table) -#ifdef USE_ITEM *table = grp; -#else -#ifdef GTK_HAVE_FEATURES_1_1_0 - *table = subfactory[0]->accel_group; -#else - *table = subfactory[0]->table; -#endif /* GTK 1.1.0 */ -#endif /* USE_ITEM */ } void menus_init(void) { -#ifndef USE_ITEM - GtkMenuPath *mp; -#endif if (initialize) { initialize = FALSE; -#ifdef USE_ITEM factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp); gtk_item_factory_create_items_ac(factory, nmenu_items, menu_items, NULL,2); set_menu_sensitivity("/File/Close", FALSE); @@ -226,142 +151,23 @@ menus_init(void) { set_menu_sensitivity("/Tools/Follow TCP Stream", FALSE); set_menu_sensitivity("/Display/Match Selected", FALSE); - -#else - factory = gtk_menu_factory_new(GTK_MENU_FACTORY_MENU_BAR); - subfactory[0] = gtk_menu_factory_new(GTK_MENU_FACTORY_MENU_BAR); - - gtk_menu_factory_add_subfactory(factory, subfactory[0], "<Main>"); - menus_create(menu_items, nmenu_items); - - 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>/Edit/Cut", FALSE); - set_menu_sensitivity("<Main>/Edit/Copy", FALSE); - set_menu_sensitivity("<Main>/Edit/Paste", FALSE); - set_menu_sensitivity("<Main>/Edit/Find", FALSE); - set_menu_sensitivity("<Main>/Tools/Graph", FALSE); - set_menu_sensitivity("<Main>/Tools/Summary", FALSE); - - set_menu_sensitivity("<Main>/Tools/Follow TCP Stream", FALSE); - set_menu_sensitivity("<Main>/Display/Match Selected", FALSE); - - if ((mp = gtk_menu_factory_find(factory, "<Main>/Help")) != NULL) { - gtk_menu_item_right_justify((GtkMenuItem *) mp->widget); - } -#endif } } void set_menu_sensitivity (gchar *path, gint val) { -#ifdef USE_ITEM GtkWidget *menu; -#else - GtkMenuPath *mp; -#endif -#ifdef USE_ITEM if ((menu = gtk_item_factory_get_widget(factory, path)) != NULL) gtk_widget_set_sensitive(menu, val); -#else - if ((mp = gtk_menu_factory_find(factory, path)) != NULL) - gtk_widget_set_sensitive(mp->widget, val); -#endif } void set_menu_object_data (gchar *path, gchar *key, gpointer data) { -#ifdef USE_ITEM GtkWidget *menu; -#else - GtkMenuPath *mp; -#endif -#ifdef USE_ITEM if ((menu = gtk_item_factory_get_widget(factory, path)) != NULL) gtk_object_set_data(GTK_OBJECT(menu), key, data); -#else - if ((mp = gtk_menu_factory_find(factory, path)) != NULL) - gtk_object_set_data(GTK_OBJECT(mp->widget), key, data); -#endif -} - -#ifndef USE_ITEM -void -menus_create(GtkMenuEntry * entries, int nmenu_entries) { - char *accelerator; - int i; - - if (initialize) - menus_init(); - - if (entry_ht) - for (i = 0; i < nmenu_entries; i++) { - accelerator = g_hash_table_lookup(entry_ht, entries[i].path); - if (accelerator) { - if (accelerator[0] == '\0') - entries[i].accelerator = NULL; - else - entries[i].accelerator = accelerator; - } - } - gtk_menu_factory_add_entries(factory, entries, nmenu_entries); - - for (i = 0; i < nmenu_entries; i++) - if (entries[i].widget) { -#ifdef GTK_HAVE_FEATURES_1_1_0 - gtk_signal_connect(GTK_OBJECT(entries[i].widget), "add_accelerator", - (GtkSignalFunc) menus_install_accel, entries[i].path); -#else - gtk_signal_connect(GTK_OBJECT(entries[i].widget), "install_accelerator", - (GtkSignalFunc) menus_install_accel, entries[i].path); -#endif - gtk_signal_connect(GTK_OBJECT(entries[i].widget), "remove_accelerator", - (GtkSignalFunc) menus_remove_accel, entries[i].path); - } } -static gint -menus_install_accel(GtkWidget * widget, gchar * signal_name, gchar key, gchar modifiers, gchar * path) { - char accel[64]; - char *t1, t2[2]; - - accel[0] = '\0'; - if (modifiers & GDK_CONTROL_MASK) - strcat(accel, "<control>"); - if (modifiers & GDK_SHIFT_MASK) - strcat(accel, "<shift>"); - if (modifiers & GDK_MOD1_MASK) - strcat(accel, "<alt>"); - - t2[0] = key; - t2[1] = '\0'; - strcat(accel, t2); - - if (entry_ht) { - t1 = g_hash_table_lookup(entry_ht, path); - g_free(t1); - } else - entry_ht = g_hash_table_new(g_str_hash, g_str_equal); - - g_hash_table_insert(entry_ht, path, g_strdup(accel)); - - return TRUE; -} - -static void -menus_remove_accel(GtkWidget * widget, gchar * signal_name, gchar * path) { - char *t; - - if (entry_ht) { - t = g_hash_table_lookup(entry_ht, path); - g_free(t); - - g_hash_table_insert(entry_ht, path, g_strdup("")); - } -} -#endif @@ -1,7 +1,7 @@ /* menu.h * Menu definitions * - * $Id: menu.h,v 1.4 1998/12/17 05:42:27 gram Exp $ + * $Id: menu.h,v 1.5 1999/07/13 03:08:06 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -30,14 +30,11 @@ extern "C" { #endif /* __cplusplus */ +#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) void menus_init(void); -#ifdef GTK_HAVE_FEATURES_1_1_0 void get_main_menu (GtkWidget **, GtkAccelGroup **); -#else -void get_main_menu (GtkWidget **, GtkAcceleratorTable **); -#endif void set_menu_sensitivity (gchar *, gint); void set_menu_object_data (gchar *path, gchar *key, gpointer data); void menus_create (GtkMenuEntry *, int); @@ -1,7 +1,7 @@ /* summary.c * Routines for capture file summary window * - * $Id: summary.c,v 1.5 1999/07/13 02:52:59 gram Exp $ + * $Id: summary.c,v 1.6 1999/07/13 03:08:06 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -295,13 +295,10 @@ traffic_bytes/seconds); gtk_widget_show(sum_open_w); } - +/* this is never called void summary_prep_close_cb(GtkWidget *w, gpointer win) { -#ifdef GTK_HAVE_FEATURES_1_1_0 - win = w; -#endif gtk_grab_remove(GTK_WIDGET(win)); gtk_widget_destroy(GTK_WIDGET(win)); -} +} */ @@ -1,7 +1,7 @@ /* summary.h * Definitions for capture file summary windows * - * $Id: summary.h,v 1.2 1999/07/07 22:52:00 gram Exp $ + * $Id: summary.h,v 1.3 1999/07/13 03:08:06 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -36,7 +36,7 @@ typedef struct _summary_tally { void summary_prep_cb(GtkWidget *, gpointer); -void summary_prep_close_cb(GtkWidget *, gpointer); +/*void summary_prep_close_cb(GtkWidget *, gpointer);*/ #endif /* summary.h */ |