Merge lp:~kurt.smolderen/scratch/fix-1232291 into lp:scratch/2.x

[Kurt Smolderen]

Fixes issue lp:1232291 by connecting a 'dummy' handler to the SourceView.buffer.changed signal. This dummy implementation removes itself on the first call from the buffer and connects the 'real' handler instead.

The patch should also work for the trunk version, but as I'm still on Precise, I can't verify due to dependency on zeitgeist-2.0.

[Pim Vullers (pimvullers)]

I've tried this patch against both 2.0.1 and trunk and it works as expected. Files are no longer marked as changed on open. I've already included this patch in the Gentoo ebuilds for scratch. Thanks Kurt for fixing this annoying bug.

review: Approve

[Cody Garver (codygarver)]

You should target lp:scratch with this instead of lp:scratch/2.x

[Kurt Smolderen (kurt.smolderen)]

Hey Cody,

Just filed a merge request for trunk. Omitted that at first because I did not have the opportunity to test the fix against trunk.

However, I would still like to see this bug fixed in the 2.x series as well as Luna-users are still using that major version due to zeitgeist dependencies.

[Cody Garver (codygarver)]

It would get backported

On Tue, Nov 12, 2013 at 2:44 PM, Kurt Smolderen <email address hidden>wrote:

> Hey Cody,
>
> Just filed a merge request for trunk. Omitted that at first because I did
> not have the opportunity to test the fix against trunk.
>
> However, I would still like to see this bug fixed in the 2.x series as
> well as Luna-users are still using that major version due to zeitgeist
> dependencies.
> --
>
> https://code.launchpad.net/~kurt.smolderen/scratch/fix-1232291/+merge/188956
> Your team elementary Apps team is requested to review the proposed merge
> of lp:~kurt.smolderen/scratch/fix-1232291 into lp:scratch/2.x.
>

--
Cody Garver

[Mario Guerriero (mefrio-g)]

it works good. Nice job!

review: Approve

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2013-09-02 03:46:44 +0000
+++ src/Services/Document.vala	2013-10-02 22:48:25 +0000
@@ -53,6 +53,9 @@
         // Zeitgeist integration
         private ZeitgeistLogger zg_log = new ZeitgeistLogger();
 
+        // It is used to not mark files as changed on load
+        private ulong onchange_handler_id = 0;
+
         // Delegates
         public delegate void VoidFunc ();
 
@@ -115,7 +118,28 @@
             this.working = true;
             message ("Opening \"%s\"", get_basename ());
 
-            
+            onchange_handler_id = this.source_view.buffer.changed.connect (() => {
+                this.source_view.buffer.disconnect(onchange_handler_id);
+                // Signals for SourceView
+                uint timeout_saving = -1;
+                this.source_view.buffer.changed.connect (() => {
+                    check_undoable_actions ();
+                    // Save if autosave is ON
+                    if (settings.autosave) {
+                        if (timeout_saving >= 0) {
+                            Source.remove (timeout_saving);
+                            timeout_saving = -1;
+                        }
+                        timeout_saving = Timeout.add (250, () => {
+                            save ();
+                            timeout_saving = -1;
+                            return false;
+                        });
+                    }
+                    else
+                        this.set_saved_status (false);
+                 });
+            });
 
             // Focus in event for SourceView
             this.source_view.focus_in_event.connect (() => {
@@ -445,25 +469,6 @@
                     this.source_view.set_text (text);
                     this.last_saved_content = text;
                     this.original_content = text;
-                    // Signals for SourceView
-                    uint timeout_saving = -1;
-                    this.source_view.buffer.changed.connect (() => {
-                        check_undoable_actions ();
-                        // Save if autosave is ON
-                        if (settings.autosave) {
-                            if (timeout_saving >= 0) {
-                                Source.remove (timeout_saving);
-                                timeout_saving = -1;
-                            }
-                            timeout_saving = Timeout.add (250, () => {
-                                save ();
-                                timeout_saving = -1;
-                                return false;
-                            });
-                        }
-                        else if (!settings.autosave || file == null)
-                            this.set_saved_status (false);
-                     });
                  });
                  this.loaded = true;
             }