aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-01-18 19:01:35 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-01-18 19:01:35 +0000
commit494504746ce4ab140f859f2eb4c95f778ef2f602 (patch)
tree4db5dc27352023af0321a86f4d2e81512fea58d7 /gtk
parent1534a20f059bef7ae00f181e24180280345a2416 (diff)
Use "strrchr()" instead of "rindex()" - "strrchr()" is the routine the
ANSI C standard specifies. Fix up some menu stuff that should've been fixed when I put "Find Frame" and "Go To Frame" under "Edit". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1509 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r--gtk/menu.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/menu.c b/gtk/menu.c
index 42ab8d8b2c..e97c135ebc 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.19 2000/01/18 09:05:24 guy Exp $
+ * $Id: menu.c,v 1.20 2000/01/18 19:01:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -206,7 +206,6 @@ menus_init(void) {
set_menu_sensitivity("/Edit/Cut", FALSE);
set_menu_sensitivity("/Edit/Copy", FALSE);
set_menu_sensitivity("/Edit/Paste", FALSE);
- set_menu_sensitivity("/Edit/Find", FALSE);
set_menus_for_captured_packets(FALSE);
set_menus_for_selected_packet(FALSE);
}
@@ -224,7 +223,7 @@ set_menu_sensitivity_meat(GtkItemFactory *ifactory, gchar *path, gint val) {
static void
set_menu_sensitivity (gchar *path, gint val) {
GSList *menu_list = popup_menu_list;
- gchar *shortpath = rindex(path, '/');
+ gchar *shortpath = strrchr(path, '/');
set_menu_sensitivity_meat(factory, path, val);
@@ -247,7 +246,7 @@ set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpo
void
set_menu_object_data (gchar *path, gchar *key, gpointer data) {
GSList *menu_list = popup_menu_list;
- gchar *shortpath = rindex(path, '/');
+ gchar *shortpath = strrchr(path, '/');
set_menu_object_data_meat(factory, path, key, data);
while (menu_list != NULL) {
@@ -309,6 +308,8 @@ void
set_menus_for_captured_packets(gboolean have_captured_packets)
{
set_menu_sensitivity("/File/Print...", have_captured_packets);
+ set_menu_sensitivity("/Edit/Find Frame...", have_captured_packets);
+ set_menu_sensitivity("/Edit/Go To Frame...", have_captured_packets);
set_menu_sensitivity("/Display/Match Selected", have_captured_packets);
set_menu_sensitivity("/Display/Colorize Display...", have_captured_packets);
set_menu_sensitivity("/Display/Find Frame...", have_captured_packets);