diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-02 05:20:38 (GMT) |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-02 05:20:38 (GMT) |
commit | da64387d5d8e621105237d5e2e0318cdd09aa0d1 (patch) | |
tree | 5e9b23fe3dd8b46799052a9e2601e164712f3e5f /shell | |
parent | d92ed14d7be9cab0ee447e49fea73d324e2ec19d (diff) |
Fixup the previous commit
svn path=/trunk/; revision=2393
Diffstat (limited to 'shell')
-rw-r--r-- | shell/Makefile.am | 3 | ||||
-rw-r--r-- | shell/ev-window.c | 2 | ||||
-rw-r--r-- | shell/xdg-user-dir-lookup.c | 16 |
3 files changed, 4 insertions, 17 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 3bdfee8..66ec71f 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -82,7 +82,8 @@ evince_SOURCES= \ ev-stock-icons.h \ ev-tooltip.c \ ev-tooltip.h \ - main.c + main.c \ + xdg-user-dir-lookup.c if WITH_GNOME_PRINT diff --git a/shell/ev-window.c b/shell/ev-window.c index fa134b6..fe82fc8 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -94,7 +94,7 @@ #include <string.h> -#include "xdg-user-dir-lookup.c" +char *xdg_user_dir_lookup (char *type); typedef enum { PAGE_MODE_DOCUMENT, diff --git a/shell/xdg-user-dir-lookup.c b/shell/xdg-user-dir-lookup.c index e172146..00bcefa 100644 --- a/shell/xdg-user-dir-lookup.c +++ b/shell/xdg-user-dir-lookup.c @@ -30,7 +30,7 @@ #include <string.h> -static char * +char * xdg_user_dir_lookup (const char *type) { FILE *file; @@ -149,17 +149,3 @@ xdg_user_dir_lookup (const char *type) return strdup (home_dir); } -#ifdef STANDALONE -int -main (int argc, char *argv[]) -{ - if (argc != 2) - { - fprintf (stderr, "Usage %s <dir-type>\n", argv[0]); - exit (1); - } - - printf ("%s\n", xdg_user_dir_lookup (argv[1])); - return 0; -} -#endif |