Merge lp:~evfool/scratch/lp1302887 into lp:~elementary-apps/scratch/scratch

[Robert Roth]

Fixed textbuffer changed events for correct revert button sensitivity after opening a file (lp:1302887)

This branch does:
* fix the textbuffer changed event handler registration (in its current state it did not work since my SearchManager changes for GtkSourceView based search) and adds an additional check for file changes on text change (to make the revert button correctly insensitive on file open, fixing bug 1302887)
* remove spamming searchmanager occurrence cound debug logging

[Corentin Noël (tintou)]

I approve, it's saving the document after each change.

[Corentin Noël (tintou)]

review: Approve

[lp:~evfool/scratch/lp1302887]

1309. By Robert Roth on 2014-06-23

Added missing space

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2014-05-26 06:40:54 +0000
+++ src/Services/Document.vala	2014-06-23 21:25:28 +0000
@@ -93,13 +93,14 @@
         }
 
         public void toggle_changed_handlers (bool enabled) {
-            if (onchange_handler_id == 0)
-                return;
             if (enabled) {
                 onchange_handler_id = this.source_view.buffer.changed.connect (() => {
-                    this.source_view.buffer.disconnect(onchange_handler_id);
+                    if (onchange_handler_id != 0) {
+                        this.source_view.buffer.disconnect (onchange_handler_id);
+                    }
                     // Signals for SourceView
                     uint timeout_saving = -1;
+                    check_undoable_actions ();
                     this.source_view.buffer.changed.connect (() => {
                         check_undoable_actions ();
                         // Save if autosave is ON
@@ -118,7 +119,7 @@
                             this.set_saved_status (false);
                      });
                 });
-            } else {
+            } else if (onchange_handler_id != 0) {
                 this.source_view.buffer.disconnect(onchange_handler_id);
             }
         }
 
=== modified file 'src/Widgets/SearchManager.vala'
--- src/Widgets/SearchManager.vala	2014-05-29 06:44:13 +0000
+++ src/Widgets/SearchManager.vala	2014-06-23 21:25:28 +0000
@@ -169,9 +169,6 @@
             this.search_context = new Gtk.SourceSearchContext (text_buffer as Gtk.SourceBuffer, null);
             search_context.settings.wrap_around = cycle_search;
             search_context.settings.regex_enabled = false;
-            search_context.notify["occurrences-count"].connect ((context, property) => {
-                message ("%d occurrences found", (context as Gtk.SourceSearchContext).occurrences_count);
-            });
 
             // Determine the search entry color
             bool found = (search_entry.text != "" && search_entry.text in this.text_buffer.text);