From e89c27826741334b35d8952c769f66d11eaedce8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 18 Dec 2005 04:33:29 +0000 Subject: Use libedataserver's e_xml_parse_file() instead of xmlParseFile() 2005-12-17 Tor Lillqvist * e-config-upgrade.c: Use libedataserver's e_xml_parse_file() instead of xmlParseFile() directly. * e-shell.c * e-shell-importer.c: Use GLib API when applicable. * e-shell-importer.c * e-shell-window.c: Construct pathname of glade file at run-time. * e-shell-window-commands.c: Include e-util-private.h for Win32 redefinition of EVOLUTION_DATADIR. * main.c: No SIGSEGV handling on Win32. (main): Drop unused evolution_directory variable. svn path=/trunk/; revision=30849 --- shell/e-shell-window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'shell/e-shell-window.c') diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 9bfc225fa6..0fd5fe3dca 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -866,6 +866,7 @@ e_shell_window_new (EShell *shell, GConfClient *gconf_client = gconf_client_get_default (); BonoboUIContainer *ui_container; char *default_component_id = NULL; + char *xmlfile; if (bonobo_window_construct (BONOBO_WINDOW (window), bonobo_ui_container_new (), @@ -888,10 +889,12 @@ e_shell_window_new (EShell *shell, bonobo_object_corba_objref (BONOBO_OBJECT (ui_container)), NULL); + xmlfile = g_build_filename (EVOLUTION_UIDIR, "evolution.xml", NULL); bonobo_ui_util_set_ui (priv->ui_component, PREFIX, - EVOLUTION_UIDIR "/evolution.xml", + xmlfile, "evolution-" BASE_VERSION, NULL); + g_free (xmlfile); e_shell_window_commands_setup (window); e_menu_activate((EMenu *)priv->menu, priv->ui_component, TRUE); -- cgit