[gtk/wip/otte/undo: 15/17] undoundocommand: Never merge

[Benjamin Otte <otte src gnome org>]

commit 76ab9970aee0493d2644f86c798ab38a4b04695b
Author: Benjamin Otte <otte redhat com>
Date:   Sun Aug 23 18:00:42 2015 +0200

    undoundocommand: Never merge
    
    Und commands are merged during construction and should never be merged
    when encountered on the stack.

 gtk/gtkundoundocommand.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkundoundocommand.c b/gtk/gtkundoundocommand.c
index 17aa3907e6..467a1f1100 100644
--- a/gtk/gtkundoundocommand.c
+++ b/gtk/gtkundoundocommand.c
@@ -70,11 +70,11 @@ gtk_undo_undo_command_redo (GtkUndoCommand *command)
   return result;
 }
 
-GtkUndoCommand *
-gtk_undo_undo_command_merge (GtkUndoCommand *command,
-                             GtkUndoCommand *followup)
+gboolean
+gtk_undo_undo_command_should_merge (GtkUndoCommand *command,
+                                    GtkUndoCommand *followup)
 {
-  return NULL;
+  return FALSE;
 }
 
 static void
@@ -97,7 +97,7 @@ gtk_undo_undo_command_class_init (GtkUndoUndoCommandClass *klass)
 
   undo_class->undo = gtk_undo_undo_command_undo;
   undo_class->redo = gtk_undo_undo_command_redo;
-  undo_class->merge = gtk_undo_undo_command_merge;
+  undo_class->should_merge = gtk_undo_undo_command_should_merge;
 }
 
 static void