diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-12-18 12:33:29 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-18 12:33:29 +0800 |
| commit | e89c27826741334b35d8952c769f66d11eaedce8 (patch) | |
| tree | e64b437a818686edcb8457691ea369f4f7719e0b /shell/e-shell-window.c | |
| parent | f3e001990b61a336c1f30c5bae8065c15e320aec (diff) | |
| download | gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.gz gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.zst gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.zip | |
Use libedataserver's e_xml_parse_file() instead of xmlParseFile()
2005-12-17 Tor Lillqvist <tml@novell.com>
* 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
Diffstat (limited to 'shell/e-shell-window.c')
| -rw-r--r-- | shell/e-shell-window.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); |