[california/wip/month-connectors: 106/106] Fixed some post-merge issues

[Jim Nelson <jnelson src gnome org>]

commit 16678d37f9e3d535b11ec11c475e9c2d64827c34
Author: Jim Nelson <jim yorba org>
Date:   Tue Aug 12 18:06:24 2014 -0700

    Fixed some post-merge issues

 src/view/month/month-grid.vala |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/src/view/month/month-grid.vala b/src/view/month/month-grid.vala
index a3b0c19..c5a5b46 100644
--- a/src/view/month/month-grid.vala
+++ b/src/view/month/month-grid.vala
@@ -312,10 +312,10 @@ private class Grid : Gtk.Grid {
         return release_cell;
     }
     
-    private void on_cell_single_click(Toolkit.ButtonEvent details, bool guaranteed) {
-        // only want unguaranteed primary button clicks
-        if (details.button != Toolkit.Button.PRIMARY || guaranteed)
-            return;
+    private bool on_cell_single_click(Toolkit.ButtonEvent details) {
+        // only want primary button clicks
+        if (details.button != Toolkit.Button.PRIMARY)
+            return Toolkit.PROPAGATE;
         
         // get the Cell the button was released on (if it's a Cell at all)
         Gdk.Point release_cell_point = Gdk.Point();
@@ -324,10 +324,10 @@ private class Grid : Gtk.Grid {
             // reset state and exit
             unselect_all();
             
-            return;
+            return Toolkit.STOP;
         }
         
-        //bool stop_propagation = false;
+        bool stop_propagation = Toolkit.PROPAGATE;
         
         Cell press_cell = (Cell) details.widget;
         
@@ -336,22 +336,22 @@ private class Grid : Gtk.Grid {
             Component.Event? event = release_cell.get_event_at(details.release_point);
             if (event != null) {
                 owner.request_display_event(event, release_cell, release_cell_point);
-                //stop_propagation = true;
+                stop_propagation = Toolkit.STOP;
             }
         } else {
             // create multi-day event
             owner.request_create_all_day_event(new Calendar.DateSpan(press_cell.date, release_cell.date),
                 release_cell, release_cell_point);
-            //stop_propagation = true;
+            stop_propagation = Toolkit.STOP;
         }
         
-        //return stop_propagation;
+        return stop_propagation;
     }
     
-    private void on_cell_double_click(Toolkit.ButtonEvent details, bool guaranteed) {
-        // only interested in unguaranteed primary button clicks
-        if (details.button != Toolkit.Button.PRIMARY || guaranteed)
-            return;
+    private bool on_cell_double_click(Toolkit.ButtonEvent details) {
+        // only interested in primary button clicks
+        if (details.button != Toolkit.Button.PRIMARY)
+            return Toolkit.PROPAGATE;
         
         // get the Cell the button was released on (if it's a Cell at all)
         Gdk.Point release_cell_point = Gdk.Point();
@@ -360,25 +360,24 @@ private class Grid : Gtk.Grid {
             // reset state and exit
             unselect_all();
             
-            return;
+            return Toolkit.PROPAGATE;
         }
         
         Cell press_cell = (Cell) details.widget;
         
         // only interested in double-clicking on the same cell
         if (press_cell != release_cell)
-            return; //false;
+            return Toolkit.PROPAGATE;
         
         // if an existing event is double-clicked, ignore, as the single click handler is displaying
         // it (but stop propagation)
         if (release_cell.get_event_at(release_cell_point) != null)
-            return; // true;
+            return Toolkit.STOP;
         
         owner.request_create_all_day_event(new Calendar.DateSpan(press_cell.date, release_cell.date),
             release_cell, release_cell_point);
         
-        // stop propagation
-        //return true;
+        return Toolkit.STOP;
     }
     
     private bool on_cell_motion_event(Gtk.Widget widget, Gdk.EventMotion event) {