diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-28 08:57:29 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-28 08:57:29 +0000 |
| commit | dc6b87bd2ab1bc393d08c245f341c9c1204ae703 (patch) | |
| tree | 265697d839c6188e79bd428bba95b6aa40d7a81d | |
| parent | 6fee9a41f0d1f524e8b51f7434a07f050d05621f (diff) | |
Avoid to add an empty menu if there's no Lua.
svn path=/trunk/; revision=19346
| -rw-r--r-- | gtk/menu.c | 7 | ||||
| -rw-r--r-- | stat_menu.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index 3a82105906..144b21d868 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -943,7 +943,9 @@ register_stat_menu_item( case(REGISTER_STAT_GROUP_TELEPHONY): toolspath = "/Statistics/"; break; case(REGISTER_STAT_GROUP_NONE): toolspath = "/Statistics/"; break; case(REGISTER_ANALYZE_GROUP_NONE): toolspath = "/Analyze/"; break; +#ifdef HAVE_LUA_5_1 case(REGISTER_TOOLS_GROUP_NONE): toolspath = "/Tools/"; break; +#endif default: g_assert(0); toolspath = NULL; @@ -1069,8 +1071,10 @@ static guint merge_tap_menus_layered(GList *node, gint group) { break; case(REGISTER_ANALYZE_GROUP_NONE): break; +#ifdef HAVE_LUA_5_1 case(REGISTER_TOOLS_GROUP_NONE): break; +#endif default: g_assert_not_reached(); } @@ -1143,10 +1147,11 @@ void merge_all_tap_menus(GList *node) { entry->path = "/Analyze/"; /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ } +#ifdef HAVE_LUA_5_1 if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_NONE)) { /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ } - +#endif } diff --git a/stat_menu.h b/stat_menu.h index 1d9d0aab79..1dd56f9009 100644 --- a/stat_menu.h +++ b/stat_menu.h @@ -51,7 +51,9 @@ typedef enum { REGISTER_STAT_GROUP_TELEPHONY, /* XXX - split into telephony and VoIP? */ REGISTER_ANALYZE_GROUP_NONE, +#ifdef HAVE_LUA_5_1 REGISTER_TOOLS_GROUP_NONE, +#endif } register_stat_group_t; #ifdef __cplusplus |