aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/calendar/e-cal-shell-content.c42
-rw-r--r--modules/calendar/e-cal-shell-content.h4
-rw-r--r--modules/calendar/e-cal-shell-view-private.c2
-rw-r--r--modules/calendar/e-cal-shell-view-taskpad.c48
-rw-r--r--modules/calendar/e-task-shell-content.c25
-rw-r--r--modules/calendar/e-task-shell-content.h4
-rw-r--r--modules/calendar/e-task-shell-view-actions.c52
-rw-r--r--modules/calendar/e-task-shell-view-private.c30
-rw-r--r--modules/calendar/e-task-shell-view.c4
9 files changed, 105 insertions, 106 deletions
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 49b2f7f536..1ab680eec4 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -33,7 +33,6 @@
#include "calendar/gui/calendar-view.h"
#include "calendar/gui/e-cal-list-view.h"
#include "calendar/gui/e-cal-model-calendar.h"
-#include "calendar/gui/e-calendar-table.h"
#include "calendar/gui/e-calendar-view.h"
#include "calendar/gui/e-day-view.h"
#include "calendar/gui/e-week-view.h"
@@ -61,8 +60,8 @@ struct _ECalShellContentPrivate {
enum {
PROP_0,
PROP_CALENDAR,
- PROP_TASK_TABLE,
- PROP_MEMO_TABLE
+ PROP_MEMO_TABLE,
+ PROP_TASK_TABLE
};
/* Used to indicate who has the focus within the calendar view. */
@@ -146,8 +145,8 @@ cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
GnomeCalendar *calendar;
GnomeCalendarViewType view_type;
ECalendarView *calendar_view;
- ECalendarTable *task_table;
EMemoTable *memo_table;
+ ETaskTable *task_table;
ETable *table;
/* XXX This function is silly. Certainly there are better ways
@@ -159,7 +158,7 @@ cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
calendar_view = gnome_calendar_get_calendar_view (calendar, view_type);
memo_table = E_MEMO_TABLE (cal_shell_content->priv->memo_table);
- task_table = E_CALENDAR_TABLE (cal_shell_content->priv->task_table);
+ task_table = E_TASK_TABLE (cal_shell_content->priv->task_table);
table = E_TABLE (memo_table);
if (gtk_widget_is_focus (GTK_WIDGET (table->table_canvas)))
@@ -239,14 +238,16 @@ cal_shell_content_get_property (GObject *object,
value, e_cal_shell_content_get_calendar (
E_CAL_SHELL_CONTENT (object)));
return;
- case PROP_TASK_TABLE:
+
+ case PROP_MEMO_TABLE:
g_value_set_object (
- value, e_cal_shell_content_get_task_table (
+ value, e_cal_shell_content_get_memo_table (
E_CAL_SHELL_CONTENT (object)));
return;
- case PROP_MEMO_TABLE:
+
+ case PROP_TASK_TABLE:
g_value_set_object (
- value, e_cal_shell_content_get_memo_table (
+ value, e_cal_shell_content_get_task_table (
E_CAL_SHELL_CONTENT (object)));
return;
}
@@ -457,7 +458,7 @@ cal_shell_content_constructed (GObject *object)
container = widget;
- widget = e_calendar_table_new (shell_view, task_model);
+ widget = e_task_table_new (shell_view, task_model);
gtk_container_add (GTK_CONTAINER (container), widget);
priv->task_table = g_object_ref (widget);
gtk_widget_show (widget);
@@ -591,24 +592,23 @@ cal_shell_content_class_init (ECalShellContentClass *class)
g_object_class_install_property (
object_class,
- PROP_TASK_TABLE,
+ PROP_MEMO_TABLE,
g_param_spec_object (
- "task-table",
+ "memo-table",
NULL,
NULL,
- E_TYPE_CALENDAR_TABLE,
+ E_TYPE_MEMO_TABLE,
G_PARAM_READABLE));
g_object_class_install_property (
object_class,
- PROP_MEMO_TABLE,
+ PROP_TASK_TABLE,
g_param_spec_object (
- "memo-table",
+ "task-table",
NULL,
NULL,
- E_TYPE_MEMO_TABLE,
+ E_TYPE_TASK_TABLE,
G_PARAM_READABLE));
-
}
static void
@@ -688,13 +688,13 @@ e_cal_shell_content_get_memo_table (ECalShellContent *cal_shell_content)
return E_MEMO_TABLE (cal_shell_content->priv->memo_table);
}
-ECalendarTable *
+ETaskTable *
e_cal_shell_content_get_task_table (ECalShellContent *cal_shell_content)
{
g_return_val_if_fail (
E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
- return E_CALENDAR_TABLE (cal_shell_content->priv->task_table);
+ return E_TASK_TABLE (cal_shell_content->priv->task_table);
}
EShellSearchbar *
@@ -726,7 +726,7 @@ e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
{
GnomeCalendar *calendar;
EMemoTable *memo_table;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
GnomeCalendarViewType view_type;
ECalendarView *calendar_view;
@@ -749,7 +749,7 @@ e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
break;
case FOCUS_TASK_TABLE:
- e_calendar_table_delete_selected (task_table);
+ e_task_table_delete_selected (task_table);
break;
default:
diff --git a/modules/calendar/e-cal-shell-content.h b/modules/calendar/e-cal-shell-content.h
index db82889eab..78c2199c50 100644
--- a/modules/calendar/e-cal-shell-content.h
+++ b/modules/calendar/e-cal-shell-content.h
@@ -26,8 +26,8 @@
#include <shell/e-shell-searchbar.h>
#include <shell/e-shell-view.h>
-#include <calendar/gui/e-calendar-table.h>
#include <calendar/gui/e-memo-table.h>
+#include <calendar/gui/e-task-table.h>
#include <calendar/gui/gnome-cal.h>
#include <menus/gal-view-instance.h>
@@ -89,7 +89,7 @@ GnomeCalendar * e_cal_shell_content_get_calendar
(ECalShellContent *cal_shell_content);
EMemoTable * e_cal_shell_content_get_memo_table
(ECalShellContent *cal_shell_content);
-ECalendarTable *e_cal_shell_content_get_task_table
+ETaskTable * e_cal_shell_content_get_task_table
(ECalShellContent *cal_shell_content);
EShellSearchbar *
e_cal_shell_content_get_searchbar
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index ddf9dd7204..0a12f73743 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -443,7 +443,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
GnomeCalendar *calendar;
ECalendar *date_navigator;
EMemoTable *memo_table;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ESourceSelector *selector;
ECalModel *model;
gint ii;
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index 33b21aeb55..67a355a9bd 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -28,14 +28,14 @@ action_calendar_taskpad_assign_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
GSList *list;
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -51,14 +51,14 @@ action_calendar_taskpad_delete_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
e_cal_shell_view_taskpad_set_status_message (
cal_shell_view, _("Deleting selected tasks..."), -1.0);
- e_calendar_table_delete_selected (task_table);
+ e_task_table_delete_selected (task_table);
e_cal_shell_view_taskpad_set_status_message (
cal_shell_view, NULL, -1.0);
}
@@ -68,8 +68,8 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
ECalComponent *comp;
icalcomponent *clone;
GSList *list;
@@ -77,7 +77,7 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -97,14 +97,14 @@ action_calendar_taskpad_mark_complete_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
GSList *list, *iter;
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
- model = e_calendar_table_get_model (task_table);
+ list = e_task_table_get_selected (task_table);
+ model = e_task_table_get_model (task_table);
for (iter = list; iter != NULL; iter = iter->next) {
ECalModelComponent *comp_data = iter->data;
@@ -120,14 +120,14 @@ action_calendar_taskpad_mark_incomplete_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
GSList *list, *iter;
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
- model = e_calendar_table_get_model (task_table);
+ list = e_task_table_get_selected (task_table);
+ model = e_task_table_get_model (task_table);
for (iter = list; iter != NULL; iter = iter->next) {
ECalModelComponent *comp_data = iter->data;
@@ -146,8 +146,8 @@ action_calendar_taskpad_new_cb (GtkAction *action,
EShellView *shell_view;
EShellWindow *shell_window;
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
ECal *client;
ECalComponent *comp;
CompEditor *editor;
@@ -160,7 +160,7 @@ action_calendar_taskpad_new_cb (GtkAction *action,
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -181,14 +181,14 @@ action_calendar_taskpad_open_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
GSList *list;
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -204,8 +204,8 @@ action_calendar_taskpad_open_url_cb (GtkAction *action,
EShellView *shell_view;
EShellWindow *shell_window;
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
icalproperty *prop;
const gchar *uri;
GSList *list;
@@ -216,7 +216,7 @@ action_calendar_taskpad_open_url_cb (GtkAction *action,
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
@@ -234,8 +234,8 @@ action_calendar_taskpad_print_cb (GtkAction *action,
ECalShellView *cal_shell_view)
{
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
ECalComponent *comp;
icalcomponent *clone;
GtkPrintOperationAction print_action;
@@ -244,7 +244,7 @@ action_calendar_taskpad_print_cb (GtkAction *action,
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -267,8 +267,8 @@ action_calendar_taskpad_save_as_cb (GtkAction *action,
EShellWindow *shell_window;
EShellBackend *shell_backend;
ECalShellContent *cal_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
EActivity *activity;
GSList *list;
GFile *file;
@@ -282,7 +282,7 @@ action_calendar_taskpad_save_as_cb (GtkAction *action,
cal_shell_content = cal_shell_view->priv->cal_shell_content;
task_table = e_cal_shell_content_get_task_table (cal_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -425,7 +425,7 @@ e_cal_shell_view_taskpad_actions_update (ECalShellView *cal_shell_view)
ECalShellContent *cal_shell_content;
EShellWindow *shell_window;
EShellView *shell_view;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
GtkAction *action;
GSList *list, *iter;
const gchar *label;
@@ -445,7 +445,7 @@ e_cal_shell_view_taskpad_actions_update (ECalShellView *cal_shell_view)
n_selected = e_table_selected_count (E_TABLE (task_table));
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
for (iter = list; iter != NULL; iter = iter->next) {
ECalModelComponent *comp_data = iter->data;
icalproperty *prop;
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index e50b67bf5a..6727dd1bcd 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -32,13 +32,12 @@
#include "calendar/gui/comp-util.h"
#include "calendar/gui/e-cal-model-tasks.h"
-#include "calendar/gui/e-calendar-table.h"
#define E_TASK_SHELL_CONTENT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_TASK_SHELL_CONTENT, ETaskShellContentPrivate))
-#define E_CALENDAR_TABLE_DEFAULT_STATE \
+#define E_TASK_TABLE_DEFAULT_STATE \
"<?xml version=\"1.0\"?>" \
"<ETableState>" \
" <column source=\"13\"/>" \
@@ -85,7 +84,7 @@ static void
task_shell_content_display_view_cb (ETaskShellContent *task_shell_content,
GalView *gal_view)
{
- ECalendarTable *task_table;
+ ETaskTable *task_table;
if (!GAL_IS_VIEW_ETABLE (gal_view))
return;
@@ -144,7 +143,7 @@ task_shell_content_table_drag_data_get_cb (ETaskShellContent *task_shell_content
guint info,
guint time)
{
- ECalendarTable *task_table;
+ ETaskTable *task_table;
struct {
ECalModel *model;
@@ -156,7 +155,7 @@ task_shell_content_table_drag_data_get_cb (ETaskShellContent *task_shell_content
task_table = e_task_shell_content_get_task_table (task_shell_content);
- foreach_data.model = e_calendar_table_get_model (task_table);
+ foreach_data.model = e_task_table_get_model (task_table);
foreach_data.list = NULL;
e_table_selected_row_foreach (
@@ -190,7 +189,7 @@ task_shell_content_cursor_change_cb (ETaskShellContent *task_shell_content,
ETable *table)
{
ECalComponentPreview *task_preview;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *task_model;
ECalModelComponent *comp_data;
ECalComponent *comp;
@@ -239,7 +238,7 @@ task_shell_content_model_row_changed_cb (ETaskShellContent *task_shell_content,
ETableModel *model)
{
ECalModelComponent *comp_data;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
const gchar *current_uid;
const gchar *uid;
@@ -438,7 +437,7 @@ task_shell_content_constructed (GObject *object)
container = widget;
- widget = e_calendar_table_new (shell_view, priv->task_model);
+ widget = e_task_table_new (shell_view, priv->task_model);
gtk_container_add (GTK_CONTAINER (container), widget);
priv->task_table = g_object_ref (widget);
gtk_widget_show (widget);
@@ -474,7 +473,7 @@ task_shell_content_constructed (GObject *object)
/* Configure the task table. */
e_table_set_state (
- E_TABLE (priv->task_table), E_CALENDAR_TABLE_DEFAULT_STATE);
+ E_TABLE (priv->task_table), E_TASK_TABLE_DEFAULT_STATE);
e_table_drag_source_set (
E_TABLE (priv->task_table),
@@ -533,7 +532,7 @@ static guint32
task_shell_content_check_state (EShellContent *shell_content)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
GSList *list, *iter;
gboolean assignable = TRUE;
gboolean editable = TRUE;
@@ -548,7 +547,7 @@ task_shell_content_check_state (EShellContent *shell_content)
n_selected = e_table_selected_count (E_TABLE (task_table));
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
for (iter = list; iter != NULL; iter = iter->next) {
ECalModelComponent *comp_data = iter->data;
icalproperty *prop;
@@ -716,13 +715,13 @@ e_task_shell_content_get_task_preview (ETaskShellContent *task_shell_content)
task_shell_content->priv->task_preview);
}
-ECalendarTable *
+ETaskTable *
e_task_shell_content_get_task_table (ETaskShellContent *task_shell_content)
{
g_return_val_if_fail (
E_IS_TASK_SHELL_CONTENT (task_shell_content), NULL);
- return E_CALENDAR_TABLE (task_shell_content->priv->task_table);
+ return E_TASK_TABLE (task_shell_content->priv->task_table);
}
gboolean
diff --git a/modules/calendar/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h
index 7a5e8efd81..dd39f8c6ce 100644
--- a/modules/calendar/e-task-shell-content.h
+++ b/modules/calendar/e-task-shell-content.h
@@ -27,8 +27,8 @@
#include <shell/e-shell-view.h>
#include <calendar/gui/e-cal-model.h>
-#include <calendar/gui/e-calendar-table.h>
#include <calendar/gui/e-cal-component-preview.h>
+#include <calendar/gui/e-task-table.h>
#include <menus/gal-view-instance.h>
@@ -85,7 +85,7 @@ ECalModel * e_task_shell_content_get_task_model
ECalComponentPreview *
e_task_shell_content_get_task_preview
(ETaskShellContent *task_shell_content);
-ECalendarTable *e_task_shell_content_get_task_table
+ETaskTable * e_task_shell_content_get_task_table
(ETaskShellContent *task_shell_content);
gboolean e_task_shell_content_get_preview_visible
(ETaskShellContent *task_shell_content);
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 3d14678f7b..2b25f3373e 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -55,14 +55,14 @@ action_task_assign_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
GSList *list;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -79,7 +79,7 @@ action_task_delete_cb (GtkAction *action,
{
ETaskShellContent *task_shell_content;
ECalComponentPreview *task_preview;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
@@ -87,7 +87,7 @@ action_task_delete_cb (GtkAction *action,
e_task_shell_view_set_status_message (
task_shell_view, _("Deleting selected tasks..."), -1.0);
- e_calendar_table_delete_selected (task_table);
+ e_task_table_delete_selected (task_table);
e_task_shell_view_set_status_message (task_shell_view, NULL, -1.0);
e_cal_component_preview_clear (task_preview);
@@ -98,8 +98,8 @@ action_task_forward_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
ECalComponent *comp;
icalcomponent *clone;
GSList *list;
@@ -107,7 +107,7 @@ action_task_forward_cb (GtkAction *action,
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -154,7 +154,7 @@ action_task_list_delete_cb (GtkAction *action,
ETaskShellSidebar *task_shell_sidebar;
EShellWindow *shell_window;
EShellView *shell_view;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECal *client;
ECalModel *model;
ESourceSelector *selector;
@@ -173,7 +173,7 @@ action_task_list_delete_cb (GtkAction *action,
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
@@ -234,7 +234,7 @@ action_task_list_print_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
@@ -249,7 +249,7 @@ action_task_list_print_preview_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
@@ -368,14 +368,14 @@ action_task_mark_complete_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
GSList *list, *iter;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
- model = e_calendar_table_get_model (task_table);
+ list = e_task_table_get_selected (task_table);
+ model = e_task_table_get_model (task_table);
for (iter = list; iter != NULL; iter = iter->next) {
ECalModelComponent *comp_data = iter->data;
@@ -391,14 +391,14 @@ action_task_mark_incomplete_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
GSList *list, *iter;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
- model = e_calendar_table_get_model (task_table);
+ list = e_task_table_get_selected (task_table);
+ model = e_task_table_get_model (task_table);
for (iter = list; iter != NULL; iter = iter->next) {
ECalModelComponent *comp_data = iter->data;
@@ -417,8 +417,8 @@ action_task_new_cb (GtkAction *action,
EShellView *shell_view;
EShellWindow *shell_window;
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
ECal *client;
ECalComponent *comp;
CompEditor *editor;
@@ -431,7 +431,7 @@ action_task_new_cb (GtkAction *action,
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -452,14 +452,14 @@ action_task_open_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
GSList *list;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -475,8 +475,8 @@ action_task_open_url_cb (GtkAction *action,
EShellView *shell_view;
EShellWindow *shell_window;
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
icalproperty *prop;
const gchar *uri;
GSList *list;
@@ -487,7 +487,7 @@ action_task_open_url_cb (GtkAction *action,
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
@@ -517,9 +517,9 @@ action_task_print_cb (GtkAction *action,
ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
ECalComponent *comp;
+ ETaskTable *task_table;
icalcomponent *clone;
GtkPrintOperationAction print_action;
GSList *list;
@@ -527,7 +527,7 @@ action_task_print_cb (GtkAction *action,
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
@@ -599,8 +599,8 @@ action_task_save_as_cb (GtkAction *action,
EShellWindow *shell_window;
EShellBackend *shell_backend;
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
ECalModelComponent *comp_data;
+ ETaskTable *task_table;
EActivity *activity;
GSList *list;
GFile *file;
@@ -614,7 +614,7 @@ action_task_save_as_cb (GtkAction *action,
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- list = e_calendar_table_get_selected (task_table);
+ list = e_task_table_get_selected (task_table);
g_return_if_fail (list != NULL);
comp_data = list->data;
g_slist_free (list);
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 533a36d3eb..dfa00f73ba 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -28,7 +28,7 @@ task_shell_view_process_completed_tasks (ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
ETaskShellSidebar *task_shell_sidebar;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
GList *clients;
task_shell_content = task_shell_view->priv->task_shell_content;
@@ -37,7 +37,7 @@ task_shell_view_process_completed_tasks (ETaskShellView *task_shell_view)
task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
clients = e_task_shell_sidebar_get_clients (task_shell_sidebar);
- e_calendar_table_process_completed_tasks (task_table, clients, TRUE);
+ e_task_table_process_completed_tasks (task_table, clients, TRUE);
/* Search query takes whether to show completed tasks into account,
* so if the preference has changed we need to update the query. */
@@ -58,7 +58,7 @@ task_shell_view_table_popup_event_cb (EShellView *shell_view,
static void
task_shell_view_table_user_created_cb (ETaskShellView *task_shell_view,
- ECalendarTable *task_table)
+ ETaskTable *task_table)
{
ETaskShellSidebar *task_shell_sidebar;
ECalModel *model;
@@ -67,7 +67,7 @@ task_shell_view_table_user_created_cb (ETaskShellView *task_shell_view,
/* This is the "Click to Add" handler. */
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
client = e_cal_model_get_default_client (model);
source = e_cal_get_source (client);
@@ -82,12 +82,12 @@ task_shell_view_selector_client_added_cb (ETaskShellView *task_shell_view,
ECal *client)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
e_cal_model_add_client (model, client);
e_task_shell_view_update_timezone (task_shell_view);
@@ -98,12 +98,12 @@ task_shell_view_selector_client_removed_cb (ETaskShellView *task_shell_view,
ECal *client)
{
ETaskShellContent *task_shell_content;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
e_cal_model_remove_client (model, client);
}
@@ -126,18 +126,18 @@ task_shell_view_update_timeout_cb (ETaskShellView *task_shell_view)
{
ETaskShellContent *task_shell_content;
ETaskShellSidebar *task_shell_sidebar;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
GList *clients;
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
clients = e_task_shell_sidebar_get_clients (task_shell_sidebar);
- e_calendar_table_process_completed_tasks (task_table, clients, FALSE);
+ e_task_table_process_completed_tasks (task_table, clients, FALSE);
e_cal_model_tasks_update_due_tasks (E_CAL_MODEL_TASKS (model));
g_list_free (clients);
@@ -221,7 +221,7 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
EShellTaskbar *shell_taskbar;
EShellSettings *shell_settings;
EShellWindow *shell_window;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
ESourceSelector *selector;
@@ -245,7 +245,7 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
task_shell_sidebar = E_TASK_SHELL_SIDEBAR (shell_sidebar);
selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
@@ -542,7 +542,7 @@ e_task_shell_view_update_sidebar (ETaskShellView *task_shell_view)
ETaskShellContent *task_shell_content;
EShellView *shell_view;
EShellSidebar *shell_sidebar;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
GString *string;
const gchar *format;
@@ -555,7 +555,7 @@ e_task_shell_view_update_sidebar (ETaskShellView *task_shell_view)
task_shell_content = task_shell_view->priv->task_shell_content;
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
n_rows = e_table_model_row_count (E_TABLE_MODEL (model));
n_selected = e_table_selected_count (E_TABLE (task_table));
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index 07fb12e369..42fa4dd9d0 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -100,7 +100,7 @@ task_shell_view_execute_search (EShellView *shell_view)
EActionComboBox *combo_box;
GtkRadioAction *action;
ECalComponentPreview *task_preview;
- ECalendarTable *task_table;
+ ETaskTable *task_table;
ECalModel *model;
time_t start_range;
time_t end_range;
@@ -264,7 +264,7 @@ task_shell_view_execute_search (EShellView *shell_view)
/* Submit the query. */
task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
task_table = e_task_shell_content_get_task_table (task_shell_content);
- model = e_calendar_table_get_model (task_table);
+ model = e_task_table_get_model (task_table);
e_cal_model_set_search_query (model, query);
g_free (query);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:10:10 +0800