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-commands.c | |
| parent | f3e001990b61a336c1f30c5bae8065c15e320aec (diff) | |
| download | gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.gz gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.bz2 gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.lz gsoc2013-evolution-e89c27826741334b35d8952c769f66d11eaedce8.tar.xz 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-commands.c')
| -rw-r--r-- | shell/e-shell-window-commands.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 51619a09aa..fc6b482b72 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -20,26 +20,16 @@ * Author: Ettore Perazzoli <ettore@ximian.com> */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - -#include "e-shell-window-commands.h" - -#include "e-shell-importer.h" -#include "e-shell-window.h" - -#include "evolution-shell-component-utils.h" -#include "e-util/e-icon-factory.h" -#include "e-util/e-dialog-utils.h" -#include "e-util/e-error.h" +#include <string.h> #include <glib/gprintf.h> #include <libgnome/gnome-exec.h> -#include <libgnome/gnome-url.h> #include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-url.h> + #include <libgnomeui/gnome-about.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> @@ -51,7 +41,17 @@ #include <libedataserverui/e-passwords.h> #include <gconf/gconf-client.h> -#include <string.h> + +#include "e-util/e-icon-factory.h" +#include "e-util/e-dialog-utils.h" +#include "e-util/e-error.h" +#include "e-util/e-util-private.h" + +#include "e-shell-window-commands.h" +#include "e-shell-window.h" +#include "evolution-shell-component-utils.h" + +#include "e-shell-importer.h" /* Utility functions. */ @@ -577,6 +577,8 @@ command_about_box (BonoboUIComponent *uih, gtk_widget_show (about_box_window); } +#if 0 +/* Unused */ static void command_help_faq (BonoboUIComponent *uih, EShellWindow *window, @@ -586,6 +588,7 @@ command_help_faq (BonoboUIComponent *uih, /* FIXME use the error */ gnome_url_show ("http://gnome.org/projects/evolution/faq.shtml", NULL); } +#endif static void command_quick_reference (BonoboUIComponent *uih, |