eog r4898 - in trunk: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Mon Dec  8 14:11:26 2008
New Revision: 4898
URL: http://svn.gnome.org/viewvc/eog?rev=4898&view=rev

Log:
2008-12-08  Claudio Saavedra  <csaavedra igalia com>

	* src/Makefile.am: Add eog-enums.h
	* src/eog-image.h: Move the EogImageData enum to a different file.
	* src/eog-enums.h: New file for misc enumerations.



Added:
   trunk/src/eog-enums.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/eog-image.h

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Dec  8 14:11:26 2008
@@ -60,6 +60,7 @@
 	eog-thumb-nav.h			\
 	eog-transform.h			\
 	eog-image.h			\
+	eog-enums.h			\
 	eog-image-save-info.h		\
 	eog-scroll-view.h		\
 	eog-thumb-view.h		\

Added: trunk/src/eog-enums.h
==============================================================================
--- (empty file)
+++ trunk/src/eog-enums.h	Mon Dec  8 14:11:26 2008
@@ -0,0 +1,37 @@
+/* Eye of GNOME - General enumerations.
+ *
+ * Copyright (C) 2007-2008 The Free Software Foundation
+ *
+ * Author: Lucas Rocha <lucasr gnome org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __EOG_ENUMS__
+#define __EOG_ENUMS__
+
+typedef enum {
+	EOG_IMAGE_DATA_IMAGE     = 1 << 0,
+	EOG_IMAGE_DATA_DIMENSION = 1 << 1,
+	EOG_IMAGE_DATA_EXIF      = 1 << 2,
+	EOG_IMAGE_DATA_XMP       = 1 << 3
+} EogImageData;
+
+#define EOG_IMAGE_DATA_ALL  (EOG_IMAGE_DATA_IMAGE |     \
+			     EOG_IMAGE_DATA_DIMENSION | \
+			     EOG_IMAGE_DATA_EXIF |      \
+			     EOG_IMAGE_DATA_XMP)
+
+#endif

Modified: trunk/src/eog-image.h
==============================================================================
--- trunk/src/eog-image.h	(original)
+++ trunk/src/eog-image.h	Mon Dec  8 14:11:26 2008
@@ -26,6 +26,7 @@
 #include "eog-window.h"
 #include "eog-transform.h"
 #include "eog-image-save-info.h"
+#include "eog-enums.h"
 
 #include <glib.h>
 #include <glib-object.h>
@@ -60,18 +61,6 @@
 #define EOG_IMAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  EOG_TYPE_IMAGE, EogImageClass))
 
 typedef enum {
-	EOG_IMAGE_DATA_IMAGE     = 1 << 0,
-	EOG_IMAGE_DATA_DIMENSION = 1 << 1,
-	EOG_IMAGE_DATA_EXIF      = 1 << 2,
-	EOG_IMAGE_DATA_XMP       = 1 << 3
-} EogImageData;
-
-#define EOG_IMAGE_DATA_ALL  (EOG_IMAGE_DATA_IMAGE |     \
-			     EOG_IMAGE_DATA_DIMENSION | \
-			     EOG_IMAGE_DATA_EXIF |      \
-			     EOG_IMAGE_DATA_XMP)
-
-typedef enum {
 	EOG_IMAGE_ERROR_SAVE_NOT_LOCAL,
 	EOG_IMAGE_ERROR_NOT_LOADED,
 	EOG_IMAGE_ERROR_VFS,