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-image-chooser.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'widgets/misc/e-image-chooser.c') diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index ed147c6d13..f20b0a646d 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -147,7 +147,7 @@ e_image_chooser_class_init (EImageChooserClass *klass) object_class->dispose = e_image_chooser_dispose; } -#if UI_CHANGE_OK +#ifdef UI_CHANGE_OK static void browse_for_image_cb (GtkWidget *button, gpointer data) { @@ -168,7 +168,7 @@ e_image_chooser_init (EImageChooser *chooser) gtk_container_add (GTK_CONTAINER (alignment), priv->image); -#if UI_CHANGE_OK +#ifdef UI_CHANGE_OK priv->browse_button = gtk_button_new_with_label (_("Choose Image")); #endif @@ -177,7 +177,7 @@ e_image_chooser_init (EImageChooser *chooser) gtk_container_add (GTK_CONTAINER (priv->frame), alignment); gtk_box_set_homogeneous (GTK_BOX (chooser), FALSE); gtk_box_pack_start (GTK_BOX (chooser), priv->frame, TRUE, TRUE, 0); -#if UI_CHANGE_OK +#ifdef UI_CHANGE_OK gtk_box_pack_start (GTK_BOX (chooser), priv->browse_button, FALSE, FALSE, 0); g_signal_connect (priv->browse_button, "clicked", G_CALLBACK (browse_for_image_cb), NULL); @@ -194,7 +194,7 @@ e_image_chooser_init (EImageChooser *chooser) "drag_data_received", G_CALLBACK (image_drag_data_received_cb), chooser); gtk_widget_show_all (priv->frame); -#if UI_CHANGE_OK +#ifdef UI_CHANGE_OK gtk_widget_show (priv->browse_button); #endif @@ -414,6 +414,7 @@ image_drag_data_received_cb (GtkWidget *widget, char *uri; char *nl = strstr (selection_data->data, "\r\n"); char *buf = NULL; + /* Why can't we change the info parameter to a GnomeVFSFileInfo and use that? */ GnomeVFSFileInfo info; if (nl) -- cgit