← Back to branch summary

~ubuntu-branches/ubuntu/raring/glib2.0/raring-proposed

« back to all changes in this revision

Viewing changes to gio/tests/live-g-file.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-01-17 11:01:54 UTC
  • mfrom: (185.1.2 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130117110154-i9n2ilenrsmz1jfy
Tags: 2.35.4-0ubuntu3
Drop 08_revert_closure_invalidation.patch, and add
08_fix_closure_invalidation.patch which fixes the issue properly without
introducting warnings/criticals. This should fix the deja-dup autopkgtest
again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/tests/live-g-file.c
513
513
  info = g_file_enumerator_next_file (enumerator, NULL, &error);
514
514
  while ((info) && (!error))
515
515
    {
516
 
      descend = g_file_get_child (parent, g_file_info_get_name (info));
 
516
      descend = g_file_enumerator_get_child (enumerator, info);
517
517
      g_assert (descend != NULL);
518
518
      relative_path = g_file_get_relative_path (root, descend);
519
519
      g_assert (relative_path != NULL);
1159
1159
  info = g_file_enumerator_next_file (enumerator, NULL, &error);
1160
1160
  while ((info) && (!error))
1161
1161
    {
1162
 
      descend = g_file_get_child (parent, g_file_info_get_name (info));
 
1162
      descend = g_file_enumerator_get_child (enumerator, info);
1163
1163
      g_assert (descend != NULL);
1164
1164
      relative_path = g_file_get_relative_path (root, descend);
1165
1165
      g_assert (relative_path != NULL);
1236
1236
  posix_compat = FALSE;
1237
1237
 
1238
1238
  /*  strip all gtester-specific args  */
1239
 
  g_type_init ();
1240
1239
  g_test_init (&argc, &argv, NULL);
1241
1240
 
1242
1241
  /*  no extra parameters specified, assume we're executed from glib test suite  */