nautilus r14806 - in trunk: . libnautilus-private src

[alexl svn gnome org]

Author: alexl
Date: Wed Dec 10 10:40:44 2008
New Revision: 14806
URL: http://svn.gnome.org/viewvc/nautilus?rev=14806&view=rev

Log:
2008-12-10  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-file.c:
        * libnautilus-private/nautilus-global-preferences.c:
        * src/nautilus-file-management-properties.c:
        * src/nautilus-file-management-properties.ui:
	Update the 2GB and 4GB thumbnail limits to the new prefs API and
	make sure they actually work.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file.c
   trunk/libnautilus-private/nautilus-global-preferences.c
   trunk/src/nautilus-file-management-properties.c
   trunk/src/nautilus-file-management-properties.ui

Modified: trunk/libnautilus-private/nautilus-file.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file.c	(original)
+++ trunk/libnautilus-private/nautilus-file.c	Wed Dec 10 10:40:44 2008
@@ -3341,7 +3341,7 @@
 }
 
 
-static int cached_thumbnail_limit;
+static guint cached_thumbnail_limit;
 int cached_thumbnail_size;
 static int show_image_thumbs;
 
@@ -3380,7 +3380,7 @@
 	 */
 	if (nautilus_thumbnail_is_mimetype_limited_by_size (mime_type) &&
 	    file->details->thumbnail_path == NULL &&
-	    nautilus_file_get_size (file) > (unsigned int)cached_thumbnail_limit) {
+	    nautilus_file_get_size (file) > cached_thumbnail_limit) {
 		return FALSE;
 	}
 
@@ -7086,7 +7086,7 @@
 static void
 thumbnail_limit_changed_callback (gpointer user_data)
 {
-	cached_thumbnail_limit = eel_preferences_get_integer (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT);
+	cached_thumbnail_limit = eel_preferences_get_uint (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT);
 
 	/* Tell the world that icons might have changed. We could invent a narrower-scope
 	 * signal to mean only "thumbnails might have changed" if this ends up being slow

Modified: trunk/libnautilus-private/nautilus-global-preferences.c
==============================================================================
--- trunk/libnautilus-private/nautilus-global-preferences.c	(original)
+++ trunk/libnautilus-private/nautilus-global-preferences.c	Wed Dec 10 10:40:44 2008
@@ -96,8 +96,8 @@
 	{ "10485760",	    N_("10 MB"),	10485760 },
 	{ "104857600",	    N_("100 MB"),	104857600 },
 	{ "1073741824",     N_("1 GB"),         1073741824 },
-	{ "2147483648",     N_("2 GB"),         2147483648 },
- 	{ "4294967295",     N_("4 GB"),         4294967295 }
+	{ "2147483648",     N_("2 GB"),         2147483648U },
+ 	{ "4294967295",     N_("4 GB"),         4294967295U }
 };
 
 static EelEnumerationEntry click_policy_enum_entries[] = {

Modified: trunk/src/nautilus-file-management-properties.c
==============================================================================
--- trunk/src/nautilus-file-management-properties.c	(original)
+++ trunk/src/nautilus-file-management-properties.c	Wed Dec 10 10:40:44 2008
@@ -141,7 +141,7 @@
 	NULL
 };
 
-static const int thumbnail_limit_values[] = {
+static const guint thumbnail_limit_values[] = {
 	102400,
 	512000,
 	1048576,
@@ -150,7 +150,8 @@
 	10485760,
 	104857600,
 	1073741824,
-	-1
+	2147483648U,
+ 	4294967295U
 };
 
 static const char * const icon_captions_components[] = {
@@ -782,10 +783,11 @@
 								  NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION,
 								  (const char **) executable_text_values);
 	
-	eel_preferences_builder_connect_int_enum (builder,
-						  NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET,
-						  NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
-						  (const int *) thumbnail_limit_values);
+	eel_preferences_builder_connect_uint_enum (builder,
+						   NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET,
+						   NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
+						   (const guint *) thumbnail_limit_values,
+						   G_N_ELEMENTS (thumbnail_limit_values));
 
 	nautilus_file_management_properties_dialog_setup_icon_caption_page (builder);
 	nautilus_file_management_properties_dialog_setup_list_column_page (builder);

Modified: trunk/src/nautilus-file-management-properties.ui
==============================================================================
--- trunk/src/nautilus-file-management-properties.ui	(original)
+++ trunk/src/nautilus-file-management-properties.ui	Wed Dec 10 10:40:44 2008
@@ -184,6 +184,12 @@
       <row>
         <col id="0">1 GB</col>
       </row>
+      <row>
+        <col id="0">2 GB</col>
+      </row>
+      <row>
+        <col id="0">4 GB</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="model9">