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, 15 insertions, 21 deletions

diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2cb6d7db6a..e43fd9fdf5 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -161,7 +161,6 @@ e_table_header_item_get_height (ETableHeaderItem *ethi)
 	ETableHeader *eth;
 	int numcols, col;
 	int maxheight;
-	GtkStyle *style;
 
 	g_return_val_if_fail (ethi != NULL, 0);
 	g_return_val_if_fail (E_IS_TABLE_HEADER_ITEM (ethi), 0);
@@ -171,8 +170,6 @@ e_table_header_item_get_height (ETableHeaderItem *ethi)
 
 	maxheight = 0;
 
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->style;
-
 	for (col = 0; col < numcols; col++) {
 		ETableCol *ecol = e_table_header_get_column (eth, col);
 		int height;
@@ -896,7 +893,6 @@ static void
 ethi_realize (GnomeCanvasItem *item)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GdkWindow *window;
 	GtkTargetEntry  ethi_drop_types [] = {
 		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
@@ -905,8 +901,6 @@ ethi_realize (GnomeCanvasItem *item)
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
 		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
 
-	window = GTK_WIDGET (item->canvas)->window;
-
 	if (!ethi->font)
 		ethi_font_set (ethi, gtk_style_get_font (GTK_WIDGET (item->canvas)->style));
 
@@ -1722,10 +1716,10 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			needs_ungrab = (ethi->resize_guide != NULL);
 			ethi_end_resize (ethi);
 		} else if (was_maybe_drag && ethi->sort_info) {
-			ETableCol *col;
+			ETableCol *ecol;
 		
-			col = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, e->button.x));
-			ethi_change_sort_state (ethi, col);
+			ecol = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, e->button.x));
+			ethi_change_sort_state (ethi, ecol);
 		}
 		
 		if (needs_ungrab)
@@ -1736,16 +1730,16 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 	case GDK_KEY_PRESS:
 		if ((e->key.keyval == GDK_F10) && (e->key.state & GDK_SHIFT_MASK)) {
 			EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
-			ETableCol *col;
+			ETableCol *ecol;
 			GtkMenu *popup;
  
 			info->ethi = ethi;
 			info->col = ethi->selected_col;
-			col = e_table_header_get_column (ethi->eth, info->col);
+			ecol = e_table_header_get_column (ethi->eth, info->col);
 			
 			popup = e_popup_menu_create_with_domain (ethi_context_menu,
 								 1 +
-								 (col->sortable ? 0 : 2) +
+								 (ecol->sortable ? 0 : 2) +
 								 ((ethi->table || ethi->tree) ? 0 : 4) + 
 								 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
 								 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
@@ -1756,28 +1750,28 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 					  G_CALLBACK (free_popup_info), info);
 			e_popup_menu (popup, NULL);
 		} else if (e->key.keyval == GDK_space) {
-			ETableCol *col;
+			ETableCol *ecol;
 			
-			col = e_table_header_get_column (ethi->eth, ethi->selected_col);
-			ethi_change_sort_state (ethi, col);
+			ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
+			ethi_change_sort_state (ethi, ecol);
 		} else if ((e->key.keyval == GDK_Right) || (e->key.keyval == GDK_KP_Right)) {
-			ETableCol *col;
+			ETableCol *ecol;
 
 			if ((ethi->selected_col < 0) || (ethi->selected_col >= ethi->eth->col_count - 1))
 				ethi->selected_col = 0;
 			else 
 				ethi->selected_col++;
-			col = e_table_header_get_column (ethi->eth, ethi->selected_col);
-			ethi_change_sort_state (ethi, col);
+			ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
+			ethi_change_sort_state (ethi, ecol);
 		} else if ((e->key.keyval == GDK_Left) || (e->key.keyval == GDK_KP_Left)) {
-			ETableCol *col;
+			ETableCol *ecol;
 
 			if ((ethi->selected_col <= 0) || (ethi->selected_col >= ethi->eth->col_count))
 				ethi->selected_col = ethi->eth->col_count - 1;
 			else 
 				ethi->selected_col--;
-			col = e_table_header_get_column (ethi->eth, ethi->selected_col);
-			ethi_change_sort_state (ethi, col);
+			ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
+			ethi_change_sort_state (ethi, ecol);
 		}
 		break;