aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-04-11 22:58:05 +0800
committerMilan Crha <mcrha@redhat.com>2012-04-11 22:58:05 +0800
commit49787d04feef8ff699326e54d5991a36d8ef74bb (patch)
tree17129ce5082dd431865c8afc01290dbac4dc3524 /calendar
parente3295b4d11bca23980472f1d54f4a52927c41539 (diff)
downloadgsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.tar
gsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.tar.gz
gsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.tar.bz2
gsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.tar.lz
gsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.tar.xz
gsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.tar.zst
gsoc2013-evolution-49787d04feef8ff699326e54d5991a36d8ef74bb.zip
Bug #584143 - Global Search Function withing Calendar
Diffstat (limited to 'calendar')
-rw-r--r--calendar/calendar.error.xml4
-rw-r--r--calendar/gui/e-day-view.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 236f2479fd..9301d8ba65 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -314,4 +314,8 @@
<_secondary>You must be working online to complete this operation.</_secondary>
</error>
+ <error id="search-error-generic" type="error">
+ <secondary>{0}</secondary>
+ </error>
+
</error-list>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 89694506f1..7b4fecfb0a 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -2515,6 +2515,9 @@ e_day_view_set_selected_time_range (ECalendarView *cal_view,
work_day_start_hour = e_cal_model_get_work_day_start_hour (model);
work_day_start_minute = e_cal_model_get_work_day_start_minute (model);
+ if (start_time == end_time)
+ end_time += e_calendar_view_get_time_divisions (cal_view) * 60;
+
/* Set the selection. */
start_in_grid = e_day_view_convert_time_to_grid_position (day_view,
start_time,