diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-10-14 16:03:11 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-10-14 16:03:11 +0000 |
| commit | db8cf1b15bdadcb884c00b1c43af4dcc2a10d664 (patch) | |
| tree | e3dc6133596442421900f781e14f76e364d3eeee /gtk/main_menubar.c | |
| parent | 17f77e0597cfc73fadb4c3a6887fb4e958273a76 (diff) | |
| download | wireshark-db8cf1b15bdadcb884c00b1c43af4dcc2a10d664.tar.gz wireshark-db8cf1b15bdadcb884c00b1c43af4dcc2a10d664.tar.bz2 wireshark-db8cf1b15bdadcb884c00b1c43af4dcc2a10d664.zip | |
Make make_menu_actions() static again, but protect with
#ifdef HAVE_LUA_5_1
#endif
As per discission on wireshark-dev, this function might later see wider use, so don't add 'lua' to the function name.
svn path=/trunk/; revision=39424
Diffstat (limited to 'gtk/main_menubar.c')
| -rw-r--r-- | gtk/main_menubar.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c index 902a134af2..f1a09af894 100644 --- a/gtk/main_menubar.c +++ b/gtk/main_menubar.c @@ -3694,7 +3694,10 @@ make_menu_xml(const char *path) { * Creates an action group for the menu items in xpath, and returns it. The caller should * use g_object_unref() on the returned pointer if transferring scope. */ -GtkActionGroup* +#ifdef HAVE_LUA_5_1 +/* NOTE currently only used from Lua, remove this ifdef when used + outside of #ifdef LUA */ +static GtkActionGroup* make_menu_actions(const char *path, const menu_item_t *menu_item_data) { GtkActionGroup *action_group; GtkAction *action; @@ -3775,6 +3778,7 @@ make_menu_actions(const char *path, const menu_item_t *menu_item_data) { return action_group; } +#endif static void merge_lua_menu_items(GList *merge_lua_menu_items_list _U_) |