Revision: 1741
http://geeqie.svn.sourceforge.net/geeqie/?rev=1741&view=rev
Author: zas_
Date: 2009-06-11 17:34:37 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Fix up compilation using make -jN: sometimes it fails due to order of headers
inclusion.
Modified Paths:
--------------
trunk/src/md5-util.c
trunk/src/md5-util.h
trunk/src/ui_fileops.c
trunk/src/ui_fileops.h
Modified: trunk/src/md5-util.c
===================================================================
--- trunk/src/md5-util.c 2009-06-10 20:45:24 UTC (rev 1740)
+++ trunk/src/md5-util.c 2009-06-11 17:34:37 UTC (rev 1741)
@@ -31,9 +31,7 @@
#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]);
static gint _ie = 0x44332211;
@@ -359,19 +357,6 @@
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 @@
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: */
Modified: trunk/src/md5-util.h
===================================================================
--- trunk/src/md5-util.h 2009-06-10 20:45:24 UTC (rev 1740)
+++ trunk/src/md5-util.h 2009-06-11 17:34:37 UTC (rev 1741)
@@ -46,13 +46,7 @@
/* 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]);
gboolean md5_digest_from_text(const gchar *text, guchar digest[16]);
Modified: trunk/src/ui_fileops.c
===================================================================
--- trunk/src/ui_fileops.c 2009-06-10 20:45:24 UTC (rev 1740)
+++ trunk/src/ui_fileops.c 2009-06-11 17:34:37 UTC (rev 1741)
@@ -30,6 +30,7 @@
#include "ui_fileops.h"
#include "ui_utildlg.h" /* for locale warning dialog */
+#include "md5-util.h"
/*
*-----------------------------------------------------------------------------
@@ -937,6 +938,28 @@
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: */
Modified: trunk/src/ui_fileops.h
===================================================================
--- trunk/src/ui_fileops.h 2009-06-10 20:45:24 UTC (rev 1740)
+++ trunk/src/ui_fileops.h 2009-06-11 17:34:37 UTC (rev 1741)
@@ -97,5 +97,12 @@
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: */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
