diff src/view_file_icon.c @ 442:4b2d7f9af171

Big whitespaces cleanup: - drop whitespaces at end of lines - convert eight spaces to tab at start of lines - drop spurious spaces mixed with tabs - remove empty lines at end of files
author zas_
date Sun, 20 Apr 2008 13:04:57 +0000
parents 5afe77bb563a
children ddabc4873a3f
line wrap: on
line diff
--- a/src/view_file_icon.c	Sun Apr 20 10:05:27 2008 +0000
+++ b/src/view_file_icon.c	Sun Apr 20 13:04:57 2008 +0000
@@ -96,7 +96,7 @@
 		IconData *id;
 
 		fd = work->data;
-		g_assert(fd->magick == 0x12345678); 
+		g_assert(fd->magick == 0x12345678);
 		id = g_new0(IconData, 1);
 
 		id->selected = SELECTION_NONE;
@@ -120,10 +120,10 @@
 		IconData *id = work->data;
 		file_data_unref(id->fd);
 		g_free(id);
-                work = work->next;                                                                                                    
-                }                                                                                                                     
-                                                                                                                                      
-        g_list_free(list);                                                                                                            
+		work = work->next;
+		}
+
+	g_list_free(list);
 
 }
 
@@ -202,7 +202,7 @@
 	if (vfi->click_id->selected & SELECTION_SELECTED)
 		{
 		GList *list;
-		
+
 		list = vficon_selection_get_list(vfi);
 		view_window_new_from_list(list);
 		filelist_free(list);
@@ -247,7 +247,7 @@
 	SortType type;
 
 	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
-	
+
 	vfi = submenu_item_get_data(widget);
 	if (!vfi) return;
 
@@ -300,7 +300,7 @@
 
 static void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
 {
-	ViewFileIcon *vfi = data;                                                                                                                               
+	ViewFileIcon *vfi = data;
 	vficon_selection_remove(vfi, vfi->click_id, SELECTION_PRELIGHT, NULL);
 	vfi->click_id = NULL;
 	vfi->popup = NULL;
@@ -376,10 +376,10 @@
 	if (!vfi->layout || !id || !id->fd) return;
 
 	sel_fd = id->fd;
-	
+
 	cur_fd = layout_image_get_fd(vfi->layout);
 	if (sel_fd == cur_fd) return; /* no change */
-	
+
 	if (options->image.enable_read_ahead)
 		{
 		gint row;
@@ -877,7 +877,7 @@
 			{
 			id = work->data;
 			vficon_select_util(vfi, id, select);
-			
+
 			if (work->data != end)
 				work = work->next;
 			else
@@ -932,7 +932,7 @@
 			{
 			IconData *id = work->data;
 			FileData *fd = id->fd;
-			g_assert(fd->magick == 0x12345678); 
+			g_assert(fd->magick == 0x12345678);
 			b += fd->size;
 
 			work = work->next;
@@ -954,7 +954,7 @@
 		{
 		IconData *id = work->data;
 		FileData *fd = id->fd;
-		g_assert(fd->magick == 0x12345678); 
+		g_assert(fd->magick == 0x12345678);
 
 		list = g_list_prepend(list, file_data_ref(fd));
 
@@ -971,7 +971,7 @@
 	GList *list = NULL;
 	GList *work;
 
-	work = vfi->selection;	
+	work = vfi->selection;
 	while (work)
 		{
 		list = g_list_prepend(list, GINT_TO_POINTER(g_list_index(vfi->list, work->data)));
@@ -1039,12 +1039,12 @@
 		FileData *fd = id->fd;
 		gboolean mark_val, selected;
 
-		g_assert(fd->magick == 0x12345678); 
+		g_assert(fd->magick == 0x12345678);
 
 		mark_val = fd->marks[mark];
 		selected = (id->selected & SELECTION_SELECTED);
-		
-		switch (mode) 
+
+		switch (mode)
 			{
 			case MTS_MODE_SET: selected = mark_val;
 				break;
@@ -1055,7 +1055,7 @@
 			case MTS_MODE_MINUS: selected = !mark_val & selected;
 				break;
 			}
-		
+
 		vficon_select_util(vfi, id, selected);
 
 		work = work->next;
@@ -1074,7 +1074,7 @@
 	while (work)
 		{
 		FileData *fd = work->data;
-		
+
 		switch (mode)
 			{
 			case STM_MODE_SET: fd->marks[mark] = 1;
@@ -1084,7 +1084,7 @@
 			case STM_MODE_TOGGLE: fd->marks[mark] = !fd->marks[mark];
 				break;
 			}
-			
+
 		work = work->next;
 		}
 	filelist_free(slist);
@@ -1442,7 +1442,7 @@
 	IconData *id;
 
 	tip_unschedule(vfi);
-	
+
 	id = vficon_find_data_by_coord(vfi, (gint)bevent->x, (gint)bevent->y, &iter);
 
 	vfi->click_id = id;
@@ -1500,7 +1500,7 @@
 	    id && vfi->click_id == id)
 		{
 		vficon_set_focus(vfi, id);
-		
+
 		if (bevent->state & GDK_CONTROL_MASK)
 			{
 			gint select;
@@ -1765,7 +1765,7 @@
 			{
 			list = vficon_add_row(vfi, &iter);
 			}
-		
+
 		while (list)
 			{
 			IconData *id;
@@ -2028,7 +2028,7 @@
 FileData *vficon_index_get_data(ViewFileIcon *vfi, gint row)
 {
 	IconData *id;
-	
+
 	id = g_list_nth_data(vfi->list, row);
 	return id ? id->fd : NULL;
 }
@@ -2037,7 +2037,7 @@
 {
 	FileData *fd;
 	IconData *id;
-	
+
 	id = g_list_nth_data(vfi->list, row);
 	fd = id ? id->fd : NULL;
 
@@ -2113,7 +2113,7 @@
 		work = vfi->list;
 		while (work)
 			{
-			
+
 			IconData *id = work->data;
 			FileData *fd = id->fd;
 			work = work->next;
@@ -2173,12 +2173,12 @@
 		{
 		IconData *id;
 		FileData *fd;
-		
+
 		GList *needle;
 
 		id = work->data;
 		fd = id->fd;
-		
+
 		needle = vfi->list;
 		while (needle)
 			{
@@ -2257,11 +2257,11 @@
 	vfi = cd->vfi;
 
 	gtk_tree_model_get(tree_model, iter, FILE_COLUMN_POINTER, &list, -1);
-	
+
 	id = g_list_nth_data(list, cd->number);
-	
+
 	if (id) g_assert(id->fd->magick == 0x12345678);
-	
+
 	style = gtk_widget_get_style(vfi->listview);
 	if (id && id->selected & SELECTION_SELECTED)
 		{
@@ -2283,7 +2283,7 @@
 		}
 
 	if (GQV_IS_CELL_RENDERER_ICON(cell))
-                {
+		{
 		if (id)
 			{
 			g_object_set(cell,	"pixbuf", id->fd->pixbuf,
@@ -2301,7 +2301,7 @@
 						"cell-background-set", FALSE,
 						"foreground-set", FALSE,
 						"has-focus", FALSE, NULL);
-			}	
+			}
 		}
 }
 
@@ -2644,14 +2644,14 @@
 
 				ignore_id = work->data;
 				ignore_fd = ignore_id->fd;
-				g_assert(ignore_fd->magick == 0x12345678); 
+				g_assert(ignore_fd->magick == 0x12345678);
 				work = work->next;
 
 				tmp = ignore_list;
 				while (tmp && !match)
 					{
 					FileData *ignore_list_fd = tmp->data;
-					g_assert(ignore_list_fd->magick == 0x12345678); 
+					g_assert(ignore_list_fd->magick == 0x12345678);
 					tmp = tmp->next;
 
 					if (ignore_list_fd == ignore_fd)