Tons of cleanups of the following sort: - remove unused vars - remove

2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>

	* e-timezone-dialog/e-timezone-dialog.c: (get_zone_from_point):
	* menus/gal-view-menus.c:
	* misc/e-attachment-bar.c: (calculate_height_width),
	(update_remote_file), (e_attachment_bar_get_attachment),
	(class_init):
	* misc/e-attachment.c: (async_progress_update_cb),
	(download_to_local_path):
	* misc/e-calendar-item.c: (e_calendar_item_get_arg),
	(e_calendar_item_realize), (e_calendar_item_ensure_days_visible):
	* misc/e-calendar.c: (e_calendar_drag_motion),
	(e_calendar_drag_leave), (e_calendar_focus):
	* misc/e-canvas-background.c: (ecb_get_property):
	* misc/e-canvas.c: (e_canvas_class_init), (pick_current_item):
	* misc/e-cell-date-edit.c: (e_cell_date_edit_do_popup),
	(e_cell_date_edit_show_popup):
	* misc/e-cell-percent.c:
	* misc/e-charset-picker.c: (e_charset_picker_bonobo_ui_populate):
	* misc/e-config-page.c: (e_config_page_class_init):
	* misc/e-dateedit.c: (e_date_edit_set_date),
	(e_date_edit_set_date_and_time_of_day),
	(on_date_popup_date_selected):
	* misc/e-dropdown-button.c: (e_dropdown_button_class_init):
	* misc/e-expander.c: (get_expander_bounds), (e_expander_expose),
	(is_in_expander_panel):
	* misc/e-filter-bar.c: (option_changed), (build_items):
	* misc/e-image-chooser.c: (e_image_chooser_init),
	(image_drag_data_received_cb):
	* misc/e-map.c: (e_map_size_allocate), (e_map_button_press),
	(e_map_button_release), (e_map_motion), (e_map_zoom_to_location),
	(e_map_zoom_out), (update_render_point), (repaint_point),
	(zoom_in_smooth):
	* misc/e-multi-config-dialog.c: (impl_response):
	* misc/e-reflow.c: (e_reflow_realize), (e_reflow_event):
	* misc/e-search-bar.c: (clear_search), (search_now_verb_cb),
	(entry_activated_cb), (activate_button_clicked_cb),
	(clear_button_clicked_cb):
	* misc/e-selection-model.c: (e_selection_model_key_press):
	* misc/e-send-options.c: (delay_until_date_changed_cb),
	(e_sendoptions_get_need_general_options):
	* misc/e-unicode.c: (e_stripped_char):
	* table/e-cell-progress.c: (eprog_draw_border), (eprog_draw),
	(eprog_event):
	* table/e-cell-spin-button.c: (ecsb_event), (ecsb_focus),
	(ecsb_unfocus), (ecsb_dispose):
	* table/e-cell-text.c: (ect_draw), (ect_show_tooltip):
	* table/e-cell-toggle.c: (etog_draw), (etog_event):
	* table/e-cell-tree.c: (ect_max_width):
	* table/e-cell-vbox.c:
	* table/e-table-click-to-add.c: (etcta_event):
	* table/e-table-config.c: (create_global_store):
	* table/e-table-field-chooser-dialog.c:
	* table/e-table-field-chooser-item.c: (etfci_find_button),
	(etfci_reflow), (etfci_get_property), (etfci_realize):
	* table/e-table-field-chooser.c:
	(e_table_field_chooser_class_init):
	* table/e-table-group-container.c: (etgc_unrealize):
	* table/e-table-group.c: (e_table_group_new):
	* table/e-table-header-item.c: (e_table_header_item_get_height),
	(ethi_realize), (ethi_event):
	* table/e-table-header-utils.c: (e_table_draw_elided_string),
	(e_table_header_draw_button):
	* table/e-table-item.c: (eti_set_property), (eti_get_property),
	(eti_draw), (eti_event), (eti_cursor_change):
	* table/e-table-scrolled.c: (e_table_scrolled_class_init):
	* table/e-table-search.c:
	* table/e-table-sort-info.c: (e_table_sort_info_save_to_node):
	* table/e-table.c: (table_canvas_reflow_idle),
	(table_canvas_size_allocate), (canvas_vbox_event),
	(click_to_add_event), (do_drag_motion), (e_table_class_init):
	* table/e-tree-scrolled.c: (e_tree_scrolled_class_init):
	* table/e-tree.c: (tree_canvas_reflow_idle),
	(tree_canvas_size_allocate), (e_tree_drag_get_data),
	(do_drag_motion), (e_tree_class_init):
	* text/e-text.c: (e_text_set_property), (e_text_draw),
	(_do_tooltip), (primary_clear_cb), (_get_position),
	(e_text_command): Tons of cleanups of the following sort:
	- remove unused vars
	- remove extraneous semi-colons
	- add some comments where assignments were done without using
	  the results later
	- remove break; statements after return foo;
	- add casts in some places to be more type correct
	- rename variables with name clashes
	- s/if/ifdef in some cases
	- mark some code static
	- remove some unused functions
	- use guint for 1-bit bitfields

svn path=/trunk/; revision=31371

1 files changed, 3 insertions, 15 deletions

diff --git a/widgets/table/e-cell-progress.c b/widgets/table/e-cell-progress.c
index 10ce1c8291..8e10d7cc31 100644
--- a/widgets/table/e-cell-progress.c
+++ b/widgets/table/e-cell-progress.c
@@ -110,7 +110,7 @@ eprog_clear (ECellProgress *progress)
 static void
 eprog_draw_border (ECellProgress *progress, guchar red, guchar green, guchar blue)
 {
-  gint i, j, w4, p4, pw4, wpb4, hp1;
+  gint i, j, w4, p4, pw4, wpb4;
 
 /*
  * some speedup
@@ -119,7 +119,6 @@ eprog_draw_border (ECellProgress *progress, guchar red, guchar green, guchar blu
   p4=progress->padding*4;
   pw4=w4*progress->padding;
   wpb4=(progress->width-progress->padding-progress->border)*4;
-  hp1=(progress->height-progress->padding-1);
 
   for (i=progress->padding*4;i<(progress->width-progress->padding)*4;i+=4){
     for (j=0;j<progress->border;j++){
@@ -172,37 +171,27 @@ eprog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	  int x1, int y1, int x2, int y2)
 {
 	ECellProgress *progress = E_CELL_PROGRESS (ecell_view->ecell);
-	gboolean selected;
-	GdkPixbuf *image;
-	int x, y, width, height;
+	int x, y;
 	
 	const int value = GPOINTER_TO_INT (
 		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
 	
-	selected = flags & E_CELL_SELECTED;
-
 	if ((value > progress->max)||(value < progress->min)){
 		g_warning ("Value from the table model is %d, the states we support are [%d..%d]\n",
 			   value, progress->min, progress->max);
 		return;
 	}
 
-	image = progress->image;
-
 	if ((x2 - x1) < progress->width){
 		x = x1;
-		width = x2 - x1;
 	} else {
 		x = x1 + ((x2 - x1) - progress->width) / 2;
-		width = progress->width;
 	}
 
 	if ((y2 - y1) < progress->height){
 		y = y1;
-		height = y2 - y1;
 	} else {
 		y = y1 + ((y2 - y1) - progress->height) / 2;
-		height = progress->height;
 	}
 
 	eprog_clear(progress);
@@ -267,7 +256,6 @@ eprog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col
 	default:
 		return FALSE;
 	}
-	return TRUE;
 }
 
 /*
@@ -323,7 +311,7 @@ e_cell_progress_class_init (GObjectClass *object_class)
 	parent_class = g_type_class_ref (PARENT_TYPE);
 }
 
-E_MAKE_TYPE(e_cell_progress, "ECellProgress", ECellProgress, e_cell_progress_class_init, NULL, PARENT_TYPE);
+E_MAKE_TYPE(e_cell_progress, "ECellProgress", ECellProgress, e_cell_progress_class_init, NULL, PARENT_TYPE)
 
 /**
  * e_cell_progress_construct: