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

[From: subversion at stage.maemo.org]

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

Modified:
   projects/haf/trunk/totem-pl-parser/ChangeLog
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-builtins.c
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.h
Log:
2008-12-01 Bastien Nocera <hadess at hadess.net>

	* plparse/totem-pl-parser-builtins.c
	(totem_pl_parser_error_get_type):
	* plparse/totem-pl-parser.c:
	* plparse/totem-pl-parser.h: Remove unused
	TOTEM_PL_PARSER_ERROR_VFS_[OPEN|WRITE] enums,
	spotted by Christian Persch <chpe at gnome.org> (Closes: #560497)
	Fix warnings wrt totem_pl_parser_error_get_type

Modified: projects/haf/trunk/totem-pl-parser/ChangeLog
===================================================================
--- projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:33 UTC (rev 17109)
+++ projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:35 UTC (rev 17110)
@@ -1,3 +1,13 @@
+2008-12-01  Bastien Nocera  <hadess at hadess.net>
+
+	* plparse/totem-pl-parser-builtins.c
+	(totem_pl_parser_error_get_type):
+	* plparse/totem-pl-parser.c:
+	* plparse/totem-pl-parser.h: Remove unused
+	TOTEM_PL_PARSER_ERROR_VFS_[OPEN|WRITE] enums,
+	spotted by Christian Persch <chpe at gnome.org> (Closes: #560497)
+	Fix warnings wrt totem_pl_parser_error_get_type
+
 2008-11-28  Philip Withnall  <philip at tecnocode.co.uk>
 
 	* plparse/Makefile.am:

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:33 UTC (rev 17109)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-builtins.c	2009-01-12 14:43:35 UTC (rev 17110)
@@ -44,8 +44,6 @@
   static GType etype = 0;
   if (etype == 0) {
     static const GEnumValue values[] = {
-      { 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 }

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-12 14:43:33 UTC (rev 17109)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-12 14:43:35 UTC (rev 17110)
@@ -1959,7 +1959,7 @@
 	return retval;
 }
 
-
+#ifndef TOTEM_PL_PARSER_MINI
 GType
 totem_pl_parser_metadata_get_type (void)
 {
@@ -1974,4 +1974,5 @@
 	}
 	return g_define_type_id__volatile;
 }
+#endif /* !TOTEM_PL_PARSER_MINI */
 

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.h
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.h	2009-01-12 14:43:33 UTC (rev 17109)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.h	2009-01-12 14:43:35 UTC (rev 17110)
@@ -286,8 +286,6 @@
 
 /**
  * TotemPlParserError:
- * @TOTEM_PL_PARSER_ERROR_VFS_OPEN: Error on opening a file
- * @TOTEM_PL_PARSER_ERROR_VFS_WRITE: Error on writing a file
  * @TOTEM_PL_PARSER_ERROR_NO_DISC: Error attempting to open a disc device when no disc is present
  * @TOTEM_PL_PARSER_ERROR_MOUNT_FAILED: An attempted mount operation failed
  *
@@ -296,8 +294,6 @@
  **/
 typedef enum
 {
-	TOTEM_PL_PARSER_ERROR_VFS_OPEN,
-	TOTEM_PL_PARSER_ERROR_VFS_WRITE,
 	TOTEM_PL_PARSER_ERROR_NO_DISC,
 	TOTEM_PL_PARSER_ERROR_MOUNT_FAILED
 } TotemPlParserError;