[maemo-commits] [maemo-commits] r17108 - in projects/haf/trunk/totem-pl-parser: . plparse

[From: subversion at stage.maemo.org]

Author: ifrade
Date: 2009-01-12 16:43:31 +0200 (Mon, 12 Jan 2009)
New Revision: 17108

Modified:
   projects/haf/trunk/totem-pl-parser/ChangeLog
   projects/haf/trunk/totem-pl-parser/plparse/Makefile.am
   projects/haf/trunk/totem-pl-parser/plparse/totem-disc.c
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-builtins.c
Log:
2008-11-28 Philip Withnall <philip at tecnocode.co.uk>

	* plparse/Makefile.am:
	* plparse/totem-disc.c:
	* plparse/totem-pl-parser-builtins.c
	(totem_pl_parser_error_get_type): Fix build errors introduced in
	previous commit. (Closes: #562571)

Modified: projects/haf/trunk/totem-pl-parser/ChangeLog
===================================================================
--- projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:30 UTC (rev 17107)
+++ projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:31 UTC (rev 17108)
@@ -1,3 +1,11 @@
+2008-11-28  Philip Withnall  <philip at tecnocode.co.uk>
+
+	* plparse/Makefile.am:
+	* plparse/totem-disc.c:
+	* plparse/totem-pl-parser-builtins.c
+	(totem_pl_parser_error_get_type): Fix build errors introduced in
+	previous commit. (Closes: #562571)
+
 2008-11-27  Philip Withnall  <philip at tecnocode.co.uk>
 
 	* plparse/totem-disc.c (cd_cache_new), (cd_cache_open_device),

Modified: projects/haf/trunk/totem-pl-parser/plparse/Makefile.am
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/Makefile.am	2009-01-12 14:43:30 UTC (rev 17107)
+++ projects/haf/trunk/totem-pl-parser/plparse/Makefile.am	2009-01-12 14:43:31 UTC (rev 17108)
@@ -59,10 +59,10 @@
 	totem-pl-parser-mini.h
 
 libtotem_plparser_la_SOURCES =			\
+	totem-pl-parser-builtins.c		\
+	totem-pl-parser-builtins.h		\
 	totem-disc.c				\
 	totem-disc.h				\
-	totem-pl-parser-builtins.c		\
-	totem-pl-parser-builtins.h		\
 	totem-pl-parser.c			\
 	totem-pl-parser-features.h		\
 	totem-pl-parser.h			\

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-disc.c
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-disc.c	2009-01-12 14:43:30 UTC (rev 17107)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-disc.c	2009-01-12 14:43:31 UTC (rev 17108)
@@ -52,6 +52,7 @@
 #include <gio/gio.h>
 
 #include "totem-disc.h"
+#include "totem-pl-parser.h"
 
 typedef struct _CdCache {
   /* device node and mountpoint */

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-builtins.c
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-builtins.c	2009-01-12 14:43:30 UTC (rev 17107)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-builtins.c	2009-01-12 14:43:31 UTC (rev 17108)
@@ -44,8 +44,10 @@
   static GType etype = 0;
   if (etype == 0) {
     static const GEnumValue values[] = {
-      { TOTEM_PL_PARSER_ERROR_VFS_OPEN, "TOTEM_PL_PARSER_ERROR_VFS_OPEN", "open" },
-      { TOTEM_PL_PARSER_ERROR_VFS_WRITE, "TOTEM_PL_PARSER_ERROR_VFS_WRITE", "write" },
+      { TOTEM_PL_PARSER_ERROR_VFS_OPEN, "TOTEM_PL_PARSER_ERROR_VFS_OPEN", "vfs-open" },
+      { TOTEM_PL_PARSER_ERROR_VFS_WRITE, "TOTEM_PL_PARSER_ERROR_VFS_WRITE", "vfs-write" },
+      { TOTEM_PL_PARSER_ERROR_NO_DISC, "TOTEM_PL_PARSER_ERROR_NO_DISC", "no-disc" },
+      { TOTEM_PL_PARSER_ERROR_MOUNT_FAILED, "TOTEM_PL_PARSER_ERROR_MOUNT_FAILED", "mount-failed" },
       { 0, NULL, NULL }
     };
     etype = g_enum_register_static ("TotemPlParserError", values);