Fix up compilation using make -jN: sometimes it fails due to order of headers inclusion.

diff --git a/src/md5-util.c b/src/md5-util.c
index 09d3770..6aa3281 100644 (file)
--- a/src/md5-util.c
+++ b/src/md5-util.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include "md5-util.h"
 
-#include "ui_fileops.h"        /* for utf-8 filename conversion */
-
 
 static void md5_transform(guint32 buf[4], const guint32 in[16]);
 
@@ -359,19 +357,6 @@ gboolean md5_get_digest_from_file(const gchar *path, guchar digest[16])
        return TRUE;
 }
 
-/* does filename utf8 to filesystem encoding first */
-gboolean md5_get_digest_from_file_utf8(const gchar *path, guchar digest[16])
-{
-       gboolean success;
-       gchar *pathl;
-
-       pathl = path_from_utf8(path);
-       success = md5_get_digest_from_file(pathl, digest);
-       g_free(pathl);
-
-       return success;
-}
-
 /* these to and from text string converters were borrowed from
  * the libgnomeui library, where they are name thumb_digest_to/from_ascii
  *
@@ -410,12 +395,4 @@ gboolean md5_digest_from_text(const gchar *text, guchar digest[16])
        return TRUE;
 }
 
-gchar *md5_text_from_file_utf8(const gchar *path, const gchar *error_text)
-{
-       guchar digest[16];
-
-       if (!md5_get_digest_from_file_utf8(path, digest)) return g_strdup(error_text);
-
-       return md5_digest_to_text(digest);
-}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/md5-util.h b/src/md5-util.h
index ad14f55..b20e1c3 100644 (file)
--- a/src/md5-util.h
+++ b/src/md5-util.h
@@ -46,12 +46,6 @@ void md5_get_digest(const guchar *buffer, gint buffer_size, guchar digest[16]);
 
 /* generate digest from file */
 gboolean md5_get_digest_from_file(const gchar *path, guchar digest[16]);
-gboolean md5_get_digest_from_file_utf8(const gchar *path, guchar digest[16]);
-
-/* generate md5 string from file,
- * on failure returns newly allocated copy of error_text, error_text may be NULL
-  */
-gchar *md5_text_from_file_utf8(const gchar *path, const gchar *error_text);
 
 /* convert digest to/from a NULL terminated text string, in ascii encoding */
 gchar *md5_digest_to_text(guchar digest[16]);

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index cba37ab..0c5cd32 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -30,6 +30,7 @@
 #include "ui_fileops.h"
 
 #include "ui_utildlg.h"        /* for locale warning dialog */
+#include "md5-util.h"
 
 /*
  *-----------------------------------------------------------------------------
@@ -937,6 +938,28 @@ gboolean recursive_mkdir_if_not_exists(const gchar *path, mode_t mode)
        return TRUE;
 }
 
+/* does filename utf8 to filesystem encoding first */
+gboolean md5_get_digest_from_file_utf8(const gchar *path, guchar digest[16])
+{
+       gboolean success;
+       gchar *pathl;
+
+       pathl = path_from_utf8(path);
+       success = md5_get_digest_from_file(pathl, digest);
+       g_free(pathl);
+
+       return success;
+}
+
+
+gchar *md5_text_from_file_utf8(const gchar *path, const gchar *error_text)
+{
+       guchar digest[16];
+
+       if (!md5_get_digest_from_file_utf8(path, digest)) return g_strdup(error_text);
+
+       return md5_digest_to_text(digest);
+}
 
 
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/ui_fileops.h b/src/ui_fileops.h
index 29f4f65..3d80c08 100644 (file)
--- a/src/ui_fileops.h
+++ b/src/ui_fileops.h
@@ -97,5 +97,12 @@ gboolean file_in_path(const gchar *name);
 
 gboolean recursive_mkdir_if_not_exists(const gchar *path, mode_t mode);
 
+
+/* generate md5 string from file,
+ * on failure returns newly allocated copy of error_text, error_text may be NULL
+  */
+gchar *md5_text_from_file_utf8(const gchar *path, const gchar *error_text);
+gboolean md5_get_digest_from_file_utf8(const gchar *path, guchar digest[16]);
+
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */