From 4a4b322c39f2bccddd9b9f41dead3429dab80f57 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Mon, 30 Jan 2006 12:28:21 +0000 Subject: Tons of cleanups of the following sort: - remove unused vars - remove 2006-01-30 Kjartan Maraas * 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 --- widgets/misc/e-map.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) (limited to 'widgets/misc/e-map.c') diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 0d73ed3493..6a2980430b 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -375,8 +375,6 @@ static void e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { EMap *view; - EMapPrivate *priv; - int xofs, yofs; GdkRectangle area; g_return_if_fail (widget != NULL); @@ -384,10 +382,6 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) g_return_if_fail (allocation != NULL); view = E_MAP (widget); - priv = view->priv; - - xofs = priv->xofs; - yofs = priv->yofs; /* Resize the window */ @@ -413,12 +407,6 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) static gint e_map_button_press (GtkWidget *widget, GdkEventButton *event) { - EMap *view; - EMapPrivate *priv; - - view = E_MAP (widget); - priv = view->priv; - if (!GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget); return TRUE; } @@ -429,12 +417,6 @@ e_map_button_press (GtkWidget *widget, GdkEventButton *event) static gint e_map_button_release (GtkWidget *widget, GdkEventButton *event) { - EMap *view; - EMapPrivate *priv; - - view = E_MAP (widget); - priv = view->priv; - if (event->button != 1) return FALSE; gdk_pointer_ungrab (event->time); @@ -447,12 +429,6 @@ e_map_button_release (GtkWidget *widget, GdkEventButton *event) static gint e_map_motion (GtkWidget *widget, GdkEventMotion *event) { - EMap *view; - EMapPrivate *priv; - - view = E_MAP (widget); - priv = view->priv; - return FALSE; /* @@ -728,7 +704,6 @@ void e_map_zoom_to_location (EMap *map, double longitude, double latitude) { EMapPrivate *priv; - int width, height; g_return_if_fail (map); g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map))); @@ -738,9 +713,6 @@ e_map_zoom_to_location (EMap *map, double longitude, double latitude) if (priv->zoom_state == E_MAP_ZOOMED_IN) e_map_zoom_out (map); else if (priv->zoom_state != E_MAP_ZOOMED_OUT) return; - width = gdk_pixbuf_get_width (priv->map_render_pixbuf); - height = gdk_pixbuf_get_height (priv->map_render_pixbuf); - priv->zoom_state = E_MAP_ZOOMING_IN; priv->zoom_target_long = longitude; priv->zoom_target_lat = latitude; @@ -753,7 +725,6 @@ void e_map_zoom_out (EMap *map) { EMapPrivate *priv; - int width, height; g_return_if_fail (map); g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map))); @@ -762,9 +733,6 @@ e_map_zoom_out (EMap *map) if (priv->zoom_state != E_MAP_ZOOMED_IN) return; - width = gdk_pixbuf_get_width (priv->map_render_pixbuf); - height = gdk_pixbuf_get_height (priv->map_render_pixbuf); - priv->zoom_state = E_MAP_ZOOMING_OUT; zoom_do (map); priv->zoom_state = E_MAP_ZOOMED_OUT; @@ -1146,16 +1114,12 @@ update_render_point (EMap *map, EMapPoint *point) { EMapPrivate *priv; GdkPixbuf *pb; - int width, height; double px, py; priv = map->priv; pb = priv->map_render_pixbuf; if (!pb) return; - width = gdk_pixbuf_get_width (pb); - height = gdk_pixbuf_get_height (pb); - e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); px += priv->xofs; py += priv->yofs; @@ -1182,12 +1146,10 @@ update_render_point (EMap *map, EMapPoint *point) static void repaint_point (EMap *map, EMapPoint *point) { - EMapPrivate *priv; GdkRectangle area; double px, py; if (!e_map_point_is_in_view (map, point)) return; - priv = map->priv; e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); @@ -1587,8 +1549,6 @@ zoom_in_smooth (EMap *map) EMapPrivate *priv; GdkWindow *window; int width, height; - int win_width, win_height; - int target_width, target_height; double x, y; g_return_if_fail (map); @@ -1603,10 +1563,6 @@ zoom_in_smooth (EMap *map) window = GTK_WIDGET (map)->window; width = gdk_pixbuf_get_width (priv->map_render_pixbuf); height = gdk_pixbuf_get_height (priv->map_render_pixbuf); - win_width = GTK_WIDGET (map)->allocation.width; - win_height = GTK_WIDGET (map)->allocation.height; - target_width = win_width / 4; - target_height = win_height / 4; /* Center the target point as much as possible */ -- cgit