changeset 2134:be0b04d8e90d

Drop unused variables and code. pan-view.c: In function ‘pan_grid_build’: pan-view.c:753:14: attention : variable ‘ah’ set but not used [-Wunused-but-set-variable] pan-view.c:753:10: attention : variable ‘aw’ set but not used [-Wunused-but-set-variable] pan-view.c: In function ‘pan_window_key_press_cb’: pan-view.c:1217:2: attention : suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses] pan-view.c:1271:8: attention : variable ‘n’ set but not used [-Wunused-but-set-variable] pan-view.c: In function ‘pan_window_set_dnd_data’: pan-view.c:2939:8: attention : unused variable ‘len’ [-Wunused-variable] pan-view.c:2938:10: attention : unused variable ‘text’ [-Wunused-variable]
author Laurent Monin <zas@norz.org>
date Thu, 30 Aug 2012 14:30:57 +0200
parents 3384ddc4abb5
children 6a3247b85286
files src/pan-view.c
diffstat 1 files changed, 1 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/pan-view.c	Thu Aug 30 14:26:21 2012 +0200
+++ b/src/pan-view.c	Thu Aug 30 14:30:57 2012 +0200
@@ -748,9 +748,6 @@
 	gint col, row;
 	gint cw, ch;
 	gint l;
-	gdouble total;
-	gdouble s;
-	gdouble aw, ah;
 	gint i, j;
 
 	pan_grid_clear(pw);
@@ -759,12 +756,6 @@
 
 	if (l < 1) return;
 
-	total = (gdouble)width * (gdouble)height / (gdouble)l;
-	s = sqrt(total);
-
-	aw = (gdouble)width / s;
-	ah = (gdouble)height / s;
-
 	col = (gint)(sqrt((gdouble)l / grid_size) * width / height + 0.999);
 	col = CLAMP(col, 1, l / grid_size + 1);
 	row = (gint)((gdouble)l / grid_size / col);
@@ -1214,7 +1205,7 @@
 	fd = pan_menu_click_fd(pw);
 	
 	imd_widget = gtk_container_get_focus_child(GTK_CONTAINER(pw->imd->widget));
-	focused = (pw->fs || imd_widget && gtk_widget_has_focus(imd_widget));
+	focused = (pw->fs || (imd_widget && gtk_widget_has_focus(imd_widget)));
 	on_entry = (gtk_widget_has_focus(pw->path_entry) ||
 		    gtk_widget_has_focus(pw->search_entry));
 
@@ -1268,40 +1259,19 @@
 
 	if (event->state & GDK_CONTROL_MASK)
 		{
-		gint n = -1;
-
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
 			case '1':
-				n = 0;
-				break;
 			case '2':
-				n = 1;
-				break;
 			case '3':
-				n = 2;
-				break;
 			case '4':
-				n = 3;
-				break;
 			case '5':
-				n = 4;
-				break;
 			case '6':
-				n = 5;
-				break;
 			case '7':
-				n = 6;
-				break;
 			case '8':
-				n = 7;
-				break;
 			case '9':
-				n = 8;
-				break;
 			case '0':
-				n = 9;
 				break;
 			case 'C': case 'c':
 				if (fd) file_util_copy(fd, NULL, NULL, GTK_WIDGET(pr));
@@ -2935,8 +2905,6 @@
 	fd = pan_menu_click_fd(pw);
 	if (fd)
 		{
-		gchar *text = NULL;
-		gint len;
 		GList *list;
 
 		list = g_list_append(NULL, fd);