Wireshark-dev: Re: [Wireshark-dev] Tools Menu not available without HAVE_LUA_5_1

From: LEGO <luis.ontanon@xxxxxxxxx>
Date: Mon, 2 Oct 2006 15:29:37 +0200

You are right, that's how it should have been.

That's to be applied!

On 10/2/06, Martin Mathieson <martin.mathieson@xxxxxxxxxxxx> wrote:

The top-level 'Tools' menu *does* appear for me, but is empty.
I (wrongly) thought that I was missing existing menu items (i.e. not
relating to Lua).

Still, it is a little confusing to see this empty menu.  Would the
attached patch be OK (until some non-Lua item is added to the Tools menu)?

Regards,
Martin


LEGO wrote:

>As I added that menu for Lua's use I thought that having an empty menu
>would not be nice so I excluded it when Lua isn't there.
>
>On 10/2/06, Martin Mathieson <martin.mathieson@xxxxxxxxxxxx> wrote:
>
>
>>Hi,
>>
>>I notice that the whole Tools menu is not available unless HAVE_LUA_5_1
>>is defined (it isn't for me, I don't have Lua installed yet).
>>How should this be fixed?
>>
>>Martin
>>_______________________________________________
>>Wireshark-dev mailing list
>>Wireshark-dev@xxxxxxxxxxxxx
>>http://www.wireshark.org/mailman/listinfo/wireshark-dev
>>
>>
>>
>
>
>
>



Index: menu.c
===================================================================
--- menu.c      (revision 19392)
+++ menu.c      (working copy)
@@ -598,8 +598,10 @@
                        init_conversation_notebook_cb, 0, WIRESHARK_STOCK_CONVERSATIONS),
     ITEM_FACTORY_STOCK_ENTRY("/Statistics/Endpoints", NULL,
                        init_hostlist_notebook_cb, 0, WIRESHARK_STOCK_ENDPOINTS),
+#ifdef HAVE_LUA_5_1
     ITEM_FACTORY_ENTRY("/_Tools", NULL, NULL, 0, "<Branch>", NULL),
-   ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
+#endif
+    ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", topic_menu_cb, HELP_CONTENT, GTK_STOCK_HELP),
     ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
 #if (GLIB_MAJOR_VERSION >= 2)

_______________________________________________
Wireshark-dev mailing list
Wireshark-dev@xxxxxxxxxxxxx
http://www.wireshark.org/mailman/listinfo/wireshark-dev

--
This information is top security. When you have read it, destroy yourself.
-- Marshall McLuhan