callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file chooser: Fix compiler warnings

Browse Source 
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
This commit is contained in:
Matthias Clasen
2015-05-30 21:25:48 -04:00
parent d71c5bf983
commit 359d3669ff
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkfilechooserwidget.c
View File

@ -1566,12 +1566,12 @@ file_list_drag_data_received_get_info_cb (GCancellable *cancellable,
change_folder_and_display_error (data->impl, data->file, FALSE); change_folder_and_display_error (data->impl, data->file, FALSE);
else else
{ {
GError *error = NULL; GError *local_error = NULL;
gtk_file_chooser_widget_unselect_all (chooser); gtk_file_chooser_widget_unselect_all (chooser);
gtk_file_chooser_widget_select_file (chooser, data->file, &error); gtk_file_chooser_widget_select_file (chooser, data->file, &local_error);
if (error) if (local_error)
error_selecting_dragged_file_dialog (data->impl, data->file, error); error_selecting_dragged_file_dialog (data->impl, data->file, local_error);
else else
browse_files_center_selected_row (data->impl); browse_files_center_selected_row (data->impl);
} }
@ -1596,9 +1596,9 @@ file_list_drag_data_received_cb (GtkWidget *widget,
GtkSelectionData *selection_data, GtkSelectionData *selection_data,
guint info, guint info,
guint time_, guint time_,
gpointer data) gpointer user_data)
{ {
GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (data); GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (user_data);
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
gchar **uris; gchar **uris;
char *uri; char *uri;