From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Mon, 2 Apr 2007 05:20:38 +0000 (+0000)
Subject: Fixup the previous commit
X-Git-Tag: EVINCE_0_8_1~8
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=da64387d5d8e621105237d5e2e0318cdd09aa0d1;p=evince.git

Fixup the previous commit

svn path=/trunk/; revision=2393
---

diff --git a/ChangeLog b/ChangeLog
index 37c0ec0c..bbff6193 100644
--- 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 3bdfee89..66ec71f1 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 fa134b61..fe82fc80 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 e1721463..00bcefa6 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