[libgit2-glib/wip/development] Fix for rename from oid to id

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 15c889544a8ebe63469da7553170577e830c36a3
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Apr 26 15:36:51 2014 +0200

    Fix for rename from oid to id

 libgit2-glib/ggit-diff-file.c   |    2 +-
 libgit2-glib/ggit-index-entry.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libgit2-glib/ggit-diff-file.c b/libgit2-glib/ggit-diff-file.c
index 208d560..d3a84b2 100644
--- a/libgit2-glib/ggit-diff-file.c
+++ b/libgit2-glib/ggit-diff-file.c
@@ -46,7 +46,7 @@ _ggit_diff_file_wrap (const git_diff_file *file)
 
        gfile = g_slice_new (GgitDiffFile);
        gfile->ref_count = 1;
-       gfile->oid = _ggit_oid_wrap (&file->oid);
+       gfile->oid = _ggit_oid_wrap (&file->id);
        gfile->path = file->path == NULL ? NULL : g_strdup (file->path);
        gfile->mode = file->mode;
        gfile->size = file->size;
diff --git a/libgit2-glib/ggit-index-entry.c b/libgit2-glib/ggit-index-entry.c
index 18a4395..b997c79 100644
--- a/libgit2-glib/ggit-index-entry.c
+++ b/libgit2-glib/ggit-index-entry.c
@@ -522,7 +522,7 @@ ggit_index_entry_get_id (GgitIndexEntry *entry)
 {
        g_return_val_if_fail (entry != NULL, NULL);
 
-       return _ggit_oid_wrap (&entry->entry->oid);
+       return _ggit_oid_wrap (&entry->entry->id);
 }
 
 /**
@@ -542,11 +542,11 @@ ggit_index_entry_set_id (GgitIndexEntry *entry,
 
        if (id != NULL)
        {
-               entry->entry->oid = *_ggit_oid_get_oid (id);
+               entry->entry->id = *_ggit_oid_get_oid (id);
        }
        else
        {
-               memset (&entry->entry->oid, 0, sizeof (git_oid));
+               memset (&entry->entry->id, 0, sizeof (git_oid));
        }
 }