rhythmbox r6124 - in trunk: . tests widgets

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Jan  6 10:43:45 2009
New Revision: 6124
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6124&view=rev

Log:
2009-01-06  Jonathan Matthew  <jonathan d14n org>

	* widgets/rb-query-creator.c: (rb_query_creator_get_limit):
	If the size limit is set using the 'GB' option, return that as a
	number of MB in a uint64, rather than GB in a ulong for consistency
	with the 'MB' option.  Fixes #566615.

	* tests/test-widgets.c: (START_TEST):
	Actually test the above.


Modified:
   trunk/ChangeLog
   trunk/tests/test-widgets.c
   trunk/widgets/rb-query-creator.c

Modified: trunk/tests/test-widgets.c
==============================================================================
--- trunk/tests/test-widgets.c	(original)
+++ trunk/tests/test-widgets.c	Tue Jan  6 10:43:45 2009
@@ -369,7 +369,7 @@
 	query = rhythmdb_query_parse (db,
 				      RHYTHMDB_QUERY_END);
 	array = g_value_array_new (0);
-	rb_value_array_append_data (array, G_TYPE_UINT64, (guint64)(14 * 1024));
+	rb_value_array_append_data (array, G_TYPE_UINT64, (guint64)(14 * 1000));
 	query_creator_test_load_query (db,
 				       query,
 				       RHYTHMDB_QUERY_MODEL_LIMIT_SIZE, array,

Modified: trunk/widgets/rb-query-creator.c
==============================================================================
--- trunk/widgets/rb-query-creator.c	(original)
+++ trunk/widgets/rb-query-creator.c	Tue Jan  6 10:43:45 2009
@@ -662,7 +662,7 @@
 
 		case 2:
 			*type = RHYTHMDB_QUERY_MODEL_LIMIT_SIZE;
-			rb_value_array_append_data (*limit, G_TYPE_ULONG, (gulong)l);
+			rb_value_array_append_data (*limit, G_TYPE_UINT64, l * 1000);
 			break;
 
 		case 3: