[geany/geany-plugins] 6883ef: git-changebar: Fix clearing markers on untracked files

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sun, 31 May 2015 14:30:06 UTC
Commit:      6883ef572ec48b2f80658c28bcd1aedaf928688e
             https://github.com/geany/geany-plugins/commit/6883ef572ec48b2f80658c28bcd1aedaf928688e

Log Message:
-----------
git-changebar: Fix clearing markers on untracked files

Properly remove markers on documents if they have some, even if they
are unknown to Git.  This fixes removing markers on e.g. renamed
documents.


Modified Paths:
--------------
    git-changebar/src/gcb-plugin.c

Modified: git-changebar/src/gcb-plugin.c
26 lines changed, 19 insertions(+), 7 deletions(-)
===================================================================
@@ -809,17 +809,29 @@ update_diff (const gchar *path,
 {
   GeanyDocument *doc = document_get_current ();
   
-  if (doc && doc->id == GPOINTER_TO_UINT (data) &&
-      contents && allocate_resources (doc->editor->sci)) {
+  if (doc && doc->id == GPOINTER_TO_UINT (data)) {
     ScintillaObject  *sci = doc->editor->sci;
-    guint             i;
+    gboolean    allocated = !! g_object_get_qdata (G_OBJECT (sci),
+                                                   RESOURCES_ALLOCATED_QTAG);
     
-    /* clear previous markers */
-    for (i = 0; i < MARKER_COUNT; i++) {
-      scintilla_send_message (sci, SCI_MARKERDELETEALL, G_markers[i].num, 0);
+    if (allocated) {
+      guint i;
+      
+      /* clear previous markers */
+      for (i = 0; i < MARKER_COUNT; i++) {
+        scintilla_send_message (sci, SCI_MARKERDELETEALL, G_markers[i].num, 0);
+      }
     }
     
-    diff_buf_to_doc (contents, doc, diff_hunk_cb, sci);
+    if (contents && (allocated || allocate_resources (sci))) {
+      diff_buf_to_doc (contents, doc, diff_hunk_cb, sci);
+    } else if (! contents && allocated) {
+      /* if we don't have contents, it probably means the document doesn't
+       * match any object known by Git, so next attempts will fail just the
+       * same.  So, drop allocated resources if any (if it used to be a valid
+       * object, e.g. the document was renamed to something unknown to Git) */
+      release_resources (sci);
+    }
   }
 }
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).