[Rawstudio-commit] r2052 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-29 02:55:31 +0200 (Mon, 29 Sep 2008)
New Revision: 2052

Modified:
   trunk/src/rawstudio.c
   trunk/src/rs-utils.c
   trunk/src/rs-utils.h
Log:
Moved check_install() to rs-utils.c.

Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c	2008-09-29 00:47:06 UTC (rev 2051)
+++ trunk/src/rawstudio.c	2008-09-29 00:55:31 UTC (rev 2052)
@@ -628,26 +628,6 @@
 	return;
 }
 
-void
-check_install()
-{
-#define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0)
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority1.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority2.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority3.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_deleted.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_exported.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_flip.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_mirror.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_90.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_180.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_270.png");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/ui.xml");
-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/rawstudio.gtkrc");
-#undef TEST_FILE_ACCESS
-}
-
 /**
  * This is a very simple regression test for Rawstudio. Filenames will be read
  * from "testimages" in the current directory, one filename per line, and a

Modified: trunk/src/rs-utils.c
===================================================================
--- trunk/src/rs-utils.c	2008-09-29 00:47:06 UTC (rev 2051)
+++ trunk/src/rs-utils.c	2008-09-29 00:55:31 UTC (rev 2052)
@@ -18,9 +18,12 @@
  */
 
 #define _XOPEN_SOURCE /* strptime() */
+#include <config.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <time.h>
 #include "conf_interface.h"
+#include "rs-utils.h"
 
 #define DOTDIR ".rawstudio"
 
@@ -368,3 +371,26 @@
 	out->y2 = y2;
 	rs_rect_normalize(out, out);
 }
+
+/**
+ * Check (and complain if needed) the Rawstudio install
+ */
+void
+check_install()
+{
+#define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0)
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority1.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority2.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority3.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_deleted.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_exported.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_flip.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_mirror.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_90.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_180.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/transform_270.png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/ui.xml");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/rawstudio.gtkrc");
+#undef TEST_FILE_ACCESS
+}

Modified: trunk/src/rs-utils.h
===================================================================
--- trunk/src/rs-utils.h	2008-09-29 00:47:06 UTC (rev 2051)
+++ trunk/src/rs-utils.h	2008-09-29 00:55:31 UTC (rev 2052)
@@ -126,4 +126,11 @@
 extern void
 rs_rect_rotate(RS_RECT *in, RS_RECT *out, gint w, gint h, gint quarterturns);
 
+
+/**
+ * Check (and complain if needed) the Rawstudio install
+ */
+extern void
+check_install();
+
 #endif /* RS_UTILS_H */