mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-28 05:02:10 +01:00
Fix redefinition of local variable in gio/glocalfilemonitor.c
This commit is contained in:
parent
d0dfc76554
commit
9380a8cdb0
@ -406,7 +406,7 @@ g_file_monitor_source_handle_event (GFileMonitorSource *fms,
|
|||||||
g_assert (!other && rename_to);
|
g_assert (!other && rename_to);
|
||||||
if (fms->flags & (G_FILE_MONITOR_WATCH_MOVES | G_FILE_MONITOR_SEND_MOVED))
|
if (fms->flags & (G_FILE_MONITOR_WATCH_MOVES | G_FILE_MONITOR_SEND_MOVED))
|
||||||
{
|
{
|
||||||
GFile *other;
|
GFile *other_file;
|
||||||
const gchar *dirname;
|
const gchar *dirname;
|
||||||
gchar *allocated_dirname = NULL;
|
gchar *allocated_dirname = NULL;
|
||||||
GFileMonitorEvent event;
|
GFileMonitorEvent event;
|
||||||
@ -421,11 +421,11 @@ g_file_monitor_source_handle_event (GFileMonitorSource *fms,
|
|||||||
dirname = allocated_dirname;
|
dirname = allocated_dirname;
|
||||||
}
|
}
|
||||||
|
|
||||||
other = g_local_file_new_from_dirname_and_basename (dirname, rename_to);
|
other_file = g_local_file_new_from_dirname_and_basename (dirname, rename_to);
|
||||||
g_file_monitor_source_file_changes_done (fms, rename_to);
|
g_file_monitor_source_file_changes_done (fms, rename_to);
|
||||||
g_file_monitor_source_send_event (fms, event, child, other);
|
g_file_monitor_source_send_event (fms, event, child, other_file);
|
||||||
|
|
||||||
g_object_unref (other);
|
g_object_unref (other_file);
|
||||||
g_free (allocated_dirname);
|
g_free (allocated_dirname);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user