Fixup the previous commit

svn path=/trunk/; revision=2393

diff --git a/ChangeLog b/ChangeLog
index 37c0ec0c9c76f73f47e922e62fca388a22f95afb..bbff61939740a4330a21ddbf0a15e75a3e97bcbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Matthias Clasen  <mclasen@redhat.com>
+
+       Fixup the previous commit:
+
+       * shell/Makefile.am (SOURCES): Add xdg-user-dir-lookup.c
+       * shell/xdg-user-dir-lookup.c: Make the function non-static
+       * shell/ev-window.c: Don't include xdg-user-dir-lookup.c
+
 2007-04-02  Matthias Clasen  <mclasen@redhat.com>
 
        * shell/ev-window.c (file_open_dialog_response_cb): Use

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3bdfee891d4f3a1cbc8ed982cf754f9c737e53cd..66ec71f18ec528878feac875bb354c1602019d63 100644 (file)
--- 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 fa134b6110600fead1aaf27d4dd445e6fdf82c6b..fe82fc809a4b3c479a6f0252a53a7330aec04284 100644 (file)
--- 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 e17214637d6f477083a867604bb13c4cc56d589e..00bcefa6a76646adc58b69397312416b80415caa 100644 (file)
--- 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