totem-pl-parser r139 - in trunk: . plparse

[chpe svn gnome org]

Author: chpe
Date: Tue Jun 10 12:46:22 2008
New Revision: 139
URL: http://svn.gnome.org/viewvc/totem-pl-parser?rev=139&view=rev

Log:
	* plparse/totem-pl-parser.c: (totem_pl_parser_class_init),
	(totem_pl_parser_add_url_valist):
	* plparse/totemplparser-marshal.list: Use G_TYPE_HASH_TABLE in the
	signals to transport the hash table, and use g_hash_table_unref
	instead of g_hash_table_destroy so that the signal handler may
	usefully keep a reference to the hash table. Patch from bug #536060.

Modified:
   trunk/ChangeLog
   trunk/plparse/totem-pl-parser.c
   trunk/plparse/totemplparser-marshal.list

Modified: trunk/plparse/totem-pl-parser.c
==============================================================================
--- trunk/plparse/totem-pl-parser.c	(original)
+++ trunk/plparse/totem-pl-parser.c	Tue Jun 10 12:46:22 2008
@@ -353,8 +353,8 @@
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (TotemPlParserClass, entry_parsed),
 			      NULL, NULL,
-			      totemplparser_marshal_VOID__STRING_POINTER,
-			      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER);
+			      totemplparser_marshal_VOID__STRING_BOXED,
+			      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_HASH_TABLE);
 	/**
 	 * TotemPlParser::playlist-started:
 	 * @parser: the object which received the signal
@@ -373,8 +373,8 @@
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (TotemPlParserClass, playlist_started),
 			      NULL, NULL,
-			      totemplparser_marshal_VOID__STRING_POINTER,
-			      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER);
+			      totemplparser_marshal_VOID__STRING_BOXED,
+			      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_HASH_TABLE);
 	/**
 	 * TotemPlParser::playlist-ended:
 	 * @parser: the object which received the signal
@@ -1189,7 +1189,7 @@
 		}
 	}
 
-	g_hash_table_destroy (metadata);
+	g_hash_table_unref (metadata);
 
 	g_free (url);
 	g_object_unref (G_OBJECT (parser));

Modified: trunk/plparse/totemplparser-marshal.list
==============================================================================
--- trunk/plparse/totemplparser-marshal.list	(original)
+++ trunk/plparse/totemplparser-marshal.list	Tue Jun 10 12:46:22 2008
@@ -1,2 +1,2 @@
 VOID:STRING,STRING,STRING
-VOID:STRING,POINTER
+VOID:STRING,BOXED