Merge lp:~kjtehprogrammer/maya/fix-1300569 into lp:~elementary-apps/maya/trunk

[KJ Lawrence]

Fixes today not selecting the right day.

Fixes "Today" action

[Corentin Noël (tintou)]

You indeed have fixed the bug, great !
Please remove the lines 9, 10 and 11 from diffs as the today variable is no more used.

review: Needs Fixing

[KJ Lawrence (kjtehprogrammer)]

Gone!

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:maya failed due to conflicts:

text conflict in src/Application.vala
text conflict in src/View/MayaToolbar.vala

[Cody Garver (codygarver)]

You need to bzr merge lp:maya, then resolve conflicts, make sure it compiles, and push the updated code to this branch. Comment when it's ready

review: Needs Fixing

=== modified file 'src/Application.vala'
--- src/Application.vala	2014-03-24 22:15:29 +0000
+++ src/Application.vala	2014-04-04 02:31:59 +0000
@@ -355,12 +355,7 @@
         }
 
         void on_menu_today_toggled () {
-
-            var today = new DateTime.now_local ();
-
-            if (calmodel.month_start.get_month () != today.get_month ())
-                calmodel.month_start = Util.get_start_of_month ();
-
+            calmodel.month_start = Util.get_start_of_month ();
             calview.today ();
         }
 

=== modified file 'src/View/MayaToolbar.vala'
--- src/View/MayaToolbar.vala	2014-03-05 15:49:19 +0000
+++ src/View/MayaToolbar.vala	2014-04-04 02:31:59 +0000
@@ -100,7 +100,7 @@
             
             button_add.clicked.connect (() => add_calendar_clicked ());
             button_calendar_sources.clicked.connect (on_tb_sources_clicked);
-            today.activate.connect (() => on_menu_today_toggled);
+            today.activate.connect (() => { on_menu_today_toggled (); });
             fullscreen.toggled.connect (on_toggle_fullscreen);
             weeknumbers.toggled.connect (on_menu_show_weeks_toggled);
             about.activate.connect (() => {