[gnome-builder/gnome-builder-3-26] backport more type assignment fixes for newer GObject

[Christian Hergert <chergert src gnome org>]

commit 36b00f41d8fb8367d3e96007097577ccfd88a870
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 18 16:24:05 2018 -0800

    backport more type assignment fixes for newer GObject

 plugins/color-picker/gb-color-picker-document-monitor.c | 2 +-
 plugins/git/ide-git-buffer-change-monitor.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/color-picker/gb-color-picker-document-monitor.c 
b/plugins/color-picker/gb-color-picker-document-monitor.c
index df8632762..53b5682ed 100644
--- a/plugins/color-picker/gb-color-picker-document-monitor.c
+++ b/plugins/color-picker/gb-color-picker-document-monitor.c
@@ -703,7 +703,7 @@ gb_color_picker_document_monitor_queue_oper (GbColorPickerDocumentMonitor *self,
     real_end = *end;
 
   queued.self = g_object_ref (self);
-  queued.buffer = g_object_ref (self->buffer);
+  queued.buffer = g_object_ref (buffer);
   queued.begin = g_object_ref (gtk_text_buffer_create_mark (buffer, NULL, &real_begin, TRUE));
   queued.end = g_object_ref (gtk_text_buffer_create_mark (buffer, NULL, &real_end, FALSE));
   queued.uncolorize = !!uncolorize;
diff --git a/plugins/git/ide-git-buffer-change-monitor.c b/plugins/git/ide-git-buffer-change-monitor.c
index fa30e7e2a..85268d2ab 100644
--- a/plugins/git/ide-git-buffer-change-monitor.c
+++ b/plugins/git/ide-git-buffer-change-monitor.c
@@ -622,7 +622,7 @@ ide_git_buffer_change_monitor_calculate_threaded (IdeGitBufferChangeMonitor  *se
       if (!blob)
         goto cleanup;
 
-      diff->blob = g_object_ref (blob);
+      diff->blob = g_object_ref (GGIT_BLOB (blob));
 
     cleanup:
       g_clear_object (&blob);