diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-09 04:59:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-09 04:59:11 +0800 |
| commit | f92b45d7df69c958bb4fc606831bc51ee2bcc914 (patch) | |
| tree | 704ffb1fe55bb37673436695c2d4e49efab8e7b4 /shell | |
| parent | ae4e6007efece29bf587f3193e7c57ad7f7d81dc (diff) | |
| download | gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.tar gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.tar.gz gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.tar.bz2 gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.tar.lz gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.tar.xz gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.tar.zst gsoc2013-evolution-f92b45d7df69c958bb4fc606831bc51ee2bcc914.zip | |
Fix places where "~/.evolution" is hard-coded.
Also replace "$USER_DATA_DIR/cache" path constructions with
e_get_user_cache_dir().
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 7 | ||||
| -rw-r--r-- | shell/killev.c | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 2f044e420e..2fc70ae490 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -156,11 +156,14 @@ endif killev_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) killev_SOURCES = killev.c -killev_LDADD = $(GNOME_PLATFORM_LIBS) +killev_LDADD = \ + $(GNOME_PLATFORM_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) # Misc stuff diff --git a/shell/killev.c b/shell/killev.c index d1eb523495..16849eec42 100644 --- a/shell/killev.c +++ b/shell/killev.c @@ -29,6 +29,8 @@ #include <gio/gio.h> #include <glib/gi18n.h> +#include <libedataserver/e-data-server-util.h> + /* Seconds to wait after asking Evolution to terminate gracefully. * If the process has not terminated before the timeout expires, * then we get violent. */ @@ -97,6 +99,7 @@ main (gint argc, gchar **argv) { GFile *pid_file; GFileMonitor *monitor; + const gchar *user_config_dir; gchar *filename; GError *error = NULL; @@ -106,10 +109,8 @@ main (gint argc, gchar **argv) g_type_init (); - /* XXX If e_get_user_data_dir() ever gets moved to libedataserver, - * use that instead of hard-coding the directory path here. */ - filename = g_build_filename ( - g_get_home_dir (), ".evolution", ".running", NULL); + user_config_dir = e_get_user_config_dir (); + filename = g_build_filename (user_config_dir, ".running", NULL); pid_file = g_file_new_for_path (filename); g_free (filename); |