aboutsummaryrefslogtreecommitdiffstats
path: root/modules/calendar
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-04-15 04:03:53 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-04-15 04:03:53 +0800
commit5c3c40aec8f72c5e33d77e47959d4ba485c4b97f (patch)
tree259ede0a736383b740b584d883304171a8e4ab31 /modules/calendar
parentb9a0dc4021e9d3ff8a171a0249dc3a1b8ce491cd (diff)
parent8214b3e8419de4c914504c34500b91741ac1692a (diff)
downloadgsoc2013-evolution-5c3c40aec8f72c5e33d77e47959d4ba485c4b97f.tar.gz
gsoc2013-evolution-5c3c40aec8f72c5e33d77e47959d4ba485c4b97f.tar.zst
gsoc2013-evolution-5c3c40aec8f72c5e33d77e47959d4ba485c4b97f.zip
Merge commit 'origin/express2' into express2
Diffstat (limited to 'modules/calendar')
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c3
-rw-r--r--modules/calendar/e-memo-shell-sidebar.c3
-rw-r--r--modules/calendar/e-task-shell-sidebar.c3
3 files changed, 9 insertions, 0 deletions
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index abe4132fa4..eb28868ce6 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -36,6 +36,7 @@
#include "e-cal-shell-view.h"
#include "e-cal-shell-backend.h"
+#include "e-cal-shell-content.h"
#define E_CAL_SHELL_SIDEBAR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -303,6 +304,7 @@ cal_shell_sidebar_set_default (ECalShellSidebar *cal_shell_sidebar,
G_CALLBACK (cal_shell_sidebar_default_opened_cb),
cal_shell_sidebar);
+ e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_cal_shell_content_get_model (E_CAL_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (cal_shell_sidebar)))))), NULL);
e_cal_open_async (client, FALSE);
}
@@ -956,6 +958,7 @@ e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar,
G_CALLBACK (cal_shell_sidebar_client_opened_cb),
cal_shell_sidebar);
+ e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_cal_shell_content_get_model (E_CAL_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (cal_shell_sidebar)))))), NULL);
e_cal_open_async (client, FALSE);
}
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 8a840f760e..3e14f6a9c0 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -34,6 +34,7 @@
#include "e-memo-shell-view.h"
#include "e-memo-shell-backend.h"
+#include "e-memo-shell-content.h"
#define E_MEMO_SHELL_SIDEBAR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -298,6 +299,7 @@ memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar,
G_CALLBACK (memo_shell_sidebar_default_opened_cb),
memo_shell_sidebar);
+ e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_memo_shell_content_get_memo_model (E_MEMO_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (memo_shell_sidebar)))))), NULL);
e_cal_open_async (client, FALSE);
}
@@ -874,6 +876,7 @@ e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar,
G_CALLBACK (memo_shell_sidebar_client_opened_cb),
memo_shell_sidebar);
+ e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_memo_shell_content_get_memo_model (E_MEMO_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (memo_shell_sidebar)))))), NULL);
e_cal_open_async (client, FALSE);
}
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 102553136f..87127ba634 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -34,6 +34,7 @@
#include "e-task-shell-view.h"
#include "e-task-shell-backend.h"
+#include "e-task-shell-content.h"
#define E_TASK_SHELL_SIDEBAR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -298,6 +299,7 @@ task_shell_sidebar_set_default (ETaskShellSidebar *task_shell_sidebar,
G_CALLBACK (task_shell_sidebar_default_opened_cb),
task_shell_sidebar);
+ e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_task_shell_content_get_task_model (E_TASK_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (task_shell_sidebar)))))), NULL);
e_cal_open_async (client, FALSE);
}
@@ -874,6 +876,7 @@ e_task_shell_sidebar_add_source (ETaskShellSidebar *task_shell_sidebar,
G_CALLBACK (task_shell_sidebar_client_opened_cb),
task_shell_sidebar);
+ e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_task_shell_content_get_task_model (E_TASK_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (task_shell_sidebar)))))), NULL);
e_cal_open_async (client, FALSE);
}