From e4035bc52f27d8f2bb476b60465491c3cbdc30a0 Mon Sep 17 00:00:00 2001
From: Rafael Antognolli <antognolli@gmail.com>
Date: Tue, 21 Apr 2009 23:06:57 +0000
Subject: [PATCH] Removed some structures from Ethumb.h and put them in
 ethumb_private.h.

SVN revision: 40279
---
 legacy/ethumb/src/lib/Ethumb.c              |  1 +
 legacy/ethumb/src/lib/Ethumb.h              | 44 ------------------
 legacy/ethumb/src/lib/Makefile.am           |  2 +-
 legacy/ethumb/src/lib/ethumb_private.h      | 49 +++++++++++++++++++++
 legacy/ethumb/src/plugins/emotion/emotion.c |  1 +
 legacy/ethumb/src/plugins/epdf/epdf.c       |  1 +
 6 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 legacy/ethumb/src/lib/ethumb_private.h

diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c
index 4cfc6aa3db..ccdf416998 100644
--- a/legacy/ethumb/src/lib/Ethumb.c
+++ b/legacy/ethumb/src/lib/Ethumb.c
@@ -25,6 +25,7 @@
 #endif
 #include <eina_safety_checks.h>
 #include "Ethumb.h"
+#include "ethumb_private.h"
 #include "Ethumb_Plugin.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/legacy/ethumb/src/lib/Ethumb.h b/legacy/ethumb/src/lib/Ethumb.h
index 2b81c37235..6e639e61d2 100644
--- a/legacy/ethumb/src/lib/Ethumb.h
+++ b/legacy/ethumb/src/lib/Ethumb.h
@@ -69,50 +69,6 @@ typedef struct _Ethumb Ethumb;
 typedef struct _Ethumb_File Ethumb_File;
 typedef void (*ethumb_generate_callback_t)(Ethumb_File *ef, void *data);
 
-struct _Ethumb_Frame
-{
-   const char *file;
-   const char *group;
-   const char *swallow;
-   Evas_Object *edje;
-};
-
-struct _Ethumb
-{
-   const char *thumb_dir;
-   const char *category;
-   int tw, th;
-   int format;
-   int aspect;
-   float crop_x, crop_y;
-   struct
-     {
-	double time;
-     } video;
-   struct
-     {
-	int page;
-     } document;
-   Ethumb_Frame *frame;
-   Ecore_Evas *ee, *sub_ee;
-   Evas *e, *sub_e;
-   Evas_Object *o, *img;
-   Ecore_Idler *finished_idler;
-   ethumb_generate_callback_t finished_cb;
-   void *cb_data;
-};
-
-struct _Ethumb_File
-{
-   Ethumb *ethumb;
-   const char *src_path;
-   const char *src_key;
-   const char *thumb_path;
-   const char *thumb_key;
-   int w, h;
-};
-
-
 EAPI int ethumb_init(void);
 EAPI int ethumb_shutdown(void);
 
diff --git a/legacy/ethumb/src/lib/Makefile.am b/legacy/ethumb/src/lib/Makefile.am
index b9a43081a6..6fb0b1f59c 100644
--- a/legacy/ethumb/src/lib/Makefile.am
+++ b/legacy/ethumb/src/lib/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	@EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@
 
 include_HEADERS = Ethumb.h Ethumb_Plugin.h
-noinst_HEADERS = md5.h
+noinst_HEADERS = md5.h ethumb_private.h
 
 lib_LTLIBRARIES = libethumb.la
 
diff --git a/legacy/ethumb/src/lib/ethumb_private.h b/legacy/ethumb/src/lib/ethumb_private.h
new file mode 100644
index 0000000000..5d356829cc
--- /dev/null
+++ b/legacy/ethumb/src/lib/ethumb_private.h
@@ -0,0 +1,49 @@
+#ifndef __ETHUMB_PRIVATE_H__
+#define __ETHUMB_PRIVATE_H__ 1
+
+#include <Ethumb.h>
+
+struct _Ethumb_Frame
+{
+   const char *file;
+   const char *group;
+   const char *swallow;
+   Evas_Object *edje;
+};
+
+struct _Ethumb
+{
+   const char *thumb_dir;
+   const char *category;
+   int tw, th;
+   int format;
+   int aspect;
+   float crop_x, crop_y;
+   struct
+     {
+	double time;
+     } video;
+   struct
+     {
+	int page;
+     } document;
+   Ethumb_Frame *frame;
+   Ecore_Evas *ee, *sub_ee;
+   Evas *e, *sub_e;
+   Evas_Object *o, *img;
+   Ecore_Idler *finished_idler;
+   ethumb_generate_callback_t finished_cb;
+   void *cb_data;
+};
+
+struct _Ethumb_File
+{
+   Ethumb *ethumb;
+   const char *src_path;
+   const char *src_key;
+   const char *thumb_path;
+   const char *thumb_key;
+   int w, h;
+};
+
+#endif /* __ETHUMB_PRIVATE_H__ */
diff --git a/legacy/ethumb/src/plugins/emotion/emotion.c b/legacy/ethumb/src/plugins/emotion/emotion.c
index cd5d748626..92802626a7 100644
--- a/legacy/ethumb/src/plugins/emotion/emotion.c
+++ b/legacy/ethumb/src/plugins/emotion/emotion.c
@@ -1,4 +1,5 @@
 #include "Ethumb.h"
+#include "ethumb_private.h"
 #include "Ethumb_Plugin.h"
 #include "config.h"
 
diff --git a/legacy/ethumb/src/plugins/epdf/epdf.c b/legacy/ethumb/src/plugins/epdf/epdf.c
index 55a5961baf..4389ce73fc 100644
--- a/legacy/ethumb/src/plugins/epdf/epdf.c
+++ b/legacy/ethumb/src/plugins/epdf/epdf.c
@@ -1,4 +1,5 @@
 #include "Ethumb.h"
+#include "ethumb_private.h"
 #include "Ethumb_Plugin.h"
 #include "config.h"