aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-image-chooser.c
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2007-10-31 20:30:29 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2007-10-31 20:30:29 +0800
commitbe99f3db8925de2016528d50f32339a73fcd10c8 (patch)
tree083a23213c8ab1dcfb72a3f761b2b27af1f539fc /widgets/misc/e-image-chooser.c
parent907d1861ab0ffe7e90601f6a9f9e5ef339969301 (diff)
downloadgsoc2013-evolution-be99f3db8925de2016528d50f32339a73fcd10c8.tar.gz
gsoc2013-evolution-be99f3db8925de2016528d50f32339a73fcd10c8.tar.zst
gsoc2013-evolution-be99f3db8925de2016528d50f32339a73fcd10c8.zip
Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of function
2007-10-29 Kjartan Maraas <kmaraas@gnome.org> * e-activity-handler.c: (e_activity_handler_new): * e-canvas.c: (e_canvas_new), (emit_event), (pick_current_item), (e_canvas_button): * e-combo-button.c: (menu_detacher), (impl_destroy), (impl_button_press_event): * e-combo-cell-editable.c: (e_combo_cell_editable_new): * e-expander.c: (e_expander_init), (e_expander_size_request), (e_expander_size_allocate), (e_expander_button_press), (e_expander_focus): * e-gui-utils.c: (e_popup_menu), (e_container_change_tab_order_callback): * e-image-chooser.c: (image_drag_data_received_cb): * e-info-label.c: (e_info_label_new): * e-map.c: (e_map_key_press), (e_map_new), (update_render_pixbuf), (blowup_window_area), (zoom_do), (set_scroll_area): * e-pilot-settings.c: (e_pilot_settings_get_source): * e-printable.c: (e_printable_will_fit): * e-reflow.c: (items_inserted), (model_changed), (set_empty), (e_reflow_event), (e_reflow_draw): * e-search-bar.c: (set_option): * e-search-bar.h: * e-unicode.c: (e_xml_get_translated_utf8_string_prop_by_name): Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of function declarations. - Use non-deprecated GSignal functions - Don't mix different enum types svn path=/trunk/; revision=34466
Diffstat (limited to 'widgets/misc/e-image-chooser.c')
-rw-r--r--widgets/misc/e-image-chooser.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 5212027bac..319c2b55ac 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -416,7 +416,7 @@ image_drag_data_received_cb (GtkWidget *widget,
char *nl = strstr ((char *)selection_data->data, "\r\n");
char *buf = NULL;
/* Why can't we change the info parameter to a GnomeVFSFileInfo and use that? */
- GnomeVFSFileInfo info;
+ GnomeVFSFileInfo file_info;
if (nl)
uri = g_strndup ((char *)selection_data->data, nl - (char*)selection_data->data);
@@ -425,13 +425,13 @@ image_drag_data_received_cb (GtkWidget *widget,
result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
if (result == GNOME_VFS_OK) {
- result = gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_DEFAULT);
+ result = gnome_vfs_get_file_info_from_handle (handle, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
if (result == GNOME_VFS_OK) {
GnomeVFSFileSize num_read;
- buf = g_malloc (info.size);
+ buf = g_malloc (file_info.size);
- if ((result = gnome_vfs_read (handle, buf, info.size, &num_read)) == GNOME_VFS_OK) {
+ if ((result = gnome_vfs_read (handle, buf, file_info.size, &num_read)) == GNOME_VFS_OK) {
if (set_image_from_data (chooser, buf, num_read)) {
handled = TRUE;
} else {