← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gitg/vivid

« back to all changes in this revision

Viewing changes to gitg/gitg-commit.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonny Lamb
  • Date: 2009-04-09 00:44:07 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090409004407-xl4cwh7yk5tfbiq4
Tags: 0.0.2-1
http://bugs.debian.org/522919
http://bugs.debian.org/518705
http://bugs.debian.org/520922
http://bugs.debian.org/520887
http://bugs.debian.org/521062
* New upstream release. (Closes: #522919)
  + Timestamp to date string conversion is now valid UTF-8. (Closes: #518705)
  + Fixes to async task cancellation. (Closes: #520922)
* debian/control: Changed Section to vcs.
* debian/patches/:
  + 0001-Change-Categories-to-Development-RevisionControl.patch: Added
    to change Categories to Development;RevisionControl. (Closes: 520887)
  + 0001-Terminate-gtk_text_buffer_create_tag-s-arguments-wit.patch: Removed
    as applied upstream.
  + 0002-Initial-patch-to-show-tags-referenced-from-tag-objec.patch: Added
    to show tags referenced from tag objects. (Closes: #521062)
* debian/watch: Added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gitg/gitg-commit.c
345
345
}
346
346
 
347
347
static void
348
 
refresh_done(GitgRunner *runner, GitgCommit *commit)
 
348
refresh_done(GitgRunner *runner, gboolean cancelled, GitgCommit *commit)
349
349
{
350
350
        g_hash_table_foreach_remove(commit->priv->files, (GHRFunc)delete_file, commit);
351
351
}
352
352
 
353
353
static void
354
 
read_unstaged_files_end(GitgRunner *runner, GitgCommit *commit)
 
354
read_unstaged_files_end(GitgRunner *runner, gboolean cancelled, GitgCommit *commit)
355
355
{
356
356
        gchar *head = gitg_repository_parse_head(commit->priv->repository);
357
357
        gitg_runner_cancel(runner);
368
368
}
369
369
 
370
370
static void
371
 
read_other_files_end(GitgRunner *runner, GitgCommit *commit)
 
371
read_other_files_end(GitgRunner *runner, gboolean cancelled, GitgCommit *commit)
372
372
{
373
373
        gitg_runner_cancel(runner);
374
374
        
420
420
}
421
421
 
422
422
static void
423
 
update_index_end(GitgRunner *runner, GitgCommit *commit)
 
423
update_index_end(GitgRunner *runner, gboolean cancelled, GitgCommit *commit)
424
424
{
425
425
        gitg_runner_cancel(runner);
426
426
        runner_connect(commit, G_CALLBACK(read_other_files_update), G_CALLBACK(read_other_files_end));
455
455
        if (commit->priv->repository)
456
456
                update_index(commit);
457
457
        else
458
 
                refresh_done(commit->priv->runner, commit);
 
458
                refresh_done(commit->priv->runner, FALSE, commit);
459
459
}
460
460
 
461
461
static void
810
810
                
811
811
                g_free(path);
812
812
                
813
 
                remove_file(commit, file);
 
813
                update_index_file(commit, file);
 
814
                update_index_unstaged(commit, file);
814
815
                g_object_unref(f);
815
816
        }
816
817
        else