Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 38772: /trunk/gtk/ /trunk/gtk/: main

From: Joerg Mayer <jmayer@xxxxxxxxx>
Date: Mon, 29 Aug 2011 15:41:14 +0200
On Mon, Aug 29, 2011 at 02:59:58PM +0200, Anders Broman wrote:
> Un comment:
> 3215 /*char *gui_desc_file_name;*/
> : 
> 3387
> 		/*gui_desc_file_name = g_strdup_printf("%s" G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S "main-menubar-ui.xml", get_datafile_dir());
> 		gtk_ui_manager_add_ui_from_file ( ui_manager_main_menubar, gui_desc_file_name, &error);*/
> :
> 3395
> /*g_free (gui_desc_file_name);*/

Thanks, turned that into a conditional compile. Then I modified get_datafile_dir
to take a fallback path as an argument.
For this to work, I ran wireshark like this:

WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 WIRESHARK_SRC_DIR=../trunk ./wireshark

Does passing a fallback path into get_datafile_dir make sense for more
cases? Right now I only provided the ui case with a fallback but diameter,
radius and python come to my mind as well.

Ciao
 Joerg

-- 
Joerg Mayer                                           <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.