Add a #ifdef NEW_MENU_CODE around a static function that is only used on that path.
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 30 Aug 2011 12:09:07 +0000 (12:09 +0000)
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 30 Aug 2011 12:09:07 +0000 (12:09 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38798 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/main_menubar.c

index a4bdbccba41c67f2dae9f8c345e1ea8acb822aa8..2bc3371888223a26fefbca64205c1be8355ccd03 100644 (file)
@@ -166,7 +166,7 @@ File/Close:         the Gnome HIG suggests putting this item just above the Quit
 */
 
 
-
+#ifdef NEW_MENU_CODE
 static gchar *
 get_ui_file_path(const char *filename)
 {
@@ -176,6 +176,7 @@ get_ui_file_path(const char *filename)
         running_in_build_directory() ? "gtk/ui" : "ui", filename);
     return gui_desc_file_name;
 }
+#endif
 
 typedef enum {
     SHOW_HIDE_MAIN_TOOLBAR = 1,
@@ -3356,9 +3357,9 @@ menus_init(void) {
 #ifndef NEW_MENU_CODE
         gtk_ui_manager_add_ui_from_string (ui_manager_tree_view_menu, ui_desc_tree_view_menu_popup, -1, &error);
 #else
-               gui_desc_file_name_and_path = get_ui_file_path("tree-view-ui.xml");
+        gui_desc_file_name_and_path = get_ui_file_path("tree-view-ui.xml");
         gtk_ui_manager_add_ui_from_file ( ui_manager_tree_view_menu, gui_desc_file_name_and_path, &error);
-               g_free (gui_desc_file_name_and_path);
+        g_free (gui_desc_file_name_and_path);
 #endif
         if (error != NULL)
         {