nemo r124 - in trunk: gtk uicommon

[arj svn gnome org]

Author: arj
Date: Wed Aug  6 16:03:12 2008
New Revision: 124
URL: http://svn.gnome.org/viewvc/nemo?rev=124&view=rev

Log:
Fixed another problem with update starred

The small star next to the item would not be displayed if an document
or picture gets metadata from backend (tracker/beagle)



Modified:
   trunk/gtk/MainWindow.cs
   trunk/uicommon/CalendarDriver.cs
   trunk/uicommon/Item.cs

Modified: trunk/gtk/MainWindow.cs
==============================================================================
--- trunk/gtk/MainWindow.cs	(original)
+++ trunk/gtk/MainWindow.cs	Wed Aug  6 16:03:12 2008
@@ -271,6 +271,7 @@
 				{
 					Nemo.VoidFunction data_callback = wrapper.item.on_data_callback;
 					Nemo.VoidFunction label_callback = wrapper.item.on_labels_callback;
+					Nemo.VoidFunction<bool> small_starred_update = wrapper.item.small_starred_update_function;
 					
 					// in case something was changed before we got data from tracker
 					wrapper.item.file.labels.Clear();
@@ -284,14 +285,17 @@
 						wrapper.item.on_data_callback();
 					}
 					
-					if (label_callback != null) {
+					if (label_callback != null)
 						wrapper.item.on_labels_callback = label_callback;
-					}
+
+					if (small_starred_update != null)
+					    wrapper.item.small_starred_update_function = small_starred_update;
 				} 
 				else if (Nemo.PictureItem.is_image(result[0])) 
 				{
 					Nemo.VoidFunction data_callback = wrapper.item.on_data_callback;
 					Nemo.VoidFunction label_callback = wrapper.item.on_labels_callback;
+					Nemo.VoidFunction<bool> small_starred_update = wrapper.item.small_starred_update_function;
 
 					// in case something was changed before we got data from tracker
 					wrapper.item.file.labels.Clear();
@@ -305,9 +309,11 @@
 						wrapper.item.on_data_callback();
 					}
 					
-					if (label_callback != null) {
+					if (label_callback != null)
 						wrapper.item.on_labels_callback = label_callback;
-					}
+
+					if (small_starred_update != null)
+					    wrapper.item.small_starred_update_function = small_starred_update;
 				} else 
 					wrapper.item.mime_type = result[0];
 			}));
@@ -443,4 +449,4 @@
     	if (args.Event.Key == Gdk.Key.Escape) 
     		Singleton<OverlayTracker>.Instance.hide_all_and_die();
 	}
-}
\ No newline at end of file
+}

Modified: trunk/uicommon/CalendarDriver.cs
==============================================================================
--- trunk/uicommon/CalendarDriver.cs	(original)
+++ trunk/uicommon/CalendarDriver.cs	Wed Aug  6 16:03:12 2008
@@ -11,7 +11,7 @@
 		// helper classes/functions
 		private CalendarDrawer drawer;
 
-        public VoidFunction search_func;
+        public VoidFunction search_func;
 		public VoidFunction<CalendarDriver.View> set_active_view;
 
 		public CalendarDriver(CalendarDrawer d)
@@ -331,4 +331,4 @@
 			drawer.draw(current_state, centered_date, elements);
 		}
 	}
-}
\ No newline at end of file
+}

Modified: trunk/uicommon/Item.cs
==============================================================================
--- trunk/uicommon/Item.cs	(original)
+++ trunk/uicommon/Item.cs	Wed Aug  6 16:03:12 2008
@@ -119,7 +119,7 @@
             Process.Start("'" + path + "'");
 		}
 
-	        VoidFunction<bool> small_starred_update_function;
+	        public VoidFunction<bool> small_starred_update_function;
    	        VoidFunction<bool> big_starred_update_function;
 
 		public void register_small_starred_change(VoidFunction<bool> update_function)