diff --git a/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c b/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c index a96b02fff95e49703742a1a16c708bad0294cf57..cfc9fb2356efc452515036c3353edbd4f750b93c 100644 --- a/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c +++ b/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c @@ -17,6 +17,8 @@ #include "e-contact-editor-dyntable.h" +#include "e-util/e-util.h" + struct _EContactEditorDynTablePrivate { /* absolute max, dyntable will ignore the rest */ @@ -656,22 +658,12 @@ default_impl_widget_is_empty (EContactEditorDynTable *dyntable, GtkWidget *w) { GtkEntry *e; - const gchar *data; - gchar * dup; - size_t len = -1; e = GTK_ENTRY(w); if (0 == gtk_entry_get_text_length (e)) return TRUE; - data = gtk_entry_get_text (e); - - dup = g_strdup (data); - g_strchug (dup); - len = strlen (dup); - g_free (dup); - - return len <= 0; + return e_str_is_empty (gtk_entry_get_text (e)); } static void diff --git a/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.h b/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.h index c5c9238d56aade14fbe0c238eb33606b880d1c36..ccb097f50757e5ac0c723e94b54df9e5cc346e30 100644 --- a/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.h +++ b/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.h @@ -72,7 +72,7 @@ struct _EContactEditorDynTableClass { /* defaults to GtkEntiy */ GtkWidget* (*widget_create) (EContactEditorDynTable *dyntable); - /* defaults to string_is_empty(txt) */ + /* defaults to e_str_is_empty(txt) */ gboolean (*widget_is_empty) (EContactEditorDynTable *dyntable, GtkWidget *w); diff --git a/src/calendar/gui/CMakeLists.txt b/src/calendar/gui/CMakeLists.txt index f32145f5da2516eb859851d67ac01f81fd30cfd1..6d2a71a17cd31d4521c9df8d1e64ec12c613d36c 100644 --- a/src/calendar/gui/CMakeLists.txt +++ b/src/calendar/gui/CMakeLists.txt @@ -26,7 +26,6 @@ set(DEPENDENCIES set(SOURCES calendar-config.c - calendar-view.c comp-util.c e-alarm-list.c e-bulk-edit-tasks.c @@ -72,8 +71,10 @@ set(SOURCES e-meeting-utils.c e-memo-table.c e-month-view.c + e-print.c e-select-names-editable.c e-select-names-renderer.c + e-tag-calendar.c e-task-table.c e-to-do-pane.c e-week-view.c @@ -84,10 +85,8 @@ set(SOURCES e-weekday-chooser.c e-timezone-entry.c e-year-view.c + gal-calendar-view.c itip-utils.c - misc.c - print.c - tag-calendar.c ea-calendar.c ea-calendar-helpers.c ea-cal-view.c @@ -104,7 +103,6 @@ set(SOURCES set(HEADERS calendar-config.h calendar-config-keys.h - calendar-view.h comp-util.h e-alarm-list.h e-bulk-edit-tasks.h @@ -151,8 +149,10 @@ set(HEADERS e-meeting-utils.h e-memo-table.h e-month-view.h + e-print.h e-select-names-editable.h e-select-names-renderer.h + e-tag-calendar.h e-task-table.h e-to-do-pane.h e-week-view-event-item.h @@ -163,10 +163,8 @@ set(HEADERS e-weekday-chooser.h e-timezone-entry.h e-year-view.h + gal-calendar-view.h itip-utils.h - misc.h - print.h - tag-calendar.h ea-calendar.h ea-calendar-helpers.h ea-cal-view.h diff --git a/src/calendar/gui/e-cal-dialogs.c b/src/calendar/gui/e-cal-dialogs.c index 5e8a7280de12276dfc4e15e3242b6e84ca3cac34..fedb792c88a46f3178db47c273e1b26d11685b40 100644 --- a/src/calendar/gui/e-cal-dialogs.c +++ b/src/calendar/gui/e-cal-dialogs.c @@ -29,7 +29,7 @@ #include "calendar-config.h" #include "itip-utils.h" -#include "tag-calendar.h" +#include "e-tag-calendar.h" #include "e-cal-dialogs.h" diff --git a/src/calendar/gui/e-cal-list-view.c b/src/calendar/gui/e-cal-list-view.c index ea6c26bf9a786ac484aaa056c0e1ce5735e9e189..48e55b32da4756d3cdf680e780bc4df81e5fca93 100644 --- a/src/calendar/gui/e-cal-list-view.c +++ b/src/calendar/gui/e-cal-list-view.c @@ -37,7 +37,6 @@ #include "comp-util.h" #include "itip-utils.h" #include "calendar-config.h" -#include "misc.h" struct _ECalListViewPrivate { /* The main display table */ diff --git a/src/calendar/gui/e-cal-model-calendar.c b/src/calendar/gui/e-cal-model-calendar.c index ef1d50b303b806f704770c64530e2ac46ced075c..f020609eec7cc6331ea9cd7e0369d73ee8458f7f 100644 --- a/src/calendar/gui/e-cal-model-calendar.c +++ b/src/calendar/gui/e-cal-model-calendar.c @@ -28,7 +28,6 @@ #include "e-cal-model-calendar.h" #include "e-cell-date-edit-text.h" #include "itip-utils.h" -#include "misc.h" #include "e-cal-dialogs.h" /* Forward Declarations */ @@ -118,7 +117,7 @@ set_location (ECalModelComponent *comp_data, prop = i_cal_component_get_first_property (comp_data->icalcomp, I_CAL_LOCATION_PROPERTY); - if (string_is_empty (value)) { + if (e_str_is_empty (value)) { if (prop) { i_cal_component_remove_property (comp_data->icalcomp, prop); g_object_unref (prop); @@ -142,7 +141,7 @@ set_transparency (ECalModelComponent *comp_data, prop = i_cal_component_get_first_property (comp_data->icalcomp, I_CAL_TRANSP_PROPERTY); - if (string_is_empty (value)) { + if (e_str_is_empty (value)) { if (prop) { i_cal_component_remove_property (comp_data->icalcomp, prop); g_object_unref (prop); @@ -413,7 +412,7 @@ cal_model_calendar_value_is_empty (ETableModel *etm, case E_CAL_MODEL_CALENDAR_FIELD_LOCATION : case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY : case E_CAL_MODEL_CALENDAR_FIELD_STATUS: - return string_is_empty (value); + return e_str_is_empty (value); } return TRUE; diff --git a/src/calendar/gui/e-cal-model-memos.c b/src/calendar/gui/e-cal-model-memos.c index 30b89f17dc2f00ed8969f1d6c8153d50b8c939b5..67c8e5386b9dc99e000f2bf210aa93e6ed90c156 100644 --- a/src/calendar/gui/e-cal-model-memos.c +++ b/src/calendar/gui/e-cal-model-memos.c @@ -28,7 +28,6 @@ #include #include "e-cal-model-memos.h" #include "e-cell-date-edit-text.h" -#include "misc.h" #define d(x) (x) @@ -240,7 +239,7 @@ cal_model_memos_value_is_empty (ETableModel *etm, switch (col) { case E_CAL_MODEL_MEMOS_FIELD_STATUS: - return string_is_empty (value); + return e_str_is_empty (value); } return TRUE; diff --git a/src/calendar/gui/e-cal-model-tasks.c b/src/calendar/gui/e-cal-model-tasks.c index 766ea493e86e58d4bec7c0c3a26a26de0aaa83e4..6fa51eb4c6e8ecde287d73ca5dc356932317bd9e 100644 --- a/src/calendar/gui/e-cal-model-tasks.c +++ b/src/calendar/gui/e-cal-model-tasks.c @@ -31,7 +31,6 @@ #include "calendar-config.h" #include "e-cal-model-tasks.h" #include "e-cell-date-edit-text.h" -#include "misc.h" struct _ECalModelTasksPrivate { gboolean highlight_due_today; @@ -472,7 +471,7 @@ set_geo (ECalModelComponent *comp_data, prop = i_cal_component_get_first_property (comp_data->icalcomp, I_CAL_GEO_PROPERTY); - if (string_is_empty (value)) { + if (e_str_is_empty (value)) { if (prop) { i_cal_component_remove_property (comp_data->icalcomp, prop); g_object_unref (prop); @@ -590,7 +589,7 @@ set_url (ECalModelComponent *comp_data, prop = i_cal_component_get_first_property (comp_data->icalcomp, I_CAL_URL_PROPERTY); - if (string_is_empty (value)) { + if (e_str_is_empty (value)) { if (prop) { i_cal_component_remove_property (comp_data->icalcomp, prop); g_object_unref (prop); @@ -614,7 +613,7 @@ set_location (ECalModelComponent *comp_data, prop = i_cal_component_get_first_property (comp_data->icalcomp, I_CAL_LOCATION_PROPERTY); - if (string_is_empty (value)) { + if (e_str_is_empty (value)) { if (prop) { i_cal_component_remove_property (comp_data->icalcomp, prop); g_object_unref (prop); @@ -1108,7 +1107,7 @@ cal_model_tasks_value_is_empty (ETableModel *etm, case E_CAL_MODEL_TASKS_FIELD_STATUS : case E_CAL_MODEL_TASKS_FIELD_URL : case E_CAL_MODEL_TASKS_FIELD_LOCATION: - return string_is_empty (value); + return e_str_is_empty (value); case E_CAL_MODEL_TASKS_FIELD_COMPLETED : case E_CAL_MODEL_TASKS_FIELD_DUE : case E_CAL_MODEL_TASKS_FIELD_ESTIMATED_DURATION: diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c index 0c3594e0fd53282212af8dc70e3cc3a62936a690..db5e3620c61251b2dca48a5c97c3a2a86158a50a 100644 --- a/src/calendar/gui/e-cal-model.c +++ b/src/calendar/gui/e-cal-model.c @@ -36,7 +36,6 @@ #include "e-cal-dialogs.h" #include "e-cal-ops.h" #include "itip-utils.h" -#include "misc.h" #include "e-cal-model.h" @@ -514,7 +513,7 @@ set_summary (ECalModelComponent *comp_data, prop = i_cal_component_get_first_property (comp_data->icalcomp, I_CAL_SUMMARY_PROPERTY); - if (string_is_empty (value)) { + if (e_str_is_empty (value)) { if (prop) { i_cal_component_remove_property (comp_data->icalcomp, prop); g_clear_object (&prop); @@ -1835,12 +1834,12 @@ cal_model_value_is_empty (ETableModel *etm, if (priv->default_category && value && strcmp (priv->default_category, value) == 0) return TRUE; else - return string_is_empty (value); + return e_str_is_empty (value); case E_CAL_MODEL_FIELD_CLASSIFICATION : case E_CAL_MODEL_FIELD_DESCRIPTION : case E_CAL_MODEL_FIELD_SUMMARY : case E_CAL_MODEL_FIELD_SOURCE: - return string_is_empty (value); + return e_str_is_empty (value); case E_CAL_MODEL_FIELD_DTSTART : case E_CAL_MODEL_FIELD_CREATED : case E_CAL_MODEL_FIELD_LASTMODIFIED : diff --git a/src/calendar/gui/e-calendar-view.c b/src/calendar/gui/e-calendar-view.c index e30fbf7cf9eadd7c75af8a388f703de89179941d..b07082ed254b952f6586085f2c9fe8b7c40e6872 100644 --- a/src/calendar/gui/e-calendar-view.c +++ b/src/calendar/gui/e-calendar-view.c @@ -42,8 +42,6 @@ #include "e-day-view.h" #include "e-month-view.h" #include "itip-utils.h" -#include "misc.h" -#include "print.h" #define X_EVOLUTION_CLIENT_UID "X-EVOLUTION-CLIENT-UID" diff --git a/src/calendar/gui/e-comp-editor-page-recurrence.c b/src/calendar/gui/e-comp-editor-page-recurrence.c index a79165afffc4f5b27ffe03af266cd0ae37568bc4..c1a5c7ad71dfe7ec923a0e2a70cf27270de34191 100644 --- a/src/calendar/gui/e-comp-editor-page-recurrence.c +++ b/src/calendar/gui/e-comp-editor-page-recurrence.c @@ -35,7 +35,7 @@ #include "e-comp-editor-page-general.h" #include "e-date-time-list.h" #include "e-weekday-chooser.h" -#include "tag-calendar.h" +#include "e-tag-calendar.h" #include "e-comp-editor-page-recurrence.h" diff --git a/src/calendar/gui/e-comp-editor.c b/src/calendar/gui/e-comp-editor.c index 6b6041801a97cbfb4f5bc00d86540e234614a171..994e35db3b275209568435362a73a16bb85efd61 100644 --- a/src/calendar/gui/e-comp-editor.c +++ b/src/calendar/gui/e-comp-editor.c @@ -27,8 +27,8 @@ #include "calendar-config.h" #include "comp-util.h" #include "e-cal-dialogs.h" +#include "e-print.h" #include "itip-utils.h" -#include "print.h" #include "e-comp-editor-page-general.h" #include "e-comp-editor-page-attachments.h" @@ -1527,7 +1527,7 @@ ece_print_or_preview (ECompEditor *comp_editor, comp = e_cal_component_new_from_icalcomponent (component); g_return_if_fail (comp != NULL); - print_comp (comp, + e_print_comp (comp, e_comp_editor_get_target_client (comp_editor), calendar_config_get_icaltimezone (), calendar_config_get_24_hour_format (), diff --git a/src/calendar/gui/e-day-view.c b/src/calendar/gui/e-day-view.c index 3b875c99399bd2910b1f9d7dc0d1baf744368692..f6ae1960804b80d13711d968a73fa0e7b04efbc0 100644 --- a/src/calendar/gui/e-day-view.c +++ b/src/calendar/gui/e-day-view.c @@ -45,8 +45,6 @@ #include "e-day-view-top-item.h" #include "ea-calendar.h" #include "itip-utils.h" -#include "misc.h" -#include "print.h" #include "ea-day-view.h" /* The minimum amount of space wanted on each side of the date string. */ @@ -8104,7 +8102,7 @@ e_day_view_on_editing_stopped (EDayView *day_view, client = event->comp_data->client; on_server = !event->comp_data->is_new_component; - if (string_is_empty (text) && !on_server) { + if (e_str_is_empty (text) && !on_server) { const gchar *uid; uid = e_cal_component_get_uid (comp); @@ -8126,7 +8124,7 @@ e_day_view_on_editing_stopped (EDayView *day_view, e_day_view_update_event_label ( day_view, day, event_num); - } else if ((summary && e_cal_component_text_get_value (summary)) || !string_is_empty (text)) { + } else if ((summary && e_cal_component_text_get_value (summary)) || !e_str_is_empty (text)) { ICalComponent *icomp = e_cal_component_get_icalcomponent (comp); if (summary) diff --git a/src/calendar/gui/e-memo-table.c b/src/calendar/gui/e-memo-table.c index ac482553bd1d2e936ccc508195f46814f09ce2f8..4f27c624c6ebe9a19753e3ec97140fc37b2b8d4b 100644 --- a/src/calendar/gui/e-memo-table.c +++ b/src/calendar/gui/e-memo-table.c @@ -41,8 +41,6 @@ #include "e-calendar-view.h" #include "e-cell-date-edit-text.h" #include "itip-utils.h" -#include "print.h" -#include "misc.h" struct _EMemoTablePrivate { gpointer shell_view; /* weak pointer */ diff --git a/src/calendar/gui/print.c b/src/calendar/gui/e-print.c similarity index 99% rename from src/calendar/gui/print.c rename to src/calendar/gui/e-print.c index 030fd3d48de8b2f37dab9fc3a17357df4a977d3b..5c0cfea389e0da446f2b3c16517af25f09ffa4cb 100644 --- a/src/calendar/gui/print.c +++ b/src/calendar/gui/e-print.c @@ -25,7 +25,7 @@ #include "evolution-config.h" -#include "print.h" +#include "e-print.h" #include #include @@ -3518,11 +3518,11 @@ print_calendar_draw_page (GtkPrintOperation *operation, } void -print_calendar (ECalendarView *cal_view, - ETable *tasks_table, - EPrintView print_view_type, - GtkPrintOperationAction action, - time_t start) +e_print_calendar (ECalendarView *cal_view, + ETable *tasks_table, + EPrintView print_view_type, + GtkPrintOperationAction action, + time_t start) { GtkPrintOperation *operation; PrintCalItem *pci; @@ -3897,11 +3897,11 @@ print_comp_begin_print (GtkPrintOperation *operation, } void -print_comp (ECalComponent *comp, - ECalClient *cal_client, - ICalTimezone *zone, - gboolean use_24_hour_format, - GtkPrintOperationAction action) +e_print_comp (ECalComponent *comp, + ECalClient *cal_client, + ICalTimezone *zone, + gboolean use_24_hour_format, + GtkPrintOperationAction action) { GtkPrintOperation *operation; PrintCompItem *pci; @@ -4012,10 +4012,10 @@ print_table_draw_page (GtkPrintOperation *operation, } void -print_table (ETable *table, - const gchar *dialog_title, - const gchar *print_header, - GtkPrintOperationAction action) +e_print_table (ETable *table, + const gchar *dialog_title, + const gchar *print_header, + GtkPrintOperationAction action) { GtkPrintOperation *operation; EPrintable *printable; diff --git a/src/calendar/gui/print.h b/src/calendar/gui/e-print.h similarity index 88% rename from src/calendar/gui/print.h rename to src/calendar/gui/e-print.h index fd9d90953d9223053e52ec08542683344c4d8633..d3c8eb8759f67734362efa71b05f86e1e5ecfa2b 100644 --- a/src/calendar/gui/print.h +++ b/src/calendar/gui/e-print.h @@ -21,8 +21,8 @@ * */ -#ifndef PRINT_H -#define PRINT_H +#ifndef E_PRINT_H +#define E_PRINT_H #include @@ -36,17 +36,17 @@ typedef enum { E_PRINT_VIEW_LIST } EPrintView; -void print_calendar (ECalendarView *cal_view, +void e_print_calendar (ECalendarView *cal_view, ETable *tasks_table, EPrintView print_view_type, GtkPrintOperationAction action, time_t start); -void print_comp (ECalComponent *comp, +void e_print_comp (ECalComponent *comp, ECalClient *cal_client, ICalTimezone *zone, gboolean use_24_hour_format, GtkPrintOperationAction action); -void print_table (ETable *table, +void e_print_table (ETable *table, const gchar *dialog_title, const gchar *print_header, GtkPrintOperationAction action); diff --git a/src/calendar/gui/tag-calendar.c b/src/calendar/gui/e-tag-calendar.c similarity index 99% rename from src/calendar/gui/tag-calendar.c rename to src/calendar/gui/e-tag-calendar.c index 5b855608cf55f24c790253de5a2e372a6c305dbd..70394e2a3fd72fda704f15d9b5f7594eadb3638a 100644 --- a/src/calendar/gui/tag-calendar.c +++ b/src/calendar/gui/e-tag-calendar.c @@ -29,7 +29,7 @@ #include "calendar-config.h" #include "comp-util.h" #include "e-cal-data-model-subscriber.h" -#include "tag-calendar.h" +#include "e-tag-calendar.h" struct _ETagCalendarPrivate { diff --git a/src/calendar/gui/tag-calendar.h b/src/calendar/gui/e-tag-calendar.h similarity index 98% rename from src/calendar/gui/tag-calendar.h rename to src/calendar/gui/e-tag-calendar.h index e56592731413bdd9db63c29d3c54307d8a435a71..0f36437f7b1617b104ea9182945c83e97ad0f392 100644 --- a/src/calendar/gui/tag-calendar.h +++ b/src/calendar/gui/e-tag-calendar.h @@ -23,8 +23,8 @@ * */ -#ifndef TAG_CALENDAR_H -#define TAG_CALENDAR_H +#ifndef E_TAG_CALENDAR_H +#define E_TAG_CALENDAR_H #include #include diff --git a/src/calendar/gui/e-task-table.c b/src/calendar/gui/e-task-table.c index 0031f0204543b32d2133d277f6217a91ec119b51..26ec44fa1b865f28efc4d83b0dab1986afbd4a64 100644 --- a/src/calendar/gui/e-task-table.c +++ b/src/calendar/gui/e-task-table.c @@ -44,8 +44,6 @@ #include "e-cell-date-edit-text.h" #include "e-cell-estimated-duration.h" #include "itip-utils.h" -#include "print.h" -#include "misc.h" struct _ETaskTablePrivate { gpointer shell_view; /* weak pointer */ @@ -1382,7 +1380,6 @@ hide_completed_rows_ready (GObject *source_object, ECalClient *cal_client; GSList *m, *objects = NULL; gboolean changed = FALSE; - gint pos; GPtrArray *comp_objects; GError *error = NULL; @@ -1424,14 +1421,15 @@ hide_completed_rows_ready (GObject *source_object, comp_data = e_cal_model_get_component_for_client_and_uid (model, cal_client, id); if (comp_data != NULL) { - e_table_model_pre_change (E_TABLE_MODEL (model)); - pos = get_position_in_array ( - comp_objects, comp_data); - if (g_ptr_array_remove (comp_objects, comp_data)) + guint pos; + + if (g_ptr_array_find (comp_objects, comp_data, &pos)) { + e_table_model_pre_change (E_TABLE_MODEL (model)); + g_ptr_array_remove_index (comp_objects, pos); g_object_unref (comp_data); - e_table_model_row_deleted ( - E_TABLE_MODEL (model), pos); - changed = TRUE; + e_table_model_row_deleted (E_TABLE_MODEL (model), pos); + changed = TRUE; + } } e_cal_component_id_free (id); g_object_unref (comp); diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c index dc6845540f36ce4c4eaf8abd7a7d68ed313e6373..3a4037a3f11a93d23ed6dc3814a8c00e9bbc72bb 100644 --- a/src/calendar/gui/e-to-do-pane.c +++ b/src/calendar/gui/e-to-do-pane.c @@ -30,7 +30,6 @@ #include "e-cal-dialogs.h" #include "e-cal-ops.h" #include "itip-utils.h" -#include "misc.h" #include "e-to-do-pane.h" @@ -347,6 +346,53 @@ etdp_dup_component_summary (ICalComponent *icomp) return summary; } +static gchar * +calculate_time (time_t start, + time_t end) +{ + time_t difference = end - start; + gchar *str; + gint hours, minutes; + gchar *times[5]; + gchar *joined; + gint i; + + i = 0; + if (difference >= 24 * 3600) { + gint days; + + days = difference / (24 * 3600); + difference %= (24 * 3600); + + times[i++] = g_strdup_printf (ngettext ("%d day", "%d days", days), days); + } + if (difference >= 3600) { + hours = difference / 3600; + difference %= 3600; + + times[i++] = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours); + } + if (difference >= 60) { + minutes = difference / 60; + difference %= 60; + + times[i++] = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes); + } + if (i == 0 || difference != 0) { + /* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */ + times[i++] = g_strdup_printf (ngettext ("%d second", "%d seconds", difference), (gint) difference); + } + + times[i] = NULL; + joined = g_strjoinv (" ", times); + str = g_strconcat ("(", joined, ")", NULL); + while (i > 0) + g_free (times[--i]); + g_free (joined); + + return str; +} + static gboolean etdp_get_component_data (EToDoPane *to_do_pane, ECalClient *client, diff --git a/src/calendar/gui/e-week-view.c b/src/calendar/gui/e-week-view.c index 28f680cb20511a40cb1d053db6649cb70d455c4e..014e2545df143c2ed6b764abb1ea9f044541f482 100644 --- a/src/calendar/gui/e-week-view.c +++ b/src/calendar/gui/e-week-view.c @@ -44,8 +44,6 @@ #include "e-week-view-titles-item.h" #include "ea-calendar.h" #include "itip-utils.h" -#include "misc.h" -#include "print.h" #include "ea-week-view.h" #define E_WEEK_VIEW_SMALL_FONT_PTSIZE 7 @@ -4908,7 +4906,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, client = event->comp_data->client; on_server = !event->comp_data->is_new_component; - if (string_is_empty (text) && !on_server) { + if (e_str_is_empty (text) && !on_server) { uid = e_cal_component_get_uid (comp); g_signal_handlers_disconnect_by_func (item, e_week_view_on_text_item_event, week_view); e_week_view_foreach_event_with_uid (week_view, uid, @@ -4931,7 +4929,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, if (!e_week_view_is_one_day_event (week_view, event_num)) e_week_view_reshape_event_span (week_view, event_num, span_num); - } else if ((summary && e_cal_component_text_get_value (summary)) || !string_is_empty (text)) { + } else if ((summary && e_cal_component_text_get_value (summary)) || !e_str_is_empty (text)) { ICalComponent *icomp = e_cal_component_get_icalcomponent (comp); e_cal_component_text_free (summary); diff --git a/src/calendar/gui/calendar-view.c b/src/calendar/gui/gal-calendar-view.c similarity index 97% rename from src/calendar/gui/calendar-view.c rename to src/calendar/gui/gal-calendar-view.c index b36bac0caf63873ac9d653a470cda65dfdd8cb17..db1f49972a386719a90ac386d8c44d2abd138fcb 100644 --- a/src/calendar/gui/calendar-view.c +++ b/src/calendar/gui/gal-calendar-view.c @@ -1,5 +1,5 @@ /* - * calendar-view.c + * gal-calendar-view.c * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -15,7 +15,7 @@ * */ -#include "calendar-view.h" +#include "gal-calendar-view.h" G_DEFINE_TYPE ( GalViewCalendarDay, diff --git a/src/calendar/gui/calendar-view.h b/src/calendar/gui/gal-calendar-view.h similarity index 94% rename from src/calendar/gui/calendar-view.h rename to src/calendar/gui/gal-calendar-view.h index 30907e4f6be96ce6691bfb168e9d3dce6643d529..8f6f74c33e845d2674a3e8ed049b2fc8fe5fcec3 100644 --- a/src/calendar/gui/calendar-view.h +++ b/src/calendar/gui/gal-calendar-view.h @@ -1,5 +1,5 @@ /* - * calendar-view.h + * gal-calendar-view.h * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -15,8 +15,8 @@ * */ -#ifndef CALENDAR_VIEW_H -#define CALENDAR_VIEW_H +#ifndef GAL_CALENDAR_VIEW_H +#define GAL_CALENDAR_VIEW_H #include @@ -57,4 +57,4 @@ GType gal_view_calendar_year_get_type (void) G_GNUC_CONST; G_END_DECLS -#endif /* CALENDAR_VIEW_H */ +#endif /* GAL_CALENDAR_VIEW_H */ diff --git a/src/calendar/gui/misc.c b/src/calendar/gui/misc.c deleted file mode 100644 index ba4c52ebfb1d3b7c7efdd252bbca3e2450cc6d22..0000000000000000000000000000000000000000 --- a/src/calendar/gui/misc.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Evolution calendar - Miscellaneous utility functions - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, see . - * - * - * Authors: - * Federico Mena-Quintero - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "evolution-config.h" - -#include -#include -#include - -#include "misc.h" - -/** - * string_is_empty: - * @value: A string. - * - * Returns whether a string is NULL, the empty string, or completely made up of - * whitespace characters. - * - * Return value: TRUE if the string is empty, FALSE otherwise. - **/ -gboolean -string_is_empty (const gchar *value) -{ - const gchar *p; - gboolean empty; - - empty = TRUE; - - if (value) { - p = value; - while (*p) { - if (!isspace ((guchar) *p)) { - empty = FALSE; - break; - } - p++; - } - } - return empty; - -} - -gint -get_position_in_array (GPtrArray *objects, - gpointer item) -{ - gint i; - - for (i = 0; i < objects->len; i++) { - if (g_ptr_array_index (objects, i) == item) - return i; - } - - return -1; -} - -gchar * -calculate_time (time_t start, - time_t end) -{ - time_t difference = end - start; - gchar *str; - gint hours, minutes; - gchar *times[5]; - gchar *joined; - gint i; - - i = 0; - if (difference >= 24 * 3600) { - gint days; - - days = difference / (24 * 3600); - difference %= (24 * 3600); - - times[i++] = g_strdup_printf (ngettext ("%d day", "%d days", days), days); - } - if (difference >= 3600) { - hours = difference / 3600; - difference %= 3600; - - times[i++] = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours); - } - if (difference >= 60) { - minutes = difference / 60; - difference %= 60; - - times[i++] = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes); - } - if (i == 0 || difference != 0) { - /* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */ - times[i++] = g_strdup_printf (ngettext ("%d second", "%d seconds", difference), (gint) difference); - } - - times[i] = NULL; - joined = g_strjoinv (" ", times); - str = g_strconcat ("(", joined, ")", NULL); - while (i > 0) - g_free (times[--i]); - g_free (joined); - - return str; -} diff --git a/src/calendar/gui/misc.h b/src/calendar/gui/misc.h deleted file mode 100644 index 3aff75df53f4285ae0c56a1a62f9a71b500717d1..0000000000000000000000000000000000000000 --- a/src/calendar/gui/misc.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * - * Evolution calendar - Miscellaneous utility functions - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, see . - * - * - * Authors: - * Federico Mena-Quintero - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef MISC_H -#define MISC_H - -#include -#include - -gboolean string_is_empty (const gchar *value); -gint get_position_in_array (GPtrArray *objects, gpointer item); -gchar * calculate_time (time_t start, time_t end); -#endif diff --git a/src/e-util/e-misc-utils.c b/src/e-util/e-misc-utils.c index 14908a168f7f83bdcf5d441a5a7e888285f8a117..a9bfc269492267cc7cb62106dc099416e991715a 100644 --- a/src/e-util/e-misc-utils.c +++ b/src/e-util/e-misc-utils.c @@ -942,6 +942,37 @@ e_str_replace_string (const gchar *text, return g_string_append (str, p); } +/** + * e_str_is_empty: + * @value: A string. + * + * Returns whether a string is %NULL, the empty string, or completely made up of + * whitespace characters. + * + * Returns: %TRUE if the string is empty, %FALSE otherwise. + **/ +gboolean +e_str_is_empty (const gchar *value) +{ + const gchar *p; + gboolean empty; + + empty = TRUE; + + if (value) { + p = value; + while (*p) { + if (!isspace ((guchar) *p)) { + empty = FALSE; + break; + } + p++; + } + } + + return empty; +} + gint e_str_compare (gconstpointer x, gconstpointer y) diff --git a/src/e-util/e-misc-utils.h b/src/e-util/e-misc-utils.h index 184857b966096c158383007acc5ebdfd0793a512..4cb49f9b434e021923f56a4d71f8f2026676832a 100644 --- a/src/e-util/e-misc-utils.h +++ b/src/e-util/e-misc-utils.h @@ -83,6 +83,7 @@ gchar * e_str_without_underscores (const gchar *string); GString * e_str_replace_string (const gchar *text, const gchar *find, const gchar *replace); +gboolean e_str_is_empty (const gchar *value); gint e_str_compare (gconstpointer x, gconstpointer y); gint e_str_case_compare (gconstpointer x, diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt index 4b46265dbbb4d01d73dd57da5415d1519a8baf2b..9fa6a1499d49362e320d0ea8334382ef445b6ceb 100644 --- a/src/mail/CMakeLists.txt +++ b/src/mail/CMakeLists.txt @@ -6,7 +6,7 @@ add_custom_xml_files(mail ${privdatadir} filter .in "" vfoldertypes.xml ) -install(FILES message-list.etspec +install(FILES e-message-list.etspec DESTINATION ${etspecdir} ) @@ -94,6 +94,7 @@ set(SOURCES e-mail-ui-session.c e-mail-view.c e-mail-viewer.c + e-message-list.c em-composer-utils.c em-config.c em-event.c @@ -118,7 +119,6 @@ set(SOURCES mail-autofilter.c mail-send-recv.c mail-vfolder-ui.c - message-list.c ${CMAKE_CURRENT_BINARY_DIR}/e-mail-enumtypes.c ) @@ -186,6 +186,7 @@ set(HEADERS e-mail-ui-session.h e-mail-view.h e-mail-viewer.h + e-message-list.h em-composer-utils.h em-config.h em-event.h @@ -210,7 +211,6 @@ set(HEADERS mail-autofilter.h mail-send-recv.h mail-vfolder-ui.h - message-list.h ${CMAKE_CURRENT_BINARY_DIR}/e-mail-enumtypes.h ) diff --git a/src/mail/e-mail-browser.c b/src/mail/e-mail-browser.c index 1e0ef6f999afd0b04d4cce50ccb04de99b2d4a24..13b85099ecdf3bf578e32cf33fbf530cd671fc86 100644 --- a/src/mail/e-mail-browser.c +++ b/src/mail/e-mail-browser.c @@ -32,8 +32,8 @@ #include "e-mail-reader.h" #include "e-mail-reader-utils.h" +#include "e-message-list.h" #include "em-folder-tree-model.h" -#include "message-list.h" #define ACTION_GROUP_STANDARD "action-group-standard" #define ACTION_GROUP_SEARCH_FOLDERS "action-group-search-folders" @@ -191,12 +191,12 @@ close_on_idle_cb (gpointer browser) static void mail_browser_message_list_built_cb (EMailBrowser *browser, - MessageList *message_list) + EMessageList *message_list) { g_return_if_fail (E_IS_MAIL_BROWSER (browser)); - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); - if (message_list_count (message_list) == 0) + if (e_message_list_count (message_list) == 0) /* Prioritize ahead of GTK+ redraws. */ g_idle_add_full ( G_PRIORITY_HIGH_IDLE, @@ -671,7 +671,7 @@ mail_browser_constructed (GObject *object) /* The message list is a widget, but it is not shown in the browser. * Unfortunately, the widget is inseparable from its model, and the * model is all we need. */ - browser->priv->message_list = message_list_new (session); + browser->priv->message_list = e_message_list_new (session); g_object_ref_sink (browser->priv->message_list); g_signal_connect_swapped ( diff --git a/src/mail/e-mail-folder-pane.c b/src/mail/e-mail-folder-pane.c index 44414cc677fed22bf8790ee381d59f42336ce236..b0573f4a000263a15f545c1e01888ca7dc225286 100644 --- a/src/mail/e-mail-folder-pane.c +++ b/src/mail/e-mail-folder-pane.c @@ -35,7 +35,6 @@ #include "em-folder-tree-model.h" #include "em-composer-utils.h" #include "em-utils.h" -#include "message-list.h" struct _EMailFolderPanePrivate { gint placeholder; diff --git a/src/mail/e-mail-paned-view.c b/src/mail/e-mail-paned-view.c index c612a41350853c77e8335b6c84d34380dfb7df0f..20200db5d36cafb28935777345ac004fda25a62b 100644 --- a/src/mail/e-mail-paned-view.c +++ b/src/mail/e-mail-paned-view.c @@ -27,9 +27,9 @@ #include -#include "em-utils.h" -#include "message-list.h" #include "e-mail-reader-utils.h" +#include "e-message-list.h" +#include "em-utils.h" #include "e-mail-paned-view.h" @@ -120,12 +120,12 @@ mail_paned_view_save_boolean (EMailView *view, } static gboolean -mail_paned_view_message_list_is_empty (MessageList *message_list) +mail_paned_view_message_list_is_empty (EMessageList *message_list) { ETreeModel *model; ETreePath root; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), TRUE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), TRUE); model = e_tree_get_model (E_TREE (message_list)); if (!model) @@ -140,7 +140,7 @@ mail_paned_view_message_list_is_empty (MessageList *message_list) static void mail_paned_view_message_list_built_cb (EMailView *view, - MessageList *message_list) + EMessageList *message_list) { EMailPanedView *self = E_MAIL_PANED_VIEW (view); EShellView *shell_view; @@ -152,7 +152,7 @@ mail_paned_view_message_list_built_cb (EMailView *view, ensure_message_selected = self->priv->folder_just_set; self->priv->folder_just_set = FALSE; - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); shell_view = e_mail_view_get_shell_view (view); shell_window = e_shell_view_get_shell_window (shell_view); @@ -174,13 +174,13 @@ mail_paned_view_message_list_built_cb (EMailView *view, /* This is for regen when setting filter, or when folder changed or such */ if (!ensure_message_selected && - !message_list_selected_count (message_list) && + !e_message_list_selected_count (message_list) && !mail_paned_view_message_list_is_empty (message_list)) { ensure_message_selected = TRUE; with_fallback = FALSE; if (self->priv->last_selected_uid && - message_list_contains_uid (message_list, self->priv->last_selected_uid)) { + e_message_list_contains_uid (message_list, self->priv->last_selected_uid)) { g_free (uid); uid = g_strdup (self->priv->last_selected_uid); } @@ -190,7 +190,7 @@ mail_paned_view_message_list_built_cb (EMailView *view, over the stored message. The _set_folder() makes sure to unset priv->last_selected_uid, when it's not from this folder. */ if (ensure_message_selected && !uid && self->priv->last_selected_uid && - message_list_contains_uid (message_list, self->priv->last_selected_uid)) { + e_message_list_contains_uid (message_list, self->priv->last_selected_uid)) { uid = g_strdup (self->priv->last_selected_uid); } @@ -209,12 +209,12 @@ mail_paned_view_message_list_built_cb (EMailView *view, g_free (folder_uri); } - if (ensure_message_selected && !message_list_contains_uid (message_list, uid) && + if (ensure_message_selected && !e_message_list_contains_uid (message_list, uid) && e_mail_reader_get_mark_seen_always (E_MAIL_READER (view))) e_mail_reader_unset_folder_just_selected (E_MAIL_READER (view)); if (ensure_message_selected) - message_list_select_uid (message_list, uid, with_fallback); + e_message_list_select_uid (message_list, uid, with_fallback); g_free (uid); } @@ -225,7 +225,7 @@ mail_paned_view_message_list_built_cb (EMailView *view, static void mail_paned_view_message_selected_cb (EMailView *view, const gchar *message_uid, - MessageList *message_list) + EMessageList *message_list) { EShellView *shell_view; CamelFolder *folder; @@ -234,7 +234,7 @@ mail_paned_view_message_selected_cb (EMailView *view, gchar *folder_uri; gchar *group_name; - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); /* This also gets triggered when selecting a store name on * the sidebar such as "On This Computer", in which case @@ -679,7 +679,7 @@ mail_paned_view_set_folder (EMailReader *reader, message_list = e_mail_reader_get_message_list (reader); - message_list_freeze (MESSAGE_LIST (message_list)); + e_message_list_freeze (E_MESSAGE_LIST (message_list)); /* Chain up to interface's default set_folder() method. */ default_interface = g_type_default_interface_peek (E_TYPE_MAIL_READER); @@ -744,7 +744,7 @@ mail_paned_view_set_folder (EMailReader *reader, g_free (group_name); exit: - message_list_thaw (MESSAGE_LIST (message_list)); + e_message_list_thaw (E_MESSAGE_LIST (message_list)); g_object_unref (settings); } @@ -832,7 +832,7 @@ mail_paned_view_constructed (GObject *object) container = widget; - widget = message_list_new (session); + widget = e_message_list_new (session); gtk_container_add (GTK_CONTAINER (container), widget); self->priv->message_list = g_object_ref (widget); gtk_widget_show (widget); @@ -1137,7 +1137,7 @@ mail_paned_view_update_view_instance (EMailView *view) /* XXX This only stashes the filename in the view. * The state file is not actually loaded until - * the MessageList is attached to the view. */ + * the EMessageList is attached to the view. */ gal_view_load (gal_view, state_filename); gal_view_instance_set_custom_view ( @@ -1183,7 +1183,7 @@ mail_paned_view_set_preview_visible (EMailView *view, reader = E_MAIL_READER (view); message_list = e_mail_reader_get_message_list (reader); - cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + cursor_uid = E_MESSAGE_LIST (message_list)->cursor_uid; if (cursor_uid != NULL) e_mail_reader_set_message (reader, cursor_uid); diff --git a/src/mail/e-mail-reader-utils.c b/src/mail/e-mail-reader-utils.c index cddbbabf2b2f3d27a2b38086973db9fb8dad10c6..cef8c6e4c0a1a2bfefcdaf1ab6bbfc802b69cac3 100644 --- a/src/mail/e-mail-reader-utils.c +++ b/src/mail/e-mail-reader-utils.c @@ -41,11 +41,11 @@ #include "e-mail-browser.h" #include "e-mail-printer.h" #include "e-mail-display.h" +#include "e-message-list.h" #include "em-composer-utils.h" #include "em-utils.h" #include "mail-autofilter.h" #include "mail-vfolder-ui.h" -#include "message-list.h" #define d(x) @@ -1406,7 +1406,7 @@ copy_tree_state (EMailReader *src_reader, e_tree_set_state_object (E_TREE (des_mlist), state); g_object_unref (state); - message_list_set_search (MESSAGE_LIST (des_mlist), MESSAGE_LIST (src_mlist)->search); + e_message_list_set_search (E_MESSAGE_LIST (des_mlist), E_MESSAGE_LIST (src_mlist)->search); } guint @@ -1491,7 +1491,7 @@ e_mail_reader_open_selected (EMailReader *reader) const gchar *uid = views->pdata[ii]; GtkWidget *browser; EMailReader *browser_reader; - MessageList *ml; + EMessageList *ml; if (prefer_existing) { EMailBrowser *mail_browser; @@ -1507,8 +1507,8 @@ e_mail_reader_open_selected (EMailReader *reader) browser = e_mail_browser_new (backend, E_MAIL_FORMATTER_MODE_NORMAL); browser_reader = E_MAIL_READER (browser); - ml = MESSAGE_LIST (e_mail_reader_get_message_list (browser_reader)); - message_list_freeze (ml); + ml = E_MESSAGE_LIST (e_mail_reader_get_message_list (browser_reader)); + e_message_list_freeze (ml); e_mail_reader_set_folder (browser_reader, folder); e_mail_reader_set_message (browser_reader, uid); @@ -1517,7 +1517,7 @@ e_mail_reader_open_selected (EMailReader *reader) e_mail_reader_set_group_by_threads (browser_reader, e_mail_reader_get_group_by_threads (reader)); - message_list_thaw (ml); + e_message_list_thaw (ml); gtk_widget_show (browser); } @@ -1669,12 +1669,12 @@ e_mail_reader_print (EMailReader *reader, { EActivity *activity; GCancellable *cancellable; - MessageList *message_list; + EMessageList *message_list; AsyncContext *async_context; g_return_if_fail (E_IS_MAIL_READER (reader)); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); activity = e_mail_reader_new_activity (reader); cancellable = e_activity_get_cancellable (activity); @@ -2774,7 +2774,7 @@ e_mail_reader_utils_get_selection_or_message (EMailReader *reader, message_list = e_mail_reader_get_message_list (reader); - uid = MESSAGE_LIST (message_list)->cursor_uid; + uid = E_MESSAGE_LIST (message_list)->cursor_uid; g_return_if_fail (uid != NULL); smd = g_slice_new0 (SelectionOrMessageData); @@ -3105,7 +3105,7 @@ e_mail_reader_save_messages (EMailReader *reader) GtkWidget *message_list; message_list = e_mail_reader_get_message_list (reader); - message_list_sort_uids (MESSAGE_LIST (message_list), uids); + e_message_list_sort_uids (E_MESSAGE_LIST (message_list), uids); file_format = E_MAIL_READER_SAVE_TO_FILE_FORMAT_MBOX; } else { GSettings *settings; @@ -3219,14 +3219,14 @@ e_mail_reader_select_next_message (EMailReader *reader, hide_deleted = e_mail_reader_get_hide_deleted (reader); message_list = e_mail_reader_get_message_list (reader); - success = message_list_select ( - MESSAGE_LIST (message_list), - MESSAGE_LIST_SELECT_NEXT, 0, 0); + success = e_message_list_select ( + E_MESSAGE_LIST (message_list), + E_MESSAGE_LIST_SELECT_NEXT, 0, 0); if (!success && (hide_deleted || or_else_previous)) - message_list_select ( - MESSAGE_LIST (message_list), - MESSAGE_LIST_SELECT_PREVIOUS, 0, 0); + e_message_list_select ( + E_MESSAGE_LIST (message_list), + E_MESSAGE_LIST_SELECT_PREVIOUS, 0, 0); } void @@ -3242,14 +3242,14 @@ e_mail_reader_select_previous_message (EMailReader *reader, hide_deleted = e_mail_reader_get_hide_deleted (reader); message_list = e_mail_reader_get_message_list (reader); - success = message_list_select ( - MESSAGE_LIST (message_list), - MESSAGE_LIST_SELECT_PREVIOUS, 0, 0); + success = e_message_list_select ( + E_MESSAGE_LIST (message_list), + E_MESSAGE_LIST_SELECT_PREVIOUS, 0, 0); if (!success && (hide_deleted || or_else_next)) - message_list_select ( - MESSAGE_LIST (message_list), - MESSAGE_LIST_SELECT_NEXT, 0, 0); + e_message_list_select ( + E_MESSAGE_LIST (message_list), + E_MESSAGE_LIST_SELECT_NEXT, 0, 0); } /* Helper for e_mail_reader_create_filter_from_selected() */ @@ -3624,10 +3624,10 @@ e_mail_reader_utils_get_mark_seen_setting (EMailReader *reader, message_list_widget = e_mail_reader_get_message_list (reader); - if (IS_MESSAGE_LIST (message_list_widget)) { - MessageList *message_list; + if (E_IS_MESSAGE_LIST (message_list_widget)) { + EMessageList *message_list; - message_list = MESSAGE_LIST (message_list_widget); + message_list = E_MESSAGE_LIST (message_list_widget); if (message_list->cursor_uid) { CamelMessageInfo *nfo; diff --git a/src/mail/e-mail-reader.c b/src/mail/e-mail-reader.c index 5012520b4a0e304fb9a4da2a8bdb03a333d62623..9247d920d97ca501411189240e2d2ac9a537c40d 100644 --- a/src/mail/e-mail-reader.c +++ b/src/mail/e-mail-reader.c @@ -43,6 +43,7 @@ #include "e-mail-remote-content-popover.h" #include "e-mail-ui-session.h" #include "e-mail-view.h" +#include "e-message-list.h" #include "em-composer-utils.h" #include "em-event.h" #include "em-folder-selector.h" @@ -50,7 +51,6 @@ #include "em-utils.h" #include "mail-autofilter.h" #include "mail-vfolder-ui.h" -#include "message-list.h" #define E_MAIL_READER_GET_PRIVATE(obj) \ ((EMailReaderPrivate *) g_object_get_qdata \ @@ -1184,9 +1184,9 @@ action_mail_mark_unread_cb (EUIAction *action, n_marked = e_mail_reader_mark_selected (reader, mask, set); - if (MESSAGE_LIST (message_list)->seen_id != 0) { - g_source_remove (MESSAGE_LIST (message_list)->seen_id); - MESSAGE_LIST (message_list)->seen_id = 0; + if (E_MESSAGE_LIST (message_list)->seen_id != 0) { + g_source_remove (E_MESSAGE_LIST (message_list)->seen_id); + E_MESSAGE_LIST (message_list)->seen_id = 0; } folder = e_mail_reader_ref_folder (reader); @@ -1292,7 +1292,7 @@ action_mail_message_new_cb (EUIAction *action, message_list = e_mail_reader_get_message_list (reader); if (message_list) - selected_uid = MESSAGE_LIST (message_list)->cursor_uid; + selected_uid = E_MESSAGE_LIST (message_list)->cursor_uid; } shell_backend = E_SHELL_BACKEND (backend); @@ -1449,17 +1449,17 @@ action_mail_next_cb (EUIAction *action, { EMailReader *reader = user_data; GtkWidget *message_list; - MessageListSelectDirection direction; + EMessageListSelectDirection direction; guint32 flags, mask; - direction = MESSAGE_LIST_SELECT_NEXT; + direction = E_MESSAGE_LIST_SELECT_NEXT; flags = 0; mask = 0; message_list = e_mail_reader_get_message_list (reader); - message_list_select ( - MESSAGE_LIST (message_list), direction, flags, mask); + e_message_list_select ( + E_MESSAGE_LIST (message_list), direction, flags, mask); } static void @@ -1469,17 +1469,17 @@ action_mail_next_important_cb (EUIAction *action, { EMailReader *reader = user_data; GtkWidget *message_list; - MessageListSelectDirection direction; + EMessageListSelectDirection direction; guint32 flags, mask; - direction = MESSAGE_LIST_SELECT_NEXT | MESSAGE_LIST_SELECT_WRAP; + direction = E_MESSAGE_LIST_SELECT_NEXT | E_MESSAGE_LIST_SELECT_WRAP; flags = CAMEL_MESSAGE_FLAGGED; mask = CAMEL_MESSAGE_FLAGGED; message_list = e_mail_reader_get_message_list (reader); - message_list_select ( - MESSAGE_LIST (message_list), direction, flags, mask); + e_message_list_select ( + E_MESSAGE_LIST (message_list), direction, flags, mask); } static void @@ -1492,7 +1492,7 @@ action_mail_next_thread_cb (EUIAction *action, message_list = e_mail_reader_get_message_list (reader); - message_list_select_next_thread (MESSAGE_LIST (message_list)); + e_message_list_select_next_thread (E_MESSAGE_LIST (message_list)); } static void @@ -1500,19 +1500,19 @@ mail_reader_select_unread (EMailReader *reader, gboolean move_forward) { GtkWidget *message_list; - MessageListSelectDirection direction; + EMessageListSelectDirection direction; guint32 flags, mask; g_return_if_fail (E_IS_MAIL_READER (reader)); - direction = (move_forward ? MESSAGE_LIST_SELECT_NEXT : MESSAGE_LIST_SELECT_PREVIOUS) | - MESSAGE_LIST_SELECT_WRAP | MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED; + direction = (move_forward ? E_MESSAGE_LIST_SELECT_NEXT : E_MESSAGE_LIST_SELECT_PREVIOUS) | + E_MESSAGE_LIST_SELECT_WRAP | E_MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED; flags = 0; mask = CAMEL_MESSAGE_SEEN; message_list = e_mail_reader_get_message_list (reader); - if (!message_list_select (MESSAGE_LIST (message_list), direction, flags, mask)) { + if (!e_message_list_select (E_MESSAGE_LIST (message_list), direction, flags, mask)) { GtkWindow *window; window = e_mail_reader_get_window (reader); @@ -1541,7 +1541,7 @@ mail_reader_select_unread (EMailReader *reader, selected = em_folder_tree_select_prev_path (folder_tree, TRUE); if (selected) - message_list_set_regen_selects_unread (MESSAGE_LIST (message_list), TRUE); + e_message_list_set_regen_selects_unread (E_MESSAGE_LIST (message_list), TRUE); } g_clear_object (&folder_tree); @@ -1567,17 +1567,17 @@ action_mail_previous_cb (EUIAction *action, { EMailReader *reader = user_data; GtkWidget *message_list; - MessageListSelectDirection direction; + EMessageListSelectDirection direction; guint32 flags, mask; - direction = MESSAGE_LIST_SELECT_PREVIOUS; + direction = E_MESSAGE_LIST_SELECT_PREVIOUS; flags = 0; mask = 0; message_list = e_mail_reader_get_message_list (reader); - message_list_select ( - MESSAGE_LIST (message_list), direction, flags, mask); + e_message_list_select ( + E_MESSAGE_LIST (message_list), direction, flags, mask); } static void @@ -1587,17 +1587,17 @@ action_mail_previous_important_cb (EUIAction *action, { EMailReader *reader = user_data; GtkWidget *message_list; - MessageListSelectDirection direction; + EMessageListSelectDirection direction; guint32 flags, mask; - direction = MESSAGE_LIST_SELECT_PREVIOUS | MESSAGE_LIST_SELECT_WRAP; + direction = E_MESSAGE_LIST_SELECT_PREVIOUS | E_MESSAGE_LIST_SELECT_WRAP; flags = CAMEL_MESSAGE_FLAGGED; mask = CAMEL_MESSAGE_FLAGGED; message_list = e_mail_reader_get_message_list (reader); - message_list_select ( - MESSAGE_LIST (message_list), direction, flags, mask); + e_message_list_select ( + E_MESSAGE_LIST (message_list), direction, flags, mask); } static void @@ -1610,7 +1610,7 @@ action_mail_previous_thread_cb (EUIAction *action, message_list = e_mail_reader_get_message_list (reader); - message_list_select_prev_thread (MESSAGE_LIST (message_list)); + e_message_list_select_prev_thread (E_MESSAGE_LIST (message_list)); } static void @@ -1708,7 +1708,7 @@ action_mail_redirect_cb (EUIAction *action, const gchar *message_uid; message_list = e_mail_reader_get_message_list (reader); - message_uid = MESSAGE_LIST (message_list)->cursor_uid; + message_uid = E_MESSAGE_LIST (message_list)->cursor_uid; g_return_if_fail (message_uid != NULL); /* Open the message asynchronously. */ @@ -1858,7 +1858,7 @@ action_mail_reply_all_cb (EUIAction *action, const gchar *message_uid; message_list = e_mail_reader_get_message_list (reader); - message_uid = MESSAGE_LIST (message_list)->cursor_uid; + message_uid = E_MESSAGE_LIST (message_list)->cursor_uid; g_return_if_fail (message_uid != NULL); activity = e_mail_reader_new_activity (reader); @@ -1961,7 +1961,7 @@ action_mail_reply_alternative_cb (EUIAction *action, const gchar *message_uid; message_list = e_mail_reader_get_message_list (reader); - message_uid = MESSAGE_LIST (message_list)->cursor_uid; + message_uid = E_MESSAGE_LIST (message_list)->cursor_uid; g_return_if_fail (message_uid != NULL); activity = e_mail_reader_new_activity (reader); @@ -2349,7 +2349,7 @@ action_mail_reply_sender_cb (EUIAction *action, const gchar *message_uid; message_list = e_mail_reader_get_message_list (reader); - message_uid = MESSAGE_LIST (message_list)->cursor_uid; + message_uid = E_MESSAGE_LIST (message_list)->cursor_uid; g_return_if_fail (message_uid != NULL); activity = e_mail_reader_new_activity (reader); @@ -2525,7 +2525,7 @@ action_mail_show_source_cb (EUIAction *action, EActivity *activity; GCancellable *cancellable; EMailReaderClosure *closure; - MessageList *ml; + EMessageList *ml; backend = e_mail_reader_get_backend (reader); folder = e_mail_reader_ref_folder (reader); @@ -2547,12 +2547,12 @@ action_mail_show_source_cb (EUIAction *action, } browser = e_mail_browser_new (backend, E_MAIL_FORMATTER_MODE_SOURCE); - ml = MESSAGE_LIST (e_mail_reader_get_message_list (E_MAIL_READER (browser))); + ml = E_MESSAGE_LIST (e_mail_reader_get_message_list (E_MAIL_READER (browser))); - message_list_freeze (ml); + e_message_list_freeze (ml); e_mail_reader_set_folder (E_MAIL_READER (browser), folder); e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); - message_list_thaw (ml); + e_message_list_thaw (ml); display = e_mail_reader_get_mail_display (E_MAIL_READER (browser)); @@ -3687,7 +3687,7 @@ mail_reader_double_click_cb (EMailReader *reader, EUIAction *action; /* Ignore double clicks on columns that handle their own state. */ - if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col)) + if (E_MESSAGE_LIST_COLUMN_IS_ACTIVE (col)) return; action = e_mail_reader_get_action (reader, "mail-message-open"); @@ -3714,16 +3714,16 @@ mail_reader_message_seen_cb (gpointer user_data) parts = e_mail_display_get_part_list (display); message_list = e_mail_reader_get_message_list (reader); - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); /* zero the timeout id now, if it was not rescheduled */ - if (g_source_get_id (g_main_current_source ()) == MESSAGE_LIST (message_list)->seen_id) - MESSAGE_LIST (message_list)->seen_id = 0; + if (g_source_get_id (g_main_current_source ()) == E_MESSAGE_LIST (message_list)->seen_id) + E_MESSAGE_LIST (message_list)->seen_id = 0; if (e_tree_is_dragging (E_TREE (message_list))) return FALSE; - current_uid = MESSAGE_LIST (message_list)->cursor_uid; + current_uid = E_MESSAGE_LIST (message_list)->cursor_uid; uid_is_current &= (g_strcmp0 (current_uid, message_uid) == 0); if (parts != NULL) @@ -3743,13 +3743,13 @@ static void schedule_timeout_mark_seen (EMailReader *reader) { EMailReaderPrivate *priv; - MessageList *message_list; + EMessageList *message_list; g_return_if_fail (E_IS_MAIL_READER (reader)); priv = E_MAIL_READER_GET_PRIVATE (reader); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); g_return_if_fail (message_list != NULL); if (message_list->cursor_uid) { @@ -3764,7 +3764,7 @@ schedule_timeout_mark_seen (EMailReader *reader) timeout_closure->reader = g_object_ref (reader); timeout_closure->message_uid = g_strdup (message_list->cursor_uid); - MESSAGE_LIST (message_list)->seen_id = + E_MESSAGE_LIST (message_list)->seen_id = e_named_timeout_add_full ( G_PRIORITY_DEFAULT, priv->schedule_mark_seen_interval, mail_reader_message_seen_cb, @@ -3853,12 +3853,12 @@ static void maybe_schedule_timeout_mark_seen (EMailReader *reader) { EMailReaderPrivate *priv; - MessageList *message_list; + EMessageList *message_list; gboolean schedule_timeout; gint timeout_interval = -1; const gchar *message_uid; - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); message_uid = message_list->cursor_uid; if (message_uid == NULL || @@ -3883,14 +3883,14 @@ static gboolean discard_timeout_mark_seen_cb (EMailReader *reader) { EMailReaderPrivate *priv; - MessageList *message_list; + EMessageList *message_list; g_return_val_if_fail (reader != NULL, FALSE); priv = E_MAIL_READER_GET_PRIVATE (reader); priv->schedule_mark_seen = FALSE; - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); g_return_val_if_fail (message_list != NULL, FALSE); if (message_list->seen_id > 0) { @@ -4133,13 +4133,13 @@ mail_reader_message_selected_timeout_cb (gpointer user_data) display = e_mail_reader_get_mail_display (reader); parts = e_mail_display_get_part_list (display); - cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + cursor_uid = E_MESSAGE_LIST (message_list)->cursor_uid; if (parts != NULL) format_uid = e_mail_part_list_get_message_uid (parts); else format_uid = NULL; - if (MESSAGE_LIST (message_list)->last_sel_single) { + if (E_MESSAGE_LIST (message_list)->last_sel_single) { GtkWidget *widget; gboolean display_visible; gboolean selected_uid_changed; @@ -4199,7 +4199,7 @@ mail_reader_message_selected_cb (EMailReader *reader, const gchar *message_uid) { EMailReaderPrivate *priv; - MessageList *message_list; + EMessageList *message_list; priv = E_MAIL_READER_GET_PRIVATE (reader); @@ -4219,14 +4219,14 @@ mail_reader_message_selected_cb (EMailReader *reader, priv->did_try_to_open_message = TRUE; } - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); if (message_list) { EMailPartList *parts; const gchar *cursor_uid, *format_uid; parts = e_mail_display_get_part_list (e_mail_reader_get_mail_display (reader)); - cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + cursor_uid = E_MESSAGE_LIST (message_list)->cursor_uid; if (parts != NULL) format_uid = e_mail_part_list_get_message_uid (parts); else @@ -4246,7 +4246,7 @@ mail_reader_message_selected_cb (EMailReader *reader, message_list->seen_id = 0; } - if (message_list_selected_count (message_list) != 1) { + if (e_message_list_selected_count (message_list) != 1) { EMailDisplay *display; display = e_mail_reader_get_mail_display (reader); @@ -4270,7 +4270,7 @@ mail_reader_message_selected_cb (EMailReader *reader, static void mail_reader_message_cursor_change_cb (EMailReader *reader) { - MessageList *message_list; + EMessageList *message_list; EMailReaderPrivate *priv; g_return_if_fail (reader != NULL); @@ -4278,7 +4278,7 @@ mail_reader_message_cursor_change_cb (EMailReader *reader) priv = E_MAIL_READER_GET_PRIVATE (reader); g_return_if_fail (priv != NULL); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); g_return_if_fail (message_list != NULL); if (message_list->seen_id == 0 && @@ -4292,20 +4292,20 @@ static void mail_reader_emit_folder_loaded (EMailReader *reader) { EMailReaderPrivate *priv; - MessageList *message_list; + EMessageList *message_list; priv = E_MAIL_READER_GET_PRIVATE (reader); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); - if (priv && (message_list_count (message_list) <= 0 || - message_list_selected_count (message_list) <= 0)) + if (priv && (e_message_list_count (message_list) <= 0 || + e_message_list_selected_count (message_list) <= 0)) priv->avoid_next_mark_as_seen = FALSE; g_signal_emit (reader, signals[FOLDER_LOADED], 0); } static void -mail_reader_message_list_built_cb (MessageList *message_list, +mail_reader_message_list_built_cb (EMessageList *message_list, EMailReader *reader) { EMailReaderPrivate *priv; @@ -4346,7 +4346,7 @@ mail_reader_get_selected_uids (EMailReader *reader) message_list = e_mail_reader_get_message_list (reader); - return message_list_get_selected (MESSAGE_LIST (message_list)); + return e_message_list_get_selected (E_MESSAGE_LIST (message_list)); } static GPtrArray * @@ -4356,7 +4356,7 @@ mail_reader_get_selected_uids_with_collapsed_threads (EMailReader *reader) message_list = e_mail_reader_get_message_list (reader); - return message_list_get_selected_with_collapsed_threads (MESSAGE_LIST (message_list)); + return e_message_list_get_selected_with_collapsed_threads (E_MESSAGE_LIST (message_list)); } static CamelFolder * @@ -4366,7 +4366,7 @@ mail_reader_ref_folder (EMailReader *reader) message_list = e_mail_reader_get_message_list (reader); - return message_list_ref_folder (MESSAGE_LIST (message_list)); + return e_message_list_ref_folder (E_MESSAGE_LIST (message_list)); } static void @@ -4411,7 +4411,7 @@ mail_reader_set_folder (EMailReader *reader, if (CAMEL_IS_VEE_FOLDER (folder)) mail_sync_folder (folder, FALSE, NULL, NULL); - message_list_set_folder (MESSAGE_LIST (message_list), folder); + e_message_list_set_folder (E_MESSAGE_LIST (message_list), folder); mail_reader_emit_folder_loaded (reader); } @@ -4433,8 +4433,8 @@ mail_reader_set_message (EMailReader *reader, message_list = e_mail_reader_get_message_list (reader); - message_list_select_uid ( - MESSAGE_LIST (message_list), message_uid, FALSE); + e_message_list_select_uid ( + E_MESSAGE_LIST (message_list), message_uid, FALSE); } static void @@ -4563,9 +4563,9 @@ mail_reader_message_loaded (EMailReader *reader, /* Reset the shell view icon. */ e_shell_event (shell, "mail-icon", (gpointer) "evolution-mail"); - if (MESSAGE_LIST (message_list)->seen_id > 0) { - g_source_remove (MESSAGE_LIST (message_list)->seen_id); - MESSAGE_LIST (message_list)->seen_id = 0; + if (E_MESSAGE_LIST (message_list)->seen_id > 0) { + g_source_remove (E_MESSAGE_LIST (message_list)->seen_id); + E_MESSAGE_LIST (message_list)->seen_id = 0; } /* Determine whether to mark the message as read. */ @@ -5207,12 +5207,12 @@ mail_reader_update_actions (EMailReader *reader, mail_display = e_mail_reader_get_mail_display (reader); if (any_messages_selected) { - MessageList *message_list; + EMessageList *message_list; gint row = -1, count = -1; ETreeTableAdapter *etta; ETreePath node = NULL; - message_list = MESSAGE_LIST ( + message_list = E_MESSAGE_LIST ( e_mail_reader_get_message_list (reader)); etta = e_tree_get_table_adapter (E_TREE (message_list)); @@ -5806,15 +5806,15 @@ e_mail_reader_dispose (EMailReader *reader) void e_mail_reader_changed (EMailReader *reader) { - MessageList *message_list; + EMessageList *message_list; g_return_if_fail (E_IS_MAIL_READER (reader)); g_signal_emit (reader, signals[CHANGED], 0); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); - if (!message_list || message_list_selected_count (message_list) != 1) + if (!message_list || e_message_list_selected_count (message_list) != 1) mail_reader_remove_followup_alert (reader); } @@ -6500,14 +6500,14 @@ void e_mail_reader_avoid_next_mark_as_seen (EMailReader *reader) { EMailReaderPrivate *priv; - MessageList *message_list; + EMessageList *message_list; g_return_if_fail (reader != NULL); priv = E_MAIL_READER_GET_PRIVATE (reader); g_return_if_fail (priv != NULL); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); g_return_if_fail (message_list != NULL); priv->avoid_next_mark_as_seen = TRUE; diff --git a/src/mail/e-mail-reader.h b/src/mail/e-mail-reader.h index cd542d0f44a76a595d45bcd41520f1f32187f7d0..57ff110c2c37696489358e1d0217c35e75c0bc18 100644 --- a/src/mail/e-mail-reader.h +++ b/src/mail/e-mail-reader.h @@ -22,7 +22,7 @@ #define E_MAIL_READER_H /* XXX Anjal uses a different message list widget than Evolution, so - * avoid including in this file. This makes + * avoid including in this file. This makes * the get_message_list() method a little awkward since it returns * a GtkWidget pointer which almost always has to be type casted. */ diff --git a/src/mail/message-list.c b/src/mail/e-message-list.c similarity index 90% rename from src/mail/message-list.c rename to src/mail/e-message-list.c index 2bc66964e4951b32636a2b59add100b270998049..d0c339a950467b5cb0384c4004492e2477efae6f 100644 --- a/src/mail/message-list.c +++ b/src/mail/e-message-list.c @@ -57,7 +57,7 @@ #define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0) #endif -#include "message-list.h" +#include "e-message-list.h" #define d(x) #define t(x) @@ -75,7 +75,7 @@ struct _MLSelection { CamelFolder *folder; }; -struct _MessageListPrivate { +struct _EMessageListPrivate { GtkWidget *invisible; /* 4 selection */ EMailSession *session; @@ -148,7 +148,7 @@ struct _RegenData { volatile gint ref_count; EActivity *activity; - MessageList *message_list; + EMessageList *message_list; ETableSortInfo *sort_info; ETableHeader *full_header; @@ -204,11 +204,11 @@ static void message_list_selectable_init static void message_list_tree_model_init (ETreeModelInterface *iface); static gboolean message_list_get_hide_deleted - (MessageList *message_list, + (EMessageList *message_list, CamelFolder *folder); -G_DEFINE_TYPE_WITH_CODE (MessageList, message_list, E_TYPE_TREE, - G_ADD_PRIVATE (MessageList) +G_DEFINE_TYPE_WITH_CODE (EMessageList, e_message_list, E_TYPE_TREE, + G_ADD_PRIVATE (EMessageList) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) G_IMPLEMENT_INTERFACE (E_TYPE_SELECTABLE, message_list_selectable_init) G_IMPLEMENT_INTERFACE (E_TYPE_TREE_MODEL, message_list_tree_model_init)) @@ -278,22 +278,22 @@ static void on_cursor_activated_cmd (ETree *tree, GNode *node, gpointer user_data); static void on_selection_changed_cmd (ETree *tree, - MessageList *message_list); + EMessageList *message_list); static gint on_click (ETree *tree, gint row, GNode *node, gint col, GdkEvent *event, - MessageList *message_list); + EMessageList *message_list); -static void mail_regen_list (MessageList *message_list, +static void mail_regen_list (EMessageList *message_list, const gchar *search, CamelFolderChangeInfo *folder_changes); -static void mail_regen_cancel (MessageList *message_list); +static void mail_regen_cancel (EMessageList *message_list); static void clear_info (gchar *key, GNode *node, - MessageList *message_list); + EMessageList *message_list); enum { MESSAGE_SELECTED, @@ -466,7 +466,7 @@ extended_g_node_insert (GNode *parent, } static RegenData * -regen_data_new (MessageList *message_list, +regen_data_new (EMessageList *message_list, GCancellable *cancellable) { RegenData *regen_data; @@ -484,7 +484,7 @@ regen_data_new (MessageList *message_list, regen_data->ref_count = 1; regen_data->activity = g_object_ref (activity); regen_data->message_list = g_object_ref (message_list); - regen_data->folder = message_list_ref_folder (message_list); + regen_data->folder = e_message_list_ref_folder (message_list); regen_data->last_row = -1; if (adapter) { @@ -502,7 +502,7 @@ regen_data_new (MessageList *message_list, g_mutex_init (®en_data->select_lock); - session = message_list_get_session (message_list); + session = e_message_list_get_session (message_list); e_mail_ui_session_add_activity (E_MAIL_UI_SESSION (session), activity); g_object_unref (activity); @@ -566,7 +566,7 @@ regen_data_unref (RegenData *regen_data) } static RegenData * -message_list_ref_regen_data (MessageList *message_list) +message_list_ref_regen_data (EMessageList *message_list) { RegenData *regen_data = NULL; @@ -581,7 +581,7 @@ message_list_ref_regen_data (MessageList *message_list) } static void -message_list_tree_model_freeze (MessageList *message_list) +message_list_tree_model_freeze (EMessageList *message_list) { if (message_list->priv->tree_model_frozen == 0) e_tree_model_pre_change (E_TREE_MODEL (message_list)); @@ -590,7 +590,7 @@ message_list_tree_model_freeze (MessageList *message_list) } static void -message_list_tree_model_thaw (MessageList *message_list) +message_list_tree_model_thaw (EMessageList *message_list) { if (message_list->priv->tree_model_frozen > 0) message_list->priv->tree_model_frozen--; @@ -602,7 +602,7 @@ message_list_tree_model_thaw (MessageList *message_list) } static GNode * -message_list_tree_model_insert (MessageList *message_list, +message_list_tree_model_insert (EMessageList *message_list, GNode *parent, gint position, gpointer data) @@ -637,7 +637,7 @@ message_list_tree_model_insert (MessageList *message_list, } static void -message_list_tree_model_remove (MessageList *message_list, +message_list_tree_model_remove (EMessageList *message_list, GNode *node) { ETreeModel *tree_model; @@ -721,7 +721,7 @@ filter_size (gint size) /* Gets the uid of the message displayed at a given view row */ static const gchar * -get_message_uid (MessageList *message_list, +get_message_uid (EMessageList *message_list, GNode *node) { g_return_val_if_fail (node != NULL, NULL); @@ -734,7 +734,7 @@ get_message_uid (MessageList *message_list, * view row. */ static CamelMessageInfo * -get_message_info (MessageList *message_list, +get_message_info (EMessageList *message_list, GNode *node) { g_return_val_if_fail (node != NULL, NULL); @@ -744,7 +744,7 @@ get_message_info (MessageList *message_list, } static const gchar * -get_normalised_string (MessageList *message_list, +get_normalised_string (EMessageList *message_list, CamelMessageInfo *info, gint col) { @@ -824,7 +824,7 @@ get_normalised_string (MessageList *message_list, } static void -clear_selection (MessageList *message_list, +clear_selection (EMessageList *message_list, struct _MLSelection *selection) { g_clear_pointer (&selection->uids, g_ptr_array_unref); @@ -929,7 +929,7 @@ ml_get_last_tree_node (GNode *node, } static GNode * -ml_search_forward (MessageList *message_list, +ml_search_forward (EMessageList *message_list, gint start, gint end, guint32 flags, @@ -968,7 +968,7 @@ ml_search_forward (MessageList *message_list, } static GNode * -ml_search_backward (MessageList *message_list, +ml_search_backward (EMessageList *message_list, gint start, gint end, guint32 flags, @@ -1022,8 +1022,8 @@ ml_search_backward (MessageList *message_list, } static GNode * -ml_search_path (MessageList *message_list, - MessageListSelectDirection direction, +ml_search_path (EMessageList *message_list, + EMessageListSelectDirection direction, guint32 flags, guint32 mask) { @@ -1049,17 +1049,17 @@ ml_search_path (MessageList *message_list, if (row == -1) return NULL; - include_collapsed = (direction & MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED) != 0; + include_collapsed = (direction & E_MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED) != 0; - if ((direction & MESSAGE_LIST_SELECT_DIRECTION) == MESSAGE_LIST_SELECT_NEXT) + if ((direction & E_MESSAGE_LIST_SELECT_DIRECTION) == E_MESSAGE_LIST_SELECT_NEXT) node = ml_search_forward ( message_list, row, row_count - 1, flags, mask, include_collapsed, TRUE); else node = ml_search_backward ( message_list, row, 0, flags, mask, include_collapsed, TRUE); - if (node == NULL && (direction & MESSAGE_LIST_SELECT_WRAP)) { - if ((direction & MESSAGE_LIST_SELECT_DIRECTION) == MESSAGE_LIST_SELECT_NEXT) + if (node == NULL && (direction & E_MESSAGE_LIST_SELECT_WRAP)) { + if ((direction & E_MESSAGE_LIST_SELECT_DIRECTION) == E_MESSAGE_LIST_SELECT_NEXT) node = ml_search_forward ( message_list, 0, row, flags, mask, include_collapsed, FALSE); else @@ -1071,7 +1071,7 @@ ml_search_path (MessageList *message_list, } static void -select_node (MessageList *message_list, +select_node (EMessageList *message_list, GNode *node) { ETree *tree; @@ -1092,16 +1092,16 @@ select_node (MessageList *message_list, /** * message_list_select: - * @message_list: a MessageList + * @message_list: a EMessageList * @direction: the direction to search in * @flags: a set of flag values * @mask: a mask for comparing against @flags * * This moves the message list selection to a suitable row. @flags and * @mask combine to specify what constitutes a suitable row. @direction is - * %MESSAGE_LIST_SELECT_NEXT if it should find the next matching - * message, or %MESSAGE_LIST_SELECT_PREVIOUS if it should find the - * previous. %MESSAGE_LIST_SELECT_WRAP is an option bit which specifies the + * %E_MESSAGE_LIST_SELECT_NEXT if it should find the next matching + * message, or %E_MESSAGE_LIST_SELECT_PREVIOUS if it should find the + * previous. %E_MESSAGE_LIST_SELECT_WRAP is an option bit which specifies the * search should wrap. * * If no suitable row is found, the selection will be @@ -1110,14 +1110,14 @@ select_node (MessageList *message_list, * Returns %TRUE if a new message has been selected or %FALSE otherwise. **/ gboolean -message_list_select (MessageList *message_list, - MessageListSelectDirection direction, +e_message_list_select (EMessageList *message_list, + EMessageListSelectDirection direction, guint32 flags, guint32 mask) { GNode *node; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); node = ml_search_path (message_list, direction, flags, mask); if (node != NULL) { @@ -1145,12 +1145,12 @@ message_list_select (MessageList *message_list, * Return value: **/ gboolean -message_list_can_select (MessageList *message_list, - MessageListSelectDirection direction, +e_message_list_can_select (EMessageList *message_list, + EMessageListSelectDirection direction, guint32 flags, guint32 mask) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return ml_search_path (message_list, direction, flags, mask) != NULL; } @@ -1163,16 +1163,16 @@ message_list_can_select (MessageList *message_list, * Selects the message with the given UID. **/ void -message_list_select_uid (MessageList *message_list, +e_message_list_select_uid (EMessageList *message_list, const gchar *uid, gboolean with_fallback) { - MessageListPrivate *priv; + EMessageListPrivate *priv; GHashTable *uid_nodemap; GNode *node = NULL; RegenData *regen_data = NULL; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); priv = message_list->priv; uid_nodemap = message_list->uid_nodemap; @@ -1244,7 +1244,7 @@ message_list_select_uid (MessageList *message_list, } void -message_list_select_next_thread (MessageList *message_list) +e_message_list_select_next_thread (EMessageList *message_list) { ETreeTableAdapter *adapter; GNode *node; @@ -1252,7 +1252,7 @@ message_list_select_next_thread (MessageList *message_list) gint row; gint ii; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (message_list->cursor_uid == NULL) return; @@ -1281,7 +1281,7 @@ message_list_select_next_thread (MessageList *message_list) } void -message_list_select_prev_thread (MessageList *message_list) +e_message_list_select_prev_thread (EMessageList *message_list) { ETreeTableAdapter *adapter; GNode *node; @@ -1289,7 +1289,7 @@ message_list_select_prev_thread (MessageList *message_list) gint row; gint ii; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (message_list->cursor_uid == NULL) return; @@ -1325,17 +1325,17 @@ message_list_select_prev_thread (MessageList *message_list) } /** - * message_list_select_all: + * e_message_list_select_all: * @message_list: Message List widget * * Selects all messages in the message list. **/ void -message_list_select_all (MessageList *message_list) +e_message_list_select_all (EMessageList *message_list) { RegenData *regen_data = NULL; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); regen_data = message_list_ref_regen_data (message_list); @@ -1355,7 +1355,7 @@ message_list_select_all (MessageList *message_list) } typedef struct thread_select_info { - MessageList *message_list; + EMessageList *message_list; GPtrArray *paths; } thread_select_info_t; @@ -1372,7 +1372,7 @@ select_thread_node (ETreeModel *model, } static void -select_thread (MessageList *message_list, +select_thread (EMessageList *message_list, ETreeForeachFunc selector) { ETree *tree; @@ -1421,9 +1421,9 @@ thread_select_foreach (ETreePath path, * Selects all messages in the current thread (based on cursor). **/ void -message_list_select_thread (MessageList *message_list) +e_message_list_select_thread (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); select_thread (message_list, thread_select_foreach); } @@ -1449,34 +1449,34 @@ subthread_select_foreach (ETreePath path, * Selects all messages in the current subthread (based on cursor). **/ void -message_list_select_subthread (MessageList *message_list) +e_message_list_select_subthread (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); select_thread (message_list, subthread_select_foreach); } void -message_list_copy (MessageList *message_list, +e_message_list_copy (EMessageList *message_list, gboolean cut) { - MessageListPrivate *priv; + EMessageListPrivate *priv; GPtrArray *uids; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); priv = message_list->priv; clear_selection (message_list, &priv->clipboard); - uids = message_list_get_selected_with_collapsed_threads (message_list); + uids = e_message_list_get_selected_with_collapsed_threads (message_list); if (uids->len > 0) { if (cut) { CamelFolder *folder; gint i; - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); camel_folder_freeze (folder); @@ -1494,7 +1494,7 @@ message_list_copy (MessageList *message_list, } priv->clipboard.uids = g_ptr_array_ref (uids); - priv->clipboard.folder = message_list_ref_folder (message_list); + priv->clipboard.folder = e_message_list_ref_folder (message_list); gtk_selection_owner_set ( priv->invisible, @@ -1510,9 +1510,9 @@ message_list_copy (MessageList *message_list, } void -message_list_paste (MessageList *message_list) +e_message_list_paste (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); gtk_selection_convert ( message_list->priv->invisible, @@ -1522,7 +1522,7 @@ message_list_paste (MessageList *message_list) } static void -for_node_and_subtree_if_collapsed (MessageList *message_list, +for_node_and_subtree_if_collapsed (EMessageList *message_list, GNode *node, CamelMessageInfo *mi, ETreePathFunc func, @@ -1731,7 +1731,7 @@ add_all_labels_foreach (ETreeModel *etm, static const gchar * get_trimmed_subject (CamelMessageInfo *info, - MessageList *message_list) + EMessageList *message_list) { const gchar *subject; const gchar *mlist; @@ -1799,13 +1799,13 @@ ml_tree_value_at_ex (ETreeModel *etm, GNode *node, gint col, CamelMessageInfo *msg_info, - MessageList *message_list) + EMessageList *message_list) { EMailSession *session; const gchar *str; guint32 flags; - session = message_list_get_session (message_list); + session = e_message_list_get_session (message_list); g_return_val_if_fail (msg_info != NULL, NULL); @@ -2472,15 +2472,15 @@ message_list_create_extras (GSettings *mail_settings) } static gboolean -message_list_is_searching (MessageList *message_list) +message_list_is_searching (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->search && *message_list->search; } static void -save_tree_state (MessageList *message_list, +save_tree_state (EMessageList *message_list, CamelFolder *folder) { ETreeTableAdapter *adapter; @@ -2502,7 +2502,7 @@ save_tree_state (MessageList *message_list, } static void -load_tree_state (MessageList *message_list, +load_tree_state (EMessageList *message_list, CamelFolder *folder, xmlDoc *expand_state) { @@ -2529,13 +2529,13 @@ load_tree_state (MessageList *message_list, } void -message_list_save_state (MessageList *message_list) +e_message_list_save_state (EMessageList *message_list) { CamelFolder *folder; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); if (folder != NULL) { save_tree_state (message_list, folder); @@ -2544,14 +2544,14 @@ message_list_save_state (MessageList *message_list) } static void -message_list_setup_etree (MessageList *message_list) +message_list_setup_etree (EMessageList *message_list) { CamelFolder *folder; /* Build the spec based on the folder, and possibly * from a saved file. Otherwise, leave default. */ - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); if (folder != NULL) { gint data = 1; @@ -2576,7 +2576,7 @@ ml_selection_get (GtkWidget *widget, GtkSelectionData *data, guint info, guint time_stamp, - MessageList *message_list) + EMessageList *message_list) { struct _MLSelection *selection; @@ -2599,9 +2599,9 @@ ml_selection_get (GtkWidget *widget, static gboolean ml_selection_clear_event (GtkWidget *widget, GdkEventSelection *event, - MessageList *message_list) + EMessageList *message_list) { - MessageListPrivate *p = message_list->priv; + EMessageListPrivate *p = message_list->priv; clear_selection (message_list, &p->clipboard); @@ -2612,7 +2612,7 @@ static void ml_selection_received (GtkWidget *widget, GtkSelectionData *selection_data, guint time, - MessageList *message_list) + EMessageList *message_list) { EMailSession *session; CamelFolder *folder; @@ -2625,8 +2625,8 @@ ml_selection_received (GtkWidget *widget, return; } - folder = message_list_ref_folder (message_list); - session = message_list_get_session (message_list); + folder = e_message_list_ref_folder (message_list); + session = e_message_list_get_session (message_list); /* FIXME Not passing a GCancellable or GError here. */ em_utils_selection_get_uidlist ( @@ -2644,13 +2644,13 @@ ml_tree_drag_data_get (ETree *tree, GtkSelectionData *data, guint info, guint time, - MessageList *message_list) + EMessageList *message_list) { CamelFolder *folder; GPtrArray *uids; - folder = message_list_ref_folder (message_list); - uids = message_list_get_selected_with_collapsed_threads (message_list); + folder = e_message_list_ref_folder (message_list); + uids = e_message_list_get_selected_with_collapsed_threads (message_list); if (uids->len > 0) { switch (info) { @@ -2678,7 +2678,7 @@ struct _drop_msg { GtkSelectionData *selection; CamelFolder *folder; - MessageList *message_list; + EMessageList *message_list; guint32 action; guint info; @@ -2708,7 +2708,7 @@ ml_drop_async_exec (struct _drop_msg *m, { EMailSession *session; - session = message_list_get_session (m->message_list); + session = e_message_list_get_session (m->message_list); switch (m->info) { case DND_X_UID_LIST: @@ -2778,7 +2778,7 @@ ml_tree_drag_data_received (ETree *tree, GtkSelectionData *selection_data, guint info, guint time, - MessageList *message_list) + EMessageList *message_list) { CamelFolder *folder; struct _drop_msg *m; @@ -2789,7 +2789,7 @@ ml_tree_drag_data_received (ETree *tree, if (gtk_selection_data_get_length (selection_data) == -1) return; - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); if (folder == NULL) return; @@ -2842,7 +2842,7 @@ ml_tree_drag_motion (ETree *tree, gint x, gint y, guint time, - MessageList *message_list) + EMessageList *message_list) { GList *targets; GdkDragAction action, actions = 0; @@ -2924,7 +2924,7 @@ static gboolean message_list_update_actions_idle_cb (gpointer user_data) { GWeakRef *weak_ref = user_data; - MessageList *message_list; + EMessageList *message_list; g_return_val_if_fail (weak_ref != NULL, FALSE); @@ -2942,9 +2942,9 @@ message_list_update_actions_idle_cb (gpointer user_data) } static void -message_list_schedule_update_actions (MessageList *message_list) +message_list_schedule_update_actions (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (!message_list->priv->update_actions_idle_id) { message_list->priv->update_actions_idle_id = @@ -2956,7 +2956,7 @@ message_list_schedule_update_actions (MessageList *message_list) static void on_model_row_changed (ETableModel *model, gint row, - MessageList *message_list) + EMessageList *message_list) { message_list->priv->any_row_changed = TRUE; @@ -2966,13 +2966,13 @@ on_model_row_changed (ETableModel *model, static gboolean ml_tree_sorting_changed (ETreeTableAdapter *adapter, - MessageList *message_list) + EMessageList *message_list) { gboolean group_by_threads; g_return_val_if_fail (message_list != NULL, FALSE); - group_by_threads = message_list_get_group_by_threads (message_list); + group_by_threads = e_message_list_get_group_by_threads (message_list); if (group_by_threads && message_list->frozen == 0) { @@ -2991,12 +2991,12 @@ ml_get_new_mail_bg_color (ETableItem *item, gint row, gint col, GdkRGBA *inout_background, - MessageList *message_list) + EMessageList *message_list) { CamelMessageInfo *msg_info; ETreePath path; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); g_return_val_if_fail (inout_background != NULL, FALSE); if (!message_list->priv->new_mail_bg_color || row < 0) @@ -3023,11 +3023,11 @@ ml_get_bg_color_cb (ETableItem *item, gint row, gint col, GdkRGBA *inout_background, - MessageList *message_list) + EMessageList *message_list) { gboolean was_set = FALSE; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); g_return_val_if_fail (inout_background != NULL, FALSE); if (row < 0) @@ -3055,11 +3055,11 @@ ml_get_bg_color_cb (ETableItem *item, } static void -ml_style_updated_cb (MessageList *message_list) +ml_style_updated_cb (EMessageList *message_list) { GdkRGBA *new_mail_fg_color = NULL; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_clear_pointer (&message_list->priv->new_mail_bg_color, gdk_rgba_free); g_clear_pointer (&message_list->priv->new_mail_fg_color, g_free); @@ -3082,7 +3082,7 @@ message_list_get_preferred_width (GtkWidget *widget, gint *out_natural_width) { /* Chain up to parent's method. */ - GTK_WIDGET_CLASS (message_list_parent_class)->get_preferred_width (widget, out_minimum_width, out_natural_width); + GTK_WIDGET_CLASS (e_message_list_parent_class)->get_preferred_width (widget, out_minimum_width, out_natural_width); if (out_minimum_width && *out_minimum_width < 50) *out_minimum_width = 50; @@ -3097,10 +3097,10 @@ message_list_localized_re_changed_cb (GSettings *settings, const gchar *key, gpointer user_data) { - MessageList *message_list = user_data; + EMessageList *message_list = user_data; gchar *prefixes; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_mutex_lock (&message_list->priv->re_prefixes_lock); @@ -3117,9 +3117,9 @@ message_list_localized_re_separators_changed_cb (GSettings *settings, const gchar *key, gpointer user_data) { - MessageList *message_list = user_data; + EMessageList *message_list = user_data; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_mutex_lock (&message_list->priv->re_prefixes_lock); @@ -3139,13 +3139,13 @@ message_list_user_headers_changed_cb (GSettings *settings, const gchar *key, gpointer user_data) { - /* Do it this way, to reuse the localized strings from the message-list.etspec */ + /* Do it this way, to reuse the localized strings from the e-message-list.etspec */ const gchar *default_titles[] = { N_("User Header 1"), N_("User Header 2"), N_("User Header 3") }; - MessageList *message_list = user_data; + EMessageList *message_list = user_data; ETableSpecification *spec; GnomeCanvasItem *header_item; ETableHeader *header; @@ -3153,7 +3153,7 @@ message_list_user_headers_changed_cb (GSettings *settings, gboolean changed = FALSE; guint ii, jj; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); #ifdef ENABLE_MAINTAINER_MODE g_warn_if_fail (G_N_ELEMENTS (default_titles) == CAMEL_UTILS_MAX_USER_HEADERS); #endif @@ -3250,7 +3250,7 @@ message_list_header_click_can_sort_cb (ETree *tree, gboolean *out_header_click_can_sort, gpointer user_data) { - MessageList *message_list = MESSAGE_LIST (tree); + EMessageList *message_list = E_MESSAGE_LIST (tree); EAutomaticActionPolicy policy; policy = g_settings_get_enum (message_list->priv->mail_settings, "message-list-sort-on-header-click"); @@ -3289,7 +3289,7 @@ message_list_header_click_can_sort_cb (ETree *tree, } static void -message_list_set_session (MessageList *message_list, +message_list_set_session (EMessageList *message_list, EMailSession *session) { g_return_if_fail (E_IS_MAIL_SESSION (session)); @@ -3306,56 +3306,56 @@ message_list_set_property (GObject *object, { switch (property_id) { case PROP_FOLDER: - message_list_set_folder ( - MESSAGE_LIST (object), + e_message_list_set_folder ( + E_MESSAGE_LIST (object), g_value_get_object (value)); return; case PROP_GROUP_BY_THREADS: - message_list_set_group_by_threads ( - MESSAGE_LIST (object), + e_message_list_set_group_by_threads ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; case PROP_SESSION: message_list_set_session ( - MESSAGE_LIST (object), + E_MESSAGE_LIST (object), g_value_get_object (value)); return; case PROP_SHOW_DELETED: - message_list_set_show_deleted ( - MESSAGE_LIST (object), + e_message_list_set_show_deleted ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; case PROP_SHOW_JUNK: - message_list_set_show_junk ( - MESSAGE_LIST (object), + e_message_list_set_show_junk ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; case PROP_THREAD_LATEST: - message_list_set_thread_latest ( - MESSAGE_LIST (object), + e_message_list_set_thread_latest ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; case PROP_THREAD_SUBJECT: - message_list_set_thread_subject ( - MESSAGE_LIST (object), + e_message_list_set_thread_subject ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; case PROP_THREAD_COMPRESS: - message_list_set_thread_compress ( - MESSAGE_LIST (object), + e_message_list_set_thread_compress ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; case PROP_THREAD_FLAT: - message_list_set_thread_flat ( - MESSAGE_LIST (object), + e_message_list_set_thread_flat ( + E_MESSAGE_LIST (object), g_value_get_boolean (value)); return; } @@ -3373,78 +3373,78 @@ message_list_get_property (GObject *object, case PROP_COPY_TARGET_LIST: g_value_set_boxed ( value, - message_list_get_copy_target_list ( - MESSAGE_LIST (object))); + e_message_list_get_copy_target_list ( + E_MESSAGE_LIST (object))); return; case PROP_FOLDER: g_value_take_object ( value, - message_list_ref_folder ( - MESSAGE_LIST (object))); + e_message_list_ref_folder ( + E_MESSAGE_LIST (object))); return; case PROP_GROUP_BY_THREADS: g_value_set_boolean ( value, - message_list_get_group_by_threads ( - MESSAGE_LIST (object))); + e_message_list_get_group_by_threads ( + E_MESSAGE_LIST (object))); return; case PROP_PASTE_TARGET_LIST: g_value_set_boxed ( value, - message_list_get_paste_target_list ( - MESSAGE_LIST (object))); + e_message_list_get_paste_target_list ( + E_MESSAGE_LIST (object))); return; case PROP_SESSION: g_value_set_object ( value, - message_list_get_session ( - MESSAGE_LIST (object))); + e_message_list_get_session ( + E_MESSAGE_LIST (object))); return; case PROP_SHOW_DELETED: g_value_set_boolean ( value, - message_list_get_show_deleted ( - MESSAGE_LIST (object))); + e_message_list_get_show_deleted ( + E_MESSAGE_LIST (object))); return; case PROP_SHOW_JUNK: g_value_set_boolean ( value, - message_list_get_show_junk ( - MESSAGE_LIST (object))); + e_message_list_get_show_junk ( + E_MESSAGE_LIST (object))); return; case PROP_THREAD_LATEST: g_value_set_boolean ( value, - message_list_get_thread_latest ( - MESSAGE_LIST (object))); + e_message_list_get_thread_latest ( + E_MESSAGE_LIST (object))); return; case PROP_THREAD_SUBJECT: g_value_set_boolean ( value, - message_list_get_thread_subject ( - MESSAGE_LIST (object))); + e_message_list_get_thread_subject ( + E_MESSAGE_LIST (object))); return; case PROP_THREAD_COMPRESS: g_value_set_boolean ( value, - message_list_get_thread_compress ( - MESSAGE_LIST (object))); + e_message_list_get_thread_compress ( + E_MESSAGE_LIST (object))); return; case PROP_THREAD_FLAT: g_value_set_boolean ( value, - message_list_get_thread_flat ( - MESSAGE_LIST (object))); + e_message_list_get_thread_flat ( + E_MESSAGE_LIST (object))); return; } @@ -3454,8 +3454,8 @@ message_list_get_property (GObject *object, static void message_list_dispose (GObject *object) { - MessageList *message_list = MESSAGE_LIST (object); - MessageListPrivate *priv; + EMessageList *message_list = E_MESSAGE_LIST (object); + EMessageListPrivate *priv; priv = message_list->priv; @@ -3526,13 +3526,13 @@ message_list_dispose (GObject *object) } /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (message_list_parent_class)->dispose (object); + G_OBJECT_CLASS (e_message_list_parent_class)->dispose (object); } static void message_list_finalize (GObject *object) { - MessageList *message_list = MESSAGE_LIST (object); + EMessageList *message_list = E_MESSAGE_LIST (object); guint ii; g_hash_table_destroy (message_list->normalised_hash); @@ -3560,14 +3560,14 @@ message_list_finalize (GObject *object) } /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (message_list_parent_class)->finalize (object); + G_OBJECT_CLASS (e_message_list_parent_class)->finalize (object); } static void message_list_constructed (GObject *object) { /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (message_list_parent_class)->constructed (object); + G_OBJECT_CLASS (e_message_list_parent_class)->constructed (object); e_extensible_load_extensions (E_EXTENSIBLE (object)); } @@ -3593,13 +3593,13 @@ message_list_selectable_update_actions (ESelectable *selectable, static void message_list_selectable_select_all (ESelectable *selectable) { - message_list_select_all (MESSAGE_LIST (selectable)); + e_message_list_select_all (E_MESSAGE_LIST (selectable)); } static ETreePath message_list_get_root (ETreeModel *tree_model) { - MessageList *message_list = MESSAGE_LIST (tree_model); + EMessageList *message_list = E_MESSAGE_LIST (tree_model); return message_list->priv->tree_model_root; } @@ -3666,11 +3666,11 @@ static guint message_list_depth (ETreeModel *tree_model, ETreePath path) { - MessageList *message_list = MESSAGE_LIST (tree_model); + EMessageList *message_list = E_MESSAGE_LIST (tree_model); guint depth; - if (message_list_get_thread_compress (message_list) && - !message_list_get_thread_flat (message_list)) { + if (e_message_list_get_thread_compress (message_list) && + !e_message_list_get_thread_flat (message_list)) { GNode *node = ((GNode *) path); depth = 1; @@ -3692,7 +3692,7 @@ message_list_depth (ETreeModel *tree_model, static gboolean message_list_get_expanded_default (ETreeModel *tree_model) { - MessageList *message_list = MESSAGE_LIST (tree_model); + EMessageList *message_list = E_MESSAGE_LIST (tree_model); return message_list->priv->expanded_default; } @@ -3725,9 +3725,9 @@ static ETreePath message_list_get_node_by_id (ETreeModel *tree_model, const gchar *save_id) { - MessageList *message_list; + EMessageList *message_list; - message_list = MESSAGE_LIST (tree_model); + message_list = E_MESSAGE_LIST (tree_model); if (!strcmp (save_id, "root")) return e_tree_model_get_root (tree_model); @@ -3740,12 +3740,12 @@ message_list_sort_value_at (ETreeModel *tree_model, ETreePath path, gint col) { - MessageList *message_list; + EMessageList *message_list; GNode *path_node; struct LatestData ld; gint64 *res; - message_list = MESSAGE_LIST (tree_model); + message_list = E_MESSAGE_LIST (tree_model); if (!(col == COL_SENT || col == COL_RECEIVED)) return e_tree_model_value_at (tree_model, path, col); @@ -3776,11 +3776,11 @@ message_list_value_at (ETreeModel *tree_model, ETreePath path, gint col) { - MessageList *message_list; + EMessageList *message_list; CamelMessageInfo *msg_info; gpointer result; - message_list = MESSAGE_LIST (tree_model); + message_list = E_MESSAGE_LIST (tree_model); if (!path || G_NODE_IS_ROOT ((GNode *) path)) return NULL; @@ -4077,7 +4077,7 @@ message_list_value_to_string (ETreeModel *tree_model, } static void -message_list_class_init (MessageListClass *class) +e_message_list_class_init (EMessageListClass *class) { GObjectClass *object_class; GtkWidgetClass *widget_class; @@ -4101,7 +4101,7 @@ message_list_class_init (MessageListClass *class) widget_class = GTK_WIDGET_CLASS (class); widget_class->get_preferred_width = message_list_get_preferred_width; - gtk_widget_class_set_css_name (widget_class, "MessageList"); + gtk_widget_class_set_css_name (widget_class, "EMessageList"); object_class = G_OBJECT_CLASS (class); object_class->set_property = message_list_set_property; @@ -4251,9 +4251,9 @@ message_list_class_init (MessageListClass *class) signals[MESSAGE_SELECTED] = g_signal_new ( "message_selected", - MESSAGE_LIST_TYPE, + E_TYPE_MESSAGE_LIST, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (MessageListClass, message_selected), + G_STRUCT_OFFSET (EMessageListClass, message_selected), NULL, NULL, g_cclosure_marshal_VOID__STRING, @@ -4262,9 +4262,9 @@ message_list_class_init (MessageListClass *class) signals[MESSAGE_LIST_BUILT] = g_signal_new ( "message_list_built", - MESSAGE_LIST_TYPE, + E_TYPE_MESSAGE_LIST, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (MessageListClass, message_list_built), + G_STRUCT_OFFSET (EMessageListClass, message_list_built), NULL, NULL, g_cclosure_marshal_VOID__VOID, @@ -4272,9 +4272,9 @@ message_list_class_init (MessageListClass *class) signals[UPDATE_ACTIONS] = g_signal_new ( "update-actions", - MESSAGE_LIST_TYPE, + E_TYPE_MESSAGE_LIST, G_SIGNAL_RUN_LAST, - 0, /* G_STRUCT_OFFSET (MessageListClass, update_actions), */ + 0, /* G_STRUCT_OFFSET (EMessageListClass, update_actions), */ NULL, NULL, g_cclosure_marshal_VOID__VOID, @@ -4314,13 +4314,13 @@ message_list_tree_model_init (ETreeModelInterface *iface) } static void -message_list_init (MessageList *message_list) +e_message_list_init (EMessageList *message_list) { - MessageListPrivate *p; + EMessageListPrivate *p; GtkTargetList *target_list; GdkAtom matom; - message_list->priv = message_list_get_instance_private (message_list); + message_list->priv = e_message_list_get_instance_private (message_list); message_list->normalised_hash = g_hash_table_new_full ( g_str_hash, g_str_equal, @@ -4389,7 +4389,7 @@ message_list_init (MessageList *message_list) } static void -message_list_construct (MessageList *message_list) +message_list_construct (EMessageList *message_list) { ETreeTableAdapter *adapter; ETableSpecification *specification; @@ -4405,7 +4405,7 @@ message_list_construct (MessageList *message_list) message_list->extras = message_list_create_extras (message_list->priv->mail_settings); etspecfile = g_build_filename ( - EVOLUTION_ETSPECDIR, "message-list.etspec", NULL); + EVOLUTION_ETSPECDIR, "e-message-list.etspec", NULL); specification = e_table_specification_new (etspecfile, &local_error); /* Failure here is fatal. */ @@ -4498,25 +4498,25 @@ message_list_construct (MessageList *message_list) * Returns a new message-list widget. **/ GtkWidget * -message_list_new (EMailSession *session) +e_message_list_new (EMailSession *session) { GtkWidget *message_list; g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL); message_list = g_object_new ( - message_list_get_type (), + E_TYPE_MESSAGE_LIST, "session", session, NULL); - message_list_construct (MESSAGE_LIST (message_list)); + message_list_construct (E_MESSAGE_LIST (message_list)); return message_list; } EMailSession * -message_list_get_session (MessageList *message_list) +e_message_list_get_session (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), NULL); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), NULL); return message_list->priv->session; } @@ -4524,13 +4524,13 @@ message_list_get_session (MessageList *message_list) static void clear_info (gchar *key, GNode *node, - MessageList *message_list) + EMessageList *message_list) { g_clear_object (&node->data); } static void -clear_tree (MessageList *message_list, +clear_tree (EMessageList *message_list, gboolean tfree) { ETreeModel *tree_model; @@ -4547,7 +4547,7 @@ clear_tree (MessageList *message_list, tree_model = E_TREE_MODEL (message_list); /* we also reset the uid_rowmap since it is no longer useful/valid anyway */ - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); if (folder != NULL) g_hash_table_foreach ( message_list->uid_nodemap, @@ -4646,7 +4646,7 @@ folder_store_supports_vjunk_folder (CamelFolder *folder) } static gboolean -message_list_get_hide_junk (MessageList *message_list, +message_list_get_hide_junk (EMessageList *message_list, CamelFolder *folder) { guint32 folder_flags; @@ -4654,7 +4654,7 @@ message_list_get_hide_junk (MessageList *message_list, if (folder == NULL) return FALSE; - if (message_list_get_show_junk (message_list)) + if (e_message_list_get_show_junk (message_list)) return FALSE; if (!folder_store_supports_vjunk_folder (folder)) @@ -4678,8 +4678,8 @@ message_list_get_hide_junk (MessageList *message_list, } static gboolean -message_list_get_hide_deleted (MessageList *message_list, - CamelFolder *folder) +message_list_get_hide_deleted (EMessageList *message_list, + CamelFolder *folder) { CamelStore *store; gboolean non_trash_folder; @@ -4687,7 +4687,7 @@ message_list_get_hide_deleted (MessageList *message_list, if (folder == NULL) return FALSE; - if (message_list_get_show_deleted (message_list)) + if (e_message_list_get_show_deleted (message_list)) return FALSE; store = camel_folder_get_parent_store (folder); @@ -4709,7 +4709,7 @@ message_list_get_hide_deleted (MessageList *message_list, /* Check if the given node is selectable in the current message list, * which depends on the type of the folder (normal, junk, trash). */ static gboolean -is_node_selectable (MessageList *message_list, +is_node_selectable (EMessageList *message_list, CamelMessageInfo *info, GHashTable *removed_uids) { @@ -4729,7 +4729,7 @@ is_node_selectable (MessageList *message_list, if (removed_uids && g_hash_table_contains (removed_uids, camel_message_info_get_uid (info))) return FALSE; - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); g_return_val_if_fail (folder != NULL, FALSE); store_has_vjunk = folder_store_supports_vjunk_folder (folder); @@ -4777,7 +4777,7 @@ is_node_selectable (MessageList *message_list, * actually no assurance that we'll find something that will still be * there next time, but its probably going to work most of the time. */ static gchar * -find_next_selectable (MessageList *message_list, +find_next_selectable (EMessageList *message_list, GHashTable *removed_uids) { ETreeTableAdapter *adapter; @@ -4841,7 +4841,7 @@ find_next_selectable (MessageList *message_list, } static GNode * -ml_uid_nodemap_insert (MessageList *message_list, +ml_uid_nodemap_insert (EMessageList *message_list, CamelMessageInfo *info, GNode *parent, gint row) @@ -4887,7 +4887,7 @@ ml_uid_nodemap_insert (MessageList *message_list, /* only call if we have a tree model */ /* builds the tree structure */ -static void build_subtree (MessageList *message_list, +static void build_subtree (EMessageList *message_list, GNode *parent, CamelFolderThreadNode *c, gboolean thread_flat, @@ -4895,7 +4895,7 @@ static void build_subtree (MessageList *message_list, gint *row); static void -build_tree (MessageList *message_list, +build_tree (EMessageList *message_list, CamelFolderThread *thread, gboolean thread_flat, gboolean thread_latest, @@ -4957,7 +4957,7 @@ build_tree (MessageList *message_list, } static void -build_subtree (MessageList *message_list, +build_subtree (EMessageList *message_list, GNode *parent, CamelFolderThreadNode *c, gboolean thread_flat, @@ -4999,7 +4999,7 @@ build_subtree (MessageList *message_list, } static void -build_flat (MessageList *message_list, +build_flat (EMessageList *message_list, GPtrArray *summary, gboolean folder_changed, GHashTable *removed_uids) @@ -5018,7 +5018,7 @@ build_flat (MessageList *message_list, if (message_list->cursor_uid != NULL) saveuid = find_next_selectable (message_list, removed_uids); - selected = message_list_get_selected (message_list); + selected = e_message_list_get_selected (message_list); message_list_tree_model_freeze (message_list); @@ -5032,7 +5032,7 @@ build_flat (MessageList *message_list, message_list_tree_model_thaw (message_list); - message_list_set_selected (message_list, selected); + e_message_list_set_selected (message_list, selected); g_ptr_array_unref (selected); @@ -5063,7 +5063,7 @@ build_flat (MessageList *message_list, } static void -message_list_change_first_visible_parent (MessageList *message_list, +message_list_change_first_visible_parent (EMessageList *message_list, GNode *node) { ETreeModel *tree_model; @@ -5086,7 +5086,7 @@ message_list_change_first_visible_parent (MessageList *message_list, static CamelFolderChangeInfo * mail_folder_hide_by_flag (CamelFolder *folder, - MessageList *message_list, + EMessageList *message_list, CamelFolderChangeInfo *changes, gint flag) { @@ -5139,7 +5139,7 @@ mail_folder_hide_by_flag (CamelFolder *folder, static void message_list_folder_changed (CamelFolder *folder, CamelFolderChangeInfo *changes, - MessageList *message_list) + EMessageList *message_list) { CamelFolderChangeInfo *altered_changes = NULL; RegenData *regen_data; @@ -5147,7 +5147,7 @@ message_list_folder_changed (CamelFolder *folder, g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (changes != NULL); - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (message_list->priv->destroyed) return; @@ -5233,7 +5233,7 @@ message_list_folder_changed (CamelFolder *folder, typedef struct _FolderChangedData { GWeakRef *folder; /* CamelFolder * */ CamelFolderChangeInfo *changes; - GWeakRef *message_list; /* MessageList * */ + GWeakRef *message_list; /* EMessageList * */ } FolderChangedData; static void @@ -5254,7 +5254,7 @@ message_list_folder_changed_timeout_cb (gpointer user_data) { FolderChangedData *fcd = user_data; CamelFolder *folder; - MessageList *message_list; + EMessageList *message_list; g_return_val_if_fail (fcd != NULL, FALSE); @@ -5273,7 +5273,7 @@ message_list_folder_changed_timeout_cb (gpointer user_data) static void message_list_folder_changed_cb (CamelFolder *folder, CamelFolderChangeInfo *changes, - MessageList *message_list) + EMessageList *message_list) { if (message_list->priv->destroyed) return; @@ -5296,13 +5296,13 @@ message_list_folder_changed_cb (CamelFolder *folder, } CamelFolder * -message_list_ref_folder (MessageList *message_list) +e_message_list_ref_folder (EMessageList *message_list) { CamelFolder *folder = NULL; /* XXX Do we need a property lock to guard this? */ - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), NULL); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), NULL); if (message_list->priv->folder != NULL) folder = g_object_ref (message_list->priv->folder); @@ -5311,19 +5311,19 @@ message_list_ref_folder (MessageList *message_list) } /** - * message_list_set_folder: + * e_message_list_set_folder: * @message_list: Message List widget * @folder: folder backend to be set * * Sets @folder to be the backend folder for @message_list. **/ void -message_list_set_folder (MessageList *message_list, - CamelFolder *folder) +e_message_list_set_folder (EMessageList *message_list, + CamelFolder *folder) { /* XXX Do we need a property lock to guard this? */ - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (folder == message_list->priv->folder) return; @@ -5443,43 +5443,43 @@ message_list_set_folder (MessageList *message_list, } GtkTargetList * -message_list_get_copy_target_list (MessageList *message_list) +e_message_list_get_copy_target_list (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), NULL); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), NULL); return message_list->priv->copy_target_list; } GtkTargetList * -message_list_get_paste_target_list (MessageList *message_list) +e_message_list_get_paste_target_list (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), NULL); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), NULL); return message_list->priv->paste_target_list; } void -message_list_set_expanded_default (MessageList *message_list, - gboolean expanded_default) +e_message_list_set_expanded_default (EMessageList *message_list, + gboolean expanded_default) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); message_list->priv->expanded_default = expanded_default; } gboolean -message_list_get_group_by_threads (MessageList *message_list) +e_message_list_get_group_by_threads (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->group_by_threads; } void -message_list_set_group_by_threads (MessageList *message_list, - gboolean group_by_threads) +e_message_list_set_group_by_threads (EMessageList *message_list, + gboolean group_by_threads) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (group_by_threads == message_list->priv->group_by_threads) return; @@ -5497,18 +5497,18 @@ message_list_set_group_by_threads (MessageList *message_list, } gboolean -message_list_get_show_deleted (MessageList *message_list) +e_message_list_get_show_deleted (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->show_deleted; } void -message_list_set_show_deleted (MessageList *message_list, - gboolean show_deleted) +e_message_list_set_show_deleted (EMessageList *message_list, + gboolean show_deleted) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (show_deleted == message_list->priv->show_deleted) return; @@ -5525,18 +5525,18 @@ message_list_set_show_deleted (MessageList *message_list, } gboolean -message_list_get_show_junk (MessageList *message_list) +e_message_list_get_show_junk (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->show_junk; } void -message_list_set_show_junk (MessageList *message_list, - gboolean show_junk) +e_message_list_set_show_junk (EMessageList *message_list, + gboolean show_junk) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (show_junk == message_list->priv->show_junk) return; @@ -5553,18 +5553,18 @@ message_list_set_show_junk (MessageList *message_list, } gboolean -message_list_get_thread_latest (MessageList *message_list) +e_message_list_get_thread_latest (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->thread_latest; } void -message_list_set_thread_latest (MessageList *message_list, - gboolean thread_latest) +e_message_list_set_thread_latest (EMessageList *message_list, + gboolean thread_latest) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (thread_latest == message_list->priv->thread_latest) return; @@ -5575,18 +5575,18 @@ message_list_set_thread_latest (MessageList *message_list, } gboolean -message_list_get_thread_subject (MessageList *message_list) +e_message_list_get_thread_subject (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->thread_subject; } void -message_list_set_thread_subject (MessageList *message_list, - gboolean thread_subject) +e_message_list_set_thread_subject (EMessageList *message_list, + gboolean thread_subject) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (thread_subject == message_list->priv->thread_subject) return; @@ -5597,18 +5597,18 @@ message_list_set_thread_subject (MessageList *message_list, } gboolean -message_list_get_thread_compress (MessageList *message_list) +e_message_list_get_thread_compress (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->thread_compress; } void -message_list_set_thread_compress (MessageList *message_list, - gboolean thread_compress) +e_message_list_set_thread_compress (EMessageList *message_list, + gboolean thread_compress) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if ((thread_compress ? 1 : 0) == (message_list->priv->thread_compress ? 1 : 0)) return; @@ -5621,18 +5621,18 @@ message_list_set_thread_compress (MessageList *message_list, } gboolean -message_list_get_thread_flat (MessageList *message_list) +e_message_list_get_thread_flat (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->thread_flat; } void -message_list_set_thread_flat (MessageList *message_list, - gboolean thread_flat) +e_message_list_set_thread_flat (EMessageList *message_list, + gboolean thread_flat) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if ((thread_flat ? 1 : 0) == (message_list->priv->thread_flat ? 1 : 0)) return; @@ -5650,18 +5650,18 @@ message_list_set_thread_flat (MessageList *message_list, } gboolean -message_list_get_regen_selects_unread (MessageList *message_list) +e_message_list_get_regen_selects_unread (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return message_list->priv->regen_selects_unread; } void -message_list_set_regen_selects_unread (MessageList *message_list, - gboolean regen_selects_unread) +e_message_list_set_regen_selects_unread (EMessageList *message_list, + gboolean regen_selects_unread) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if ((regen_selects_unread ? 1 : 0) == (message_list->priv->regen_selects_unread ? 1 : 0)) return; @@ -5672,7 +5672,7 @@ message_list_set_regen_selects_unread (MessageList *message_list, static gboolean on_cursor_activated_idle (gpointer data) { - MessageList *message_list = data; + EMessageList *message_list = data; ESelectionModel *esm; gint selected; @@ -5702,7 +5702,7 @@ on_cursor_activated_cmd (ETree *tree, GNode *node, gpointer user_data) { - MessageList *message_list = MESSAGE_LIST (user_data); + EMessageList *message_list = E_MESSAGE_LIST (user_data); const gchar *new_uid; if (node == NULL || G_NODE_IS_ROOT (node)) @@ -5733,16 +5733,16 @@ on_cursor_activated_cmd (ETree *tree, static void on_selection_changed_cmd (ETree *tree, - MessageList *message_list) + EMessageList *message_list) { GPtrArray *uids = NULL; const gchar *newuid; guint selected_count; GNode *cursor; - selected_count = message_list_selected_count (message_list); + selected_count = e_message_list_selected_count (message_list); if (selected_count == 1) { - uids = message_list_get_selected (message_list); + uids = e_message_list_get_selected (message_list); if (uids->len == 1) newuid = g_ptr_array_index (uids, 0); @@ -5781,7 +5781,7 @@ on_click (ETree *tree, GNode *node, gint col, GdkEvent *event, - MessageList *list) + EMessageList *list) { CamelFolder *folder; CamelMessageInfo *info; @@ -5799,7 +5799,7 @@ on_click (ETree *tree, if (!(info = get_message_info (list, node))) return FALSE; - folder = message_list_ref_folder (list); + folder = e_message_list_ref_folder (list); g_return_val_if_fail (folder != NULL, FALSE); if (col == COL_FOLLOWUP_FLAG_STATUS) { @@ -5872,7 +5872,7 @@ on_click (ETree *tree, } struct _ml_selected_data { - MessageList *message_list; + EMessageList *message_list; ETreeTableAdapter *adapter; gboolean with_collapsed_threads; GPtrArray *uids; @@ -5915,7 +5915,7 @@ ml_getselected_cb (GNode *node, } static GPtrArray * -message_list_get_selected_full (MessageList *message_list, +message_list_get_selected_full (EMessageList *message_list, gboolean with_collapsed_threads) { CamelFolder *folder; @@ -5926,7 +5926,7 @@ message_list_get_selected_full (MessageList *message_list, NULL }; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), NULL); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), NULL); data.adapter = e_tree_get_table_adapter (E_TREE (message_list)); data.with_collapsed_threads = with_collapsed_threads; @@ -5939,7 +5939,7 @@ message_list_get_selected_full (MessageList *message_list, E_TREE_SELECTION_MODEL (selection), (ETreeForeachFunc) ml_getselected_cb, &data); - folder = message_list_ref_folder (message_list); + folder = e_message_list_ref_folder (message_list); if (folder != NULL && data.uids->len > 0) camel_folder_sort_uids (folder, data.uids); @@ -5950,27 +5950,27 @@ message_list_get_selected_full (MessageList *message_list, } GPtrArray * -message_list_get_selected (MessageList *message_list) +e_message_list_get_selected (EMessageList *message_list) { return message_list_get_selected_full (message_list, FALSE); } GPtrArray * -message_list_get_selected_with_collapsed_threads (MessageList *message_list) +e_message_list_get_selected_with_collapsed_threads (EMessageList *message_list) { return message_list_get_selected_full (message_list, TRUE); } void -message_list_set_selected (MessageList *message_list, - GPtrArray *uids) +e_message_list_set_selected (EMessageList *message_list, + GPtrArray *uids) { gint i; ETreeSelectionModel *etsm; GNode *node; GPtrArray *paths; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); paths = g_ptr_array_new (); etsm = (ETreeSelectionModel *) @@ -6002,8 +6002,8 @@ ml_sort_uids_cb (gconstpointer a, } void -message_list_sort_uids (MessageList *message_list, - GPtrArray *uids) +e_message_list_sort_uids (EMessageList *message_list, + GPtrArray *uids) { struct ml_sort_uids_data *data; GPtrArray *array; @@ -6012,7 +6012,7 @@ message_list_sort_uids (MessageList *message_list, gint ii; g_return_if_fail (message_list != NULL); - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_return_if_fail (uids != NULL); if (uids->len <= 1) @@ -6047,7 +6047,7 @@ message_list_sort_uids (MessageList *message_list, } struct ml_count_data { - MessageList *message_list; + EMessageList *message_list; guint count; }; @@ -6062,11 +6062,11 @@ ml_getcount_cb (GNode *node, } guint -message_list_count (MessageList *message_list) +e_message_list_count (EMessageList *message_list) { struct ml_count_data data = { message_list, 0 }; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), 0); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), 0); e_tree_path_foreach ( E_TREE (message_list), @@ -6076,27 +6076,27 @@ message_list_count (MessageList *message_list) } guint -message_list_selected_count (MessageList *message_list) +e_message_list_selected_count (EMessageList *message_list) { ESelectionModel *selection; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), 0); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), 0); selection = e_tree_get_selection_model (E_TREE (message_list)); return e_selection_model_selected_count (selection); } void -message_list_freeze (MessageList *message_list) +e_message_list_freeze (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); message_list->frozen++; } void -message_list_thaw (MessageList *message_list) +e_message_list_thaw (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_return_if_fail (message_list->frozen != 0); message_list->frozen--; @@ -6118,11 +6118,11 @@ message_list_thaw (MessageList *message_list) /* set whether we are in threaded view or flat view */ void -message_list_set_threaded_expand_all (MessageList *message_list) +e_message_list_set_threaded_expand_all (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); - if (message_list_get_group_by_threads (message_list)) { + if (e_message_list_get_group_by_threads (message_list)) { message_list->expand_all = 1; if (message_list->frozen == 0) @@ -6133,11 +6133,11 @@ message_list_set_threaded_expand_all (MessageList *message_list) } void -message_list_set_threaded_collapse_all (MessageList *message_list) +e_message_list_set_threaded_collapse_all (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); - if (message_list_get_group_by_threads (message_list)) { + if (e_message_list_get_group_by_threads (message_list)) { message_list->collapse_all = 1; if (message_list->frozen == 0) @@ -6148,12 +6148,12 @@ message_list_set_threaded_collapse_all (MessageList *message_list) } void -message_list_set_search (MessageList *message_list, - const gchar *search) +e_message_list_set_search (EMessageList *message_list, + const gchar *search) { RegenData *current_regen_data; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); current_regen_data = message_list_ref_regen_data (message_list); @@ -6179,7 +6179,7 @@ message_list_set_search (MessageList *message_list, } static void -message_list_regen_tweak_search_results (MessageList *message_list, +message_list_regen_tweak_search_results (EMessageList *message_list, GPtrArray *search_results, CamelFolder *folder, gboolean folder_changed, @@ -6245,7 +6245,7 @@ message_list_regen_thread (GTask *task, gpointer task_data, GCancellable *cancellable) { - MessageList *message_list; + EMessageList *message_list; RegenData *regen_data; GPtrArray *uids, *searchuids = NULL; CamelMessageInfo *info; @@ -6257,7 +6257,7 @@ message_list_regen_thread (GTask *task, gboolean hide_junk; GError *local_error = NULL; - message_list = MESSAGE_LIST (source_object); + message_list = E_MESSAGE_LIST (source_object); regen_data = task_data; if (g_task_return_error_if_cancelled (task)) @@ -6398,7 +6398,7 @@ message_list_regen_thread (GTask *task, * CamelFolderThread during regen post-processing. * * We're committed at this point so keep our own - * reference in case the MessageList's reference + * reference in case the EMessageList's reference * gets invalidated before regen post-processing. */ regen_data->thread_tree = thread_tree; @@ -6432,7 +6432,7 @@ exit: } static gint -message_list_correct_row_for_remove (MessageList *message_list, +message_list_correct_row_for_remove (EMessageList *message_list, gint row, GHashTable *removed_uids) { @@ -6443,7 +6443,7 @@ message_list_correct_row_for_remove (MessageList *message_list, gboolean done = FALSE; gint round; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), row); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), row); if (!removed_uids) return row; @@ -6493,7 +6493,7 @@ message_list_correct_row_for_remove (MessageList *message_list, } static gint -message_list_correct_row_for_remove_in_selection (MessageList *message_list, +message_list_correct_row_for_remove_in_selection (EMessageList *message_list, gint row, GHashTable *removed_uids) { @@ -6503,7 +6503,7 @@ message_list_correct_row_for_remove_in_selection (MessageList *message_list, guint ii; gint best_row = row, best_dist = -1; - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), row); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), row); if (!removed_uids) return row; @@ -6513,7 +6513,7 @@ message_list_correct_row_for_remove_in_selection (MessageList *message_list, if (!node || !g_hash_table_contains (removed_uids, get_message_uid (message_list, node))) return row; - selected = message_list_get_selected (message_list); + selected = e_message_list_get_selected (message_list); if (!selected) return row; @@ -6540,7 +6540,7 @@ message_list_correct_row_for_remove_in_selection (MessageList *message_list, } static void -message_list_update_tree_text (MessageList *message_list) +message_list_update_tree_text (EMessageList *message_list) { ETreeTableAdapter *adapter; ETree *tree; @@ -6548,7 +6548,7 @@ message_list_update_tree_text (MessageList *message_list) gboolean have_search_expr; gint row_count; - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_return_if_fail (e_util_is_main_thread (g_thread_self ())); if (!gtk_widget_is_visible (GTK_WIDGET (message_list))) @@ -6566,7 +6566,7 @@ message_list_update_tree_text (MessageList *message_list) if (row_count > 0) { info_message = NULL; - } else if (message_list_is_setting_up_search_folder (message_list)) { + } else if (e_message_list_is_setting_up_search_folder (message_list)) { info_message = _("Generating message list…"); } else if (have_search_expr) { info_message = @@ -6588,7 +6588,7 @@ message_list_regen_done_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) { - MessageList *message_list; + EMessageList *message_list; RegenData *regen_data; EActivity *activity; ETree *tree; @@ -6598,7 +6598,7 @@ message_list_regen_done_cb (GObject *source_object, const gchar *start_selection_uid = NULL, *last_row_uid = NULL; /* These are in Camel's string pool */ GError *local_error = NULL; - message_list = MESSAGE_LIST (source_object); + message_list = E_MESSAGE_LIST (source_object); regen_data = g_task_get_task_data (G_TASK (result)); g_task_propagate_boolean (G_TASK (result), &local_error); @@ -6714,7 +6714,7 @@ message_list_regen_done_cb (GObject *source_object, if (message_list->cursor_uid != NULL) saveuid = find_next_selectable (message_list, regen_data->removed_uids); - selected = message_list_get_selected (message_list); + selected = e_message_list_get_selected (message_list); /* Show the cursor unless we're responding to a * "folder-changed" signal from our CamelFolder. */ @@ -6753,7 +6753,7 @@ message_list_regen_done_cb (GObject *source_object, e_table_item_freeze (table_item); - message_list_set_selected (message_list, selected); + e_message_list_set_selected (message_list, selected); g_ptr_array_unref (selected); /* Show the cursor unless we're responding to a @@ -6772,7 +6772,7 @@ message_list_regen_done_cb (GObject *source_object, saveuid = g_strdup (message_list->cursor_uid); } - if (message_list_selected_count (message_list) > 1) { + if (e_message_list_selected_count (message_list) > 1) { g_free (saveuid); } else if (saveuid) { GNode *node; @@ -6840,10 +6840,10 @@ message_list_regen_done_cb (GObject *source_object, } if (regen_data->select_all) { - message_list_select_all (message_list); + e_message_list_select_all (message_list); } else if (regen_data->select_uid != NULL) { - message_list_select_uid ( + e_message_list_select_uid ( message_list, regen_data->select_uid, regen_data->select_use_fallback); @@ -6852,7 +6852,7 @@ message_list_regen_done_cb (GObject *source_object, GNode *node = NULL; gint sel_count; - sel_count = message_list_selected_count (message_list); + sel_count = e_message_list_selected_count (message_list); /* It can be that multi-select start and/or end had been removed, in which case "clamp" the new start/end according to start/end of the restored @@ -6861,7 +6861,7 @@ message_list_regen_done_cb (GObject *source_object, if (sel_count > 0) { GPtrArray *selected; - selected = message_list_get_selected (message_list); + selected = e_message_list_get_selected (message_list); if (selected && selected->len) { guint ii; @@ -6906,7 +6906,7 @@ message_list_regen_done_cb (GObject *source_object, /* This also deselects rows */ select_node (message_list, node); - message_list_set_selected (message_list, selected); + e_message_list_set_selected (message_list, selected); e_tree_selection_model_set_selection_start_row (E_TREE_SELECTION_MODEL (e_tree_get_selection_model (tree)), min_row); } } @@ -6964,8 +6964,8 @@ message_list_regen_done_cb (GObject *source_object, } if (call_select) { - message_list_select (MESSAGE_LIST (message_list), MESSAGE_LIST_SELECT_NEXT | - MESSAGE_LIST_SELECT_WRAP | MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED, + e_message_list_select (E_MESSAGE_LIST (message_list), E_MESSAGE_LIST_SELECT_NEXT | + E_MESSAGE_LIST_SELECT_WRAP | E_MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED, 0, CAMEL_MESSAGE_SEEN); } } @@ -6976,7 +6976,7 @@ message_list_regen_idle_cb (gpointer user_data) { GTask *task; RegenData *regen_data; - MessageList *message_list; + EMessageList *message_list; ETreeTableAdapter *adapter; gboolean searching; gint row_count; @@ -6988,16 +6988,16 @@ message_list_regen_idle_cb (gpointer user_data) g_mutex_lock (&message_list->priv->regen_lock); - /* Capture MessageList state to use for this regen. */ + /* Capture EMessageList state to use for this regen. */ - regen_data->group_by_threads = message_list_get_group_by_threads (message_list); - regen_data->thread_subject = message_list_get_thread_subject (message_list); - regen_data->thread_flat = message_list_get_thread_flat (message_list); - regen_data->thread_latest = message_list_get_thread_latest (message_list); - regen_data->select_unread = message_list_get_regen_selects_unread (message_list); + regen_data->group_by_threads = e_message_list_get_group_by_threads (message_list); + regen_data->thread_subject = e_message_list_get_thread_subject (message_list); + regen_data->thread_flat = e_message_list_get_thread_flat (message_list); + regen_data->thread_latest = e_message_list_get_thread_latest (message_list); + regen_data->select_unread = e_message_list_get_regen_selects_unread (message_list); if (regen_data->select_unread) - message_list_set_regen_selects_unread (message_list, FALSE); + e_message_list_set_regen_selects_unread (message_list, FALSE); searching = message_list_is_searching (message_list); @@ -7013,7 +7013,7 @@ message_list_regen_idle_cb (gpointer user_data) if (message_list->priv->any_row_changed) { /* Something changed. If it was an expand * state change, then save the expand state. */ - message_list_save_state (message_list); + e_message_list_save_state (message_list); } else { /* Remember the expand state and restore it * after regen. */ @@ -7037,7 +7037,7 @@ message_list_regen_idle_cb (gpointer user_data) } static void -mail_regen_cancel (MessageList *message_list) +mail_regen_cancel (EMessageList *message_list) { RegenData *regen_data = NULL; @@ -7061,7 +7061,7 @@ mail_regen_cancel (MessageList *message_list) } static void -mail_regen_list (MessageList *message_list, +mail_regen_list (EMessageList *message_list, const gchar *search, CamelFolderChangeInfo *folder_changes) { @@ -7167,7 +7167,7 @@ mail_regen_list (MessageList *message_list, /* Set the RegenData immediately, but start the actual regen * operation from an idle callback. That way the caller has * the remainder of this main loop iteration to make further - * MessageList changes without triggering additional regens. */ + * EMessageList changes without triggering additional regens. */ message_list->priv->regen_data = regen_data_ref (new_regen_data); @@ -7195,10 +7195,10 @@ exit: } gboolean -message_list_contains_uid (MessageList *message_list, - const gchar *uid) +e_message_list_contains_uid (EMessageList *message_list, + const gchar *uid) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); if (!uid || !*uid || !message_list->priv->folder) return FALSE; @@ -7207,26 +7207,26 @@ message_list_contains_uid (MessageList *message_list, } void -message_list_inc_setting_up_search_folder (MessageList *message_list) +e_message_list_inc_setting_up_search_folder (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); g_atomic_int_add (&message_list->priv->setting_up_search_folder, 1); } void -message_list_dec_setting_up_search_folder (MessageList *message_list) +e_message_list_dec_setting_up_search_folder (EMessageList *message_list) { - g_return_if_fail (IS_MESSAGE_LIST (message_list)); + g_return_if_fail (E_IS_MESSAGE_LIST (message_list)); if (g_atomic_int_dec_and_test (&message_list->priv->setting_up_search_folder)) message_list_update_tree_text (message_list); } gboolean -message_list_is_setting_up_search_folder (MessageList *message_list) +e_message_list_is_setting_up_search_folder (EMessageList *message_list) { - g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + g_return_val_if_fail (E_IS_MESSAGE_LIST (message_list), FALSE); return g_atomic_int_get (&message_list->priv->setting_up_search_folder) > 0; } diff --git a/src/mail/message-list.etspec b/src/mail/e-message-list.etspec similarity index 100% rename from src/mail/message-list.etspec rename to src/mail/e-message-list.etspec diff --git a/src/mail/e-message-list.h b/src/mail/e-message-list.h new file mode 100644 index 0000000000000000000000000000000000000000..a5f83b87982c68866f37c7d2f422a6660f6bf0cc --- /dev/null +++ b/src/mail/e-message-list.h @@ -0,0 +1,262 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . + * + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#ifndef _E_MESSAGE_LIST_H_ +#define _E_MESSAGE_LIST_H_ + +#include +#include + +#include +#include + +/* Standard GObject macros */ +#define E_TYPE_MESSAGE_LIST \ + (e_message_list_get_type ()) +#define E_MESSAGE_LIST(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MESSAGE_LIST, EMessageList)) +#define E_MESSAGE_LIST_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MESSAGE_LIST, EMessageListClass)) +#define E_IS_MESSAGE_LIST(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MESSAGE_LIST)) +#define E_IS_MESSAGE_LIST_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MESSAGE_LIST)) +#define E_MESSAGE_LIST_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MESSAGE_LIST, EMessageListClass)) + +G_BEGIN_DECLS + +enum { + COL_MESSAGE_STATUS, + COL_FLAGGED, + COL_SCORE, + COL_ATTACHMENT, + COL_FROM, + COL_SUBJECT, + COL_SENT, + COL_RECEIVED, + COL_TO, + COL_SIZE, + COL_FOLLOWUP_FLAG_STATUS, + COL_FOLLOWUP_FLAG, + COL_FOLLOWUP_DUE_BY, + COL_LOCATION, /* vfolder location? */ + COL_SENDER, + COL_RECIPIENTS, + COL_MIXED_SENDER, + COL_MIXED_RECIPIENTS, + COL_LABELS, + + /* subject with junk removed */ + COL_SUBJECT_TRIMMED, + + /* normalised strings */ + COL_FROM_NORM, + COL_SUBJECT_NORM, + COL_TO_NORM, + + COL_UID, + COL_SENDER_MAIL, + COL_RECIPIENTS_MAIL, + COL_USER_HEADER_1, + COL_USER_HEADER_2, + COL_USER_HEADER_3, + COL_BODY_PREVIEW, + COL_CORRESPONDENTS, + + COL_LAST, + + /* Invisible columns */ + COL_DELETED, + COL_DELETED_OR_JUNK, + COL_JUNK, + COL_JUNK_STRIKEOUT_COLOR, + COL_UNREAD, + COL_COLOUR, + COL_ITALIC, + COL_SUBJECT_WITH_BODY_PREVIEW +}; + +#define E_MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \ + col == COL_FLAGGED) + +typedef struct _EMessageList EMessageList; +typedef struct _EMessageListClass EMessageListClass; +typedef struct _EMessageListPrivate EMessageListPrivate; + +struct _EMessageList { + ETree parent; + + EMessageListPrivate *priv; + + /* The table */ + ETableExtras *extras; + + GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ + + GHashTable *normalised_hash; + + /* Current search string, or %NULL */ + gchar *search; + + /* are we regenerating the message_list because set_folder + * was just called? */ + guint just_set_folder : 1; + + guint expand_all :1; + guint collapse_all :1; + + /* frozen count */ + guint frozen : 16; + + /* Where the ETree cursor is. */ + gchar *cursor_uid; + + /* whether the last selection was on a single row or none/multi */ + gboolean last_sel_single; + + /* Row-selection and seen-marking timers */ + guint idle_id, seen_id; + + gchar *frozen_search; /* to save search took place while we were frozen */ +}; + +struct _EMessageListClass { + ETreeClass parent_class; + + /* signals - select a message */ + void (*message_selected) (EMessageList *message_list, const gchar *uid); + void (*message_list_built) (EMessageList *message_list); + void (*message_list_scrolled) (EMessageList *message_list); +}; + +typedef enum { + E_MESSAGE_LIST_SELECT_NEXT = 0, + E_MESSAGE_LIST_SELECT_PREVIOUS = 1, + E_MESSAGE_LIST_SELECT_DIRECTION = 1, /* direction mask */ + E_MESSAGE_LIST_SELECT_WRAP = 1 << 1, /* option bit */ + E_MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED = 1 << 2 /* whether to search collapsed nodes as well */ +} EMessageListSelectDirection; + +GType e_message_list_get_type (void); +GtkWidget * e_message_list_new (EMailSession *session); +EMailSession * e_message_list_get_session (EMessageList *message_list); +CamelFolder * e_message_list_ref_folder (EMessageList *message_list); +void e_message_list_set_folder (EMessageList *message_list, + CamelFolder *folder); +GtkTargetList * e_message_list_get_copy_target_list + (EMessageList *message_list); +GtkTargetList * e_message_list_get_paste_target_list + (EMessageList *message_list); +void e_message_list_set_expanded_default + (EMessageList *message_list, + gboolean expanded_default); +gboolean e_message_list_get_group_by_threads + (EMessageList *message_list); +void e_message_list_set_group_by_threads + (EMessageList *message_list, + gboolean group_by_threads); +gboolean e_message_list_get_show_deleted (EMessageList *message_list); +void e_message_list_set_show_deleted (EMessageList *message_list, + gboolean show_deleted); +gboolean e_message_list_get_show_junk (EMessageList *message_list); +void e_message_list_set_show_junk (EMessageList *message_list, + gboolean show_junk); +gboolean e_message_list_get_thread_latest + (EMessageList *message_list); +void e_message_list_set_thread_latest + (EMessageList *message_list, + gboolean thread_latest); +gboolean e_message_list_get_thread_subject + (EMessageList *message_list); +void e_message_list_set_thread_subject + (EMessageList *message_list, + gboolean thread_subject); +gboolean e_message_list_get_thread_compress + (EMessageList *message_list); +void e_message_list_set_thread_compress + (EMessageList *message_list, + gboolean thread_compress); +gboolean e_message_list_get_thread_flat (EMessageList *message_list); +void e_message_list_set_thread_flat (EMessageList *message_list, + gboolean thread_flat); +gboolean e_message_list_get_regen_selects_unread + (EMessageList *message_list); +void e_message_list_set_regen_selects_unread + (EMessageList *message_list, + gboolean regen_selects_unread); +void e_message_list_freeze (EMessageList *message_list); +void e_message_list_thaw (EMessageList *message_list); +GPtrArray * e_message_list_get_selected (EMessageList *message_list); +GPtrArray * e_message_list_get_selected_with_collapsed_threads + (EMessageList *message_list); +void e_message_list_set_selected (EMessageList *message_list, + GPtrArray *uids); +gboolean e_message_list_select (EMessageList *message_list, + EMessageListSelectDirection direction, + guint32 flags, + guint32 mask); +gboolean e_message_list_can_select (EMessageList *message_list, + EMessageListSelectDirection direction, + guint32 flags, + guint32 mask); +void e_message_list_select_uid (EMessageList *message_list, + const gchar *uid, + gboolean with_fallback); +void e_message_list_select_next_thread + (EMessageList *message_list); +void e_message_list_select_prev_thread + (EMessageList *message_list); +void e_message_list_select_all (EMessageList *message_list); +void e_message_list_select_thread (EMessageList *message_list); +void e_message_list_select_subthread (EMessageList *message_list); +void e_message_list_copy (EMessageList *message_list, + gboolean cut); +void e_message_list_paste (EMessageList *message_list); +guint e_message_list_count (EMessageList *message_list); +guint e_message_list_selected_count (EMessageList *message_list); +void e_message_list_set_threaded_expand_all + (EMessageList *message_list); +void e_message_list_set_threaded_collapse_all + (EMessageList *message_list); +void e_message_list_set_search (EMessageList *message_list, + const gchar *search); +void e_message_list_save_state (EMessageList *message_list); + +void e_message_list_sort_uids (EMessageList *message_list, + GPtrArray *uids); +gboolean e_message_list_contains_uid (EMessageList *message_list, + const gchar *uid); +void e_message_list_inc_setting_up_search_folder + (EMessageList *message_list); +void e_message_list_dec_setting_up_search_folder + (EMessageList *message_list); +gboolean e_message_list_is_setting_up_search_folder + (EMessageList *message_list); + +G_END_DECLS + +#endif /* _E_MESSAGE_LIST_H_ */ diff --git a/src/mail/message-list.h b/src/mail/message-list.h deleted file mode 100644 index 3a4f0b338645c4f72efcec466e70719fb11f86be..0000000000000000000000000000000000000000 --- a/src/mail/message-list.h +++ /dev/null @@ -1,254 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, see . - * - * - * Authors: - * Jeffrey Stedfast - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef _MESSAGE_LIST_H_ -#define _MESSAGE_LIST_H_ - -#include -#include - -#include -#include - -/* Standard GObject macros */ -#define MESSAGE_LIST_TYPE \ - (message_list_get_type ()) -#define MESSAGE_LIST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), MESSAGE_LIST_TYPE, MessageList)) -#define MESSAGE_LIST_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), MESSAGE_LIST_TYPE, MessageListClass)) -#define IS_MESSAGE_LIST(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), MESSAGE_LIST_TYPE)) -#define IS_MESSAGE_LIST_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), MESSAGE_LIST_TYPE)) -#define MESSAGE_LIST_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), MESSAGE_LIST_TYPE, MessageListClass)) - -G_BEGIN_DECLS - -enum { - COL_MESSAGE_STATUS, - COL_FLAGGED, - COL_SCORE, - COL_ATTACHMENT, - COL_FROM, - COL_SUBJECT, - COL_SENT, - COL_RECEIVED, - COL_TO, - COL_SIZE, - COL_FOLLOWUP_FLAG_STATUS, - COL_FOLLOWUP_FLAG, - COL_FOLLOWUP_DUE_BY, - COL_LOCATION, /* vfolder location? */ - COL_SENDER, - COL_RECIPIENTS, - COL_MIXED_SENDER, - COL_MIXED_RECIPIENTS, - COL_LABELS, - - /* subject with junk removed */ - COL_SUBJECT_TRIMMED, - - /* normalised strings */ - COL_FROM_NORM, - COL_SUBJECT_NORM, - COL_TO_NORM, - - COL_UID, - COL_SENDER_MAIL, - COL_RECIPIENTS_MAIL, - COL_USER_HEADER_1, - COL_USER_HEADER_2, - COL_USER_HEADER_3, - COL_BODY_PREVIEW, - COL_CORRESPONDENTS, - - COL_LAST, - - /* Invisible columns */ - COL_DELETED, - COL_DELETED_OR_JUNK, - COL_JUNK, - COL_JUNK_STRIKEOUT_COLOR, - COL_UNREAD, - COL_COLOUR, - COL_ITALIC, - COL_SUBJECT_WITH_BODY_PREVIEW -}; - -#define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \ - col == COL_FLAGGED) - -typedef struct _MessageList MessageList; -typedef struct _MessageListClass MessageListClass; -typedef struct _MessageListPrivate MessageListPrivate; - -struct _MessageList { - ETree parent; - - MessageListPrivate *priv; - - /* The table */ - ETableExtras *extras; - - GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ - - GHashTable *normalised_hash; - - /* Current search string, or %NULL */ - gchar *search; - - /* are we regenerating the message_list because set_folder - * was just called? */ - guint just_set_folder : 1; - - guint expand_all :1; - guint collapse_all :1; - - /* frozen count */ - guint frozen : 16; - - /* Where the ETree cursor is. */ - gchar *cursor_uid; - - /* whether the last selection was on a single row or none/multi */ - gboolean last_sel_single; - - /* Row-selection and seen-marking timers */ - guint idle_id, seen_id; - - gchar *frozen_search; /* to save search took place while we were frozen */ -}; - -struct _MessageListClass { - ETreeClass parent_class; - - /* signals - select a message */ - void (*message_selected) (MessageList *message_list, const gchar *uid); - void (*message_list_built) (MessageList *message_list); - void (*message_list_scrolled) (MessageList *message_list); -}; - -typedef enum { - MESSAGE_LIST_SELECT_NEXT = 0, - MESSAGE_LIST_SELECT_PREVIOUS = 1, - MESSAGE_LIST_SELECT_DIRECTION = 1, /* direction mask */ - MESSAGE_LIST_SELECT_WRAP = 1 << 1, /* option bit */ - MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED = 1 << 2 /* whether to search collapsed nodes as well */ -} MessageListSelectDirection; - -GType message_list_get_type (void); -GtkWidget * message_list_new (EMailSession *session); -EMailSession * message_list_get_session (MessageList *message_list); -CamelFolder * message_list_ref_folder (MessageList *message_list); -void message_list_set_folder (MessageList *message_list, - CamelFolder *folder); -GtkTargetList * message_list_get_copy_target_list - (MessageList *message_list); -GtkTargetList * message_list_get_paste_target_list - (MessageList *message_list); -void message_list_set_expanded_default - (MessageList *message_list, - gboolean expanded_default); -gboolean message_list_get_group_by_threads - (MessageList *message_list); -void message_list_set_group_by_threads - (MessageList *message_list, - gboolean group_by_threads); -gboolean message_list_get_show_deleted (MessageList *message_list); -void message_list_set_show_deleted (MessageList *message_list, - gboolean show_deleted); -gboolean message_list_get_show_junk (MessageList *message_list); -void message_list_set_show_junk (MessageList *message_list, - gboolean show_junk); -gboolean message_list_get_thread_latest (MessageList *message_list); -void message_list_set_thread_latest (MessageList *message_list, - gboolean thread_latest); -gboolean message_list_get_thread_subject (MessageList *message_list); -void message_list_set_thread_subject (MessageList *message_list, - gboolean thread_subject); -gboolean message_list_get_thread_compress(MessageList *message_list); -void message_list_set_thread_compress(MessageList *message_list, - gboolean thread_compress); -gboolean message_list_get_thread_flat (MessageList *message_list); -void message_list_set_thread_flat (MessageList *message_list, - gboolean thread_flat); -gboolean message_list_get_regen_selects_unread - (MessageList *message_list); -void message_list_set_regen_selects_unread - (MessageList *message_list, - gboolean regen_selects_unread); -void message_list_freeze (MessageList *message_list); -void message_list_thaw (MessageList *message_list); -GPtrArray * message_list_get_selected (MessageList *message_list); -GPtrArray * message_list_get_selected_with_collapsed_threads - (MessageList *message_list); -void message_list_set_selected (MessageList *message_list, - GPtrArray *uids); -gboolean message_list_select (MessageList *message_list, - MessageListSelectDirection direction, - guint32 flags, - guint32 mask); -gboolean message_list_can_select (MessageList *message_list, - MessageListSelectDirection direction, - guint32 flags, - guint32 mask); -void message_list_select_uid (MessageList *message_list, - const gchar *uid, - gboolean with_fallback); -void message_list_select_next_thread (MessageList *message_list); -void message_list_select_prev_thread (MessageList *message_list); -void message_list_select_all (MessageList *message_list); -void message_list_select_thread (MessageList *message_list); -void message_list_select_subthread (MessageList *message_list); -void message_list_copy (MessageList *message_list, - gboolean cut); -void message_list_paste (MessageList *message_list); -guint message_list_count (MessageList *message_list); -guint message_list_selected_count (MessageList *message_list); -void message_list_set_threaded_expand_all - (MessageList *message_list); -void message_list_set_threaded_collapse_all - (MessageList *message_list); -void message_list_set_search (MessageList *message_list, - const gchar *search); -void message_list_save_state (MessageList *message_list); - -void message_list_sort_uids (MessageList *message_list, - GPtrArray *uids); -gboolean message_list_contains_uid (MessageList *message_list, - const gchar *uid); -void message_list_inc_setting_up_search_folder - (MessageList *message_list); -void message_list_dec_setting_up_search_folder - (MessageList *message_list); -gboolean message_list_is_setting_up_search_folder - (MessageList *message_list); - -G_END_DECLS - -#endif /* _MESSAGE_LIST_H_ */ diff --git a/src/modules/calendar/e-cal-shell-content.c b/src/modules/calendar/e-cal-shell-content.c index 2a37631f5044c3902b1430e7e0b2de5152be4798..f0b16daa14edaaeec056d1cbc1b23005a926e38f 100644 --- a/src/modules/calendar/e-cal-shell-content.c +++ b/src/modules/calendar/e-cal-shell-content.c @@ -22,7 +22,6 @@ #include #include "calendar/gui/calendar-config.h" -#include "calendar/gui/calendar-view.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-list-view.h" #include "calendar/gui/e-cal-model-calendar.h" @@ -31,10 +30,11 @@ #include "calendar/gui/e-calendar-view.h" #include "calendar/gui/e-day-view.h" #include "calendar/gui/e-month-view.h" +#include "calendar/gui/e-tag-calendar.h" #include "calendar/gui/e-week-view.h" #include "calendar/gui/e-year-view.h" +#include "calendar/gui/gal-calendar-view.h" #include "calendar/gui/itip-utils.h" -#include "calendar/gui/tag-calendar.h" #include "e-cal-base-shell-sidebar.h" #include "e-cal-shell-view-private.h" diff --git a/src/modules/calendar/e-cal-shell-view-actions.c b/src/modules/calendar/e-cal-shell-view-actions.c index 8fd9d07dfe2c1791b4366d2a459817f5a4b84ee0..673dd2eb97c02c16696fed58dd29ada75b826bb8 100644 --- a/src/modules/calendar/e-cal-shell-view-actions.c +++ b/src/modules/calendar/e-cal-shell-view-actions.c @@ -24,7 +24,7 @@ #include "calendar/gui/e-cal-ops.h" #include "calendar/gui/e-comp-editor.h" #include "calendar/gui/itip-utils.h" -#include "calendar/gui/print.h" +#include "calendar/gui/e-print.h" #include "e-cal-base-shell-view.h" #include "e-cal-shell-view-private.h" @@ -208,7 +208,7 @@ cal_shell_view_actions_print_or_preview (ECalShellView *cal_shell_view, ETable *table; table = e_cal_list_view_get_table (E_CAL_LIST_VIEW (cal_view)); - print_table (table, _("Print"), _("Calendar"), print_action); + e_print_table (table, _("Print"), _("Calendar"), print_action); } else { EPrintView print_view_type; ETable *tasks_table; @@ -240,7 +240,7 @@ cal_shell_view_actions_print_or_preview (ECalShellView *cal_shell_view, g_warn_if_fail (e_calendar_view_get_selected_time_range (cal_view, &start, &end)); - print_calendar (cal_view, tasks_table, print_view_type, print_action, start); + e_print_calendar (cal_view, tasks_table, print_view_type, print_action, start); } } @@ -1101,7 +1101,7 @@ action_event_print_cb (EUIAction *action, component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp)); - print_comp ( + e_print_comp ( component, client, e_cal_model_get_timezone (model), e_cal_model_get_use_24_hour_format (model), diff --git a/src/modules/calendar/e-cal-shell-view-memopad.c b/src/modules/calendar/e-cal-shell-view-memopad.c index edec58e5e5efb9402dfc72a09b2b8cf6132a699c..f725b7ff6f8efb3ca48f575317ded79277fe0a1d 100644 --- a/src/modules/calendar/e-cal-shell-view-memopad.c +++ b/src/modules/calendar/e-cal-shell-view-memopad.c @@ -169,7 +169,7 @@ action_calendar_memopad_print_cb (EUIAction *action, /* XXX We only print the first selected memo. */ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp)); - print_comp ( + e_print_comp ( comp, comp_data->client, e_cal_model_get_timezone (model), e_cal_model_get_use_24_hour_format (model), diff --git a/src/modules/calendar/e-cal-shell-view-private.h b/src/modules/calendar/e-cal-shell-view-private.h index bfb7a3fdce36568843da64c82b1b0d515f6069b4..fd8482b832d32819f7bd196c55f50e7e0ff4b430 100644 --- a/src/modules/calendar/e-cal-shell-view-private.h +++ b/src/modules/calendar/e-cal-shell-view-private.h @@ -36,8 +36,8 @@ #include #include #include +#include #include -#include #include "e-cal-base-shell-sidebar.h" diff --git a/src/modules/calendar/e-cal-shell-view-taskpad.c b/src/modules/calendar/e-cal-shell-view-taskpad.c index ca4ed6e9d02a80b3f30f86d425f84d73cccf1f76..e6bd3200c80bca27da7e33cb5726f4a3f71a167d 100644 --- a/src/modules/calendar/e-cal-shell-view-taskpad.c +++ b/src/modules/calendar/e-cal-shell-view-taskpad.c @@ -249,7 +249,7 @@ action_calendar_taskpad_print_cb (EUIAction *action, /* XXX We only print the first selected task. */ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp)); - print_comp ( + e_print_comp ( comp, comp_data->client, e_cal_model_get_timezone (model), e_cal_model_get_use_24_hour_format (model), diff --git a/src/modules/calendar/e-cal-shell-view.c b/src/modules/calendar/e-cal-shell-view.c index e4bbdce6922ff7989c4d3a3455a1d3b161286af8..a37c710c67884aa6bab51698dbea5e18c0d8782b 100644 --- a/src/modules/calendar/e-cal-shell-view.c +++ b/src/modules/calendar/e-cal-shell-view.c @@ -23,8 +23,8 @@ #include "e-cal-shell-view-private.h" #include "calendar/gui/ea-calendar.h" -#include "calendar/gui/calendar-view.h" #include "calendar/gui/e-year-view.h" +#include "calendar/gui/gal-calendar-view.h" #include "e-cal-base-shell-sidebar.h" #include "e-cal-shell-content.h" diff --git a/src/modules/calendar/e-memo-shell-view-actions.c b/src/modules/calendar/e-memo-shell-view-actions.c index 76cab1ab6777fcfade625175e7722bb0d1e3835a..357e8ef0b12b45da1c6f982f7d026bcf70594e84 100644 --- a/src/modules/calendar/e-memo-shell-view-actions.c +++ b/src/modules/calendar/e-memo-shell-view-actions.c @@ -212,7 +212,7 @@ action_memo_list_print_cb (EUIAction *action, memo_shell_content = memo_shell_view->priv->memo_shell_content; memo_table = e_memo_shell_content_get_memo_table (memo_shell_content); - print_table ( + e_print_table ( E_TABLE (memo_table), _("Print Memos"), _("Memos"), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); } @@ -229,7 +229,7 @@ action_memo_list_print_preview_cb (EUIAction *action, memo_shell_content = memo_shell_view->priv->memo_shell_content; memo_table = e_memo_shell_content_get_memo_table (memo_shell_content); - print_table ( + e_print_table ( E_TABLE (memo_table), _("Print Memos"), _("Memos"), GTK_PRINT_OPERATION_ACTION_PREVIEW); } @@ -495,7 +495,7 @@ action_memo_print_cb (EUIAction *action, /* XXX We only print the first selected memo. */ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp)); - print_comp ( + e_print_comp ( comp, comp_data->client, e_cal_model_get_timezone (model), e_cal_model_get_use_24_hour_format (model), diff --git a/src/modules/calendar/e-memo-shell-view-private.h b/src/modules/calendar/e-memo-shell-view-private.h index bb74c25def2f500de073d0b409711095fc982bb2..c2c8cc8ff8c0655d3f9c8390cd47c57240610177 100644 --- a/src/modules/calendar/e-memo-shell-view-private.h +++ b/src/modules/calendar/e-memo-shell-view-private.h @@ -30,7 +30,7 @@ #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" -#include "calendar/gui/print.h" +#include "calendar/gui/e-print.h" #include "e-cal-base-shell-sidebar.h" diff --git a/src/modules/calendar/e-task-shell-view-actions.c b/src/modules/calendar/e-task-shell-view-actions.c index fc1d8e594552507f0cff35fb7d4696d63124348c..ad7a25806975c134b5cde9f836b0cdba0f440bc0 100644 --- a/src/modules/calendar/e-task-shell-view-actions.c +++ b/src/modules/calendar/e-task-shell-view-actions.c @@ -263,7 +263,7 @@ action_task_list_print_cb (EUIAction *action, task_shell_content = task_shell_view->priv->task_shell_content; task_table = e_task_shell_content_get_task_table (task_shell_content); - print_table ( + e_print_table ( E_TABLE (task_table), _("Print Tasks"), _("Tasks"), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); } @@ -280,7 +280,7 @@ action_task_list_print_preview_cb (EUIAction *action, task_shell_content = task_shell_view->priv->task_shell_content; task_table = e_task_shell_content_get_task_table (task_shell_content); - print_table ( + e_print_table ( E_TABLE (task_table), _("Print Tasks"), _("Tasks"), GTK_PRINT_OPERATION_ACTION_PREVIEW); } @@ -595,7 +595,7 @@ action_task_print_cb (EUIAction *action, /* XXX We only print the first selected task. */ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp)); - print_comp ( + e_print_comp ( comp, comp_data->client, e_cal_model_get_timezone (model), e_cal_model_get_use_24_hour_format (model), diff --git a/src/modules/calendar/e-task-shell-view-private.h b/src/modules/calendar/e-task-shell-view-private.h index 9057ec048d76db8c8abb639891ef887b536ac666..a11307b25d6fce5dae941cd91056b92057c3fd4b 100644 --- a/src/modules/calendar/e-task-shell-view-private.h +++ b/src/modules/calendar/e-task-shell-view-private.h @@ -33,7 +33,7 @@ #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" #include "calendar/gui/e-cal-model-tasks.h" -#include "calendar/gui/print.h" +#include "calendar/gui/e-print.h" #include "e-cal-base-shell-sidebar.h" diff --git a/src/modules/mail/e-mail-shell-backend.c b/src/modules/mail/e-mail-shell-backend.c index 1fd9889ecbef100c1428734c79dc7a349c96f4c3..4d27ec5c9443c5774006283accf556512b055ad8 100644 --- a/src/modules/mail/e-mail-shell-backend.c +++ b/src/modules/mail/e-mail-shell-backend.c @@ -37,14 +37,14 @@ #include #include #include -#include "mail/e-mail-viewer.h" +#include +#include +#include #include #include +#include #include #include -#include -#include -#include #include #include @@ -389,12 +389,12 @@ action_mail_message_new_cb (EUIAction *action, message_list = e_mail_reader_get_message_list (E_MAIL_READER ( e_mail_shell_content_get_mail_view (E_MAIL_SHELL_CONTENT (e_shell_view_get_shell_content (shell_view))))); if (message_list) { - MessageList *ml = MESSAGE_LIST (message_list); + EMessageList *ml = E_MESSAGE_LIST (message_list); GPtrArray *selected_uids; - folder = message_list_ref_folder (ml); + folder = e_message_list_ref_folder (ml); - selected_uids = message_list_get_selected (ml); + selected_uids = e_message_list_get_selected (ml); if (selected_uids && selected_uids->len > 0) message_uid = camel_pstring_strdup (g_ptr_array_index (selected_uids, 0)); diff --git a/src/modules/mail/e-mail-shell-content.c b/src/modules/mail/e-mail-shell-content.c index a7d137ca0c55f63bb2db664c2fbf1d598183ed5d..850b1d13af9d54e1f5c6fc8fbb542474aa2b5757 100644 --- a/src/modules/mail/e-mail-shell-content.c +++ b/src/modules/mail/e-mail-shell-content.c @@ -31,8 +31,8 @@ #include #include #include +#include #include -#include #include "e-mail-shell-backend.h" #include "e-mail-shell-view-actions.h" @@ -272,7 +272,7 @@ mail_shell_content_focus_search_results (EShellContent *shell_content) /* This can be called also when the window is showing, to focus default widget, in which case do not skip the gtk_widget_grab_focus() call. */ - if (!message_list || (MESSAGE_LIST (message_list)->just_set_folder && + if (!message_list || (E_MESSAGE_LIST (message_list)->just_set_folder && gtk_widget_get_mapped (GTK_WIDGET (shell_window)) && gtk_window_get_focus (GTK_WINDOW (shell_window)))) return; diff --git a/src/modules/mail/e-mail-shell-view-actions.c b/src/modules/mail/e-mail-shell-view-actions.c index 47b76256e057a30c188cfc63dae879d52a2e15a3..dfb8a26d87491635b5267c2cf42139882d81d669 100644 --- a/src/modules/mail/e-mail-shell-view-actions.c +++ b/src/modules/mail/e-mail-shell-view-actions.c @@ -1108,7 +1108,7 @@ action_mail_folder_select_thread_cb (EUIAction *action, reader = E_MAIL_READER (mail_view); message_list = e_mail_reader_get_message_list (reader); - message_list_select_thread (MESSAGE_LIST (message_list)); + e_message_list_select_thread (E_MESSAGE_LIST (message_list)); } static void @@ -1128,7 +1128,7 @@ action_mail_folder_select_subthread_cb (EUIAction *action, reader = E_MAIL_READER (mail_view); message_list = e_mail_reader_get_message_list (reader); - message_list_select_subthread (MESSAGE_LIST (message_list)); + e_message_list_select_subthread (E_MESSAGE_LIST (message_list)); } static gboolean @@ -1421,15 +1421,15 @@ mail_shell_view_magic_spacebar (EMailShellView *mail_shell_view, g_object_unref (settings); if (!e_mail_display_process_magic_spacebar (display, move_forward)) { - guint32 direction = move_forward ? MESSAGE_LIST_SELECT_NEXT : MESSAGE_LIST_SELECT_PREVIOUS; + guint32 direction = move_forward ? E_MESSAGE_LIST_SELECT_NEXT : E_MESSAGE_LIST_SELECT_PREVIOUS; gboolean selected; if (!magic_spacebar) return; - if (message_list_select (MESSAGE_LIST (message_list), - direction | MESSAGE_LIST_SELECT_WRAP | - MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED, + if (e_message_list_select (E_MESSAGE_LIST (message_list), + direction | E_MESSAGE_LIST_SELECT_WRAP | + E_MESSAGE_LIST_SELECT_INCLUDE_COLLAPSED, 0, CAMEL_MESSAGE_SEEN)) return; @@ -1439,7 +1439,7 @@ mail_shell_view_magic_spacebar (EMailShellView *mail_shell_view, selected = em_folder_tree_select_prev_path (folder_tree, TRUE); if (selected) - message_list_set_regen_selects_unread (MESSAGE_LIST (message_list), TRUE); + e_message_list_set_regen_selects_unread (E_MESSAGE_LIST (message_list), TRUE); gtk_widget_grab_focus (message_list); } @@ -1497,7 +1497,7 @@ action_mail_threads_collapse_all_cb (EUIAction *action, reader = E_MAIL_READER (mail_view); message_list = e_mail_reader_get_message_list (reader); - message_list_set_threaded_collapse_all (MESSAGE_LIST (message_list)); + e_message_list_set_threaded_collapse_all (E_MESSAGE_LIST (message_list)); } static void @@ -1517,7 +1517,7 @@ action_mail_threads_expand_all_cb (EUIAction *action, reader = E_MAIL_READER (mail_view); message_list = e_mail_reader_get_message_list (reader); - message_list_set_threaded_expand_all (MESSAGE_LIST (message_list)); + e_message_list_set_threaded_expand_all (E_MESSAGE_LIST (message_list)); } static void diff --git a/src/modules/mail/e-mail-shell-view-private.c b/src/modules/mail/e-mail-shell-view-private.c index 892697ebab0c1abeb757bb258bf91458fc135cfd..130ef14321d66712e8fd79d5b4bff0fcf35c2370 100644 --- a/src/modules/mail/e-mail-shell-view-private.c +++ b/src/modules/mail/e-mail-shell-view-private.c @@ -209,7 +209,7 @@ mail_shell_view_match_folder_tree_and_message_list_folder (EMailShellView *mail_ * method gets the folder from the message list is supposed to be * a hidden implementation detail, and we want to explicitly get * the folder URI from the message list here. */ - folder = message_list_ref_folder (MESSAGE_LIST (message_list)); + folder = e_message_list_ref_folder (E_MESSAGE_LIST (message_list)); if (folder != NULL) { list_uri = e_mail_folder_uri_from_folder (folder); g_object_unref (folder); @@ -373,7 +373,7 @@ mail_shell_view_prepare_for_quit_cb (EMailShellView *mail_shell_view, reader = E_MAIL_READER (mail_view); message_list = e_mail_reader_get_message_list (reader); - message_list_save_state (MESSAGE_LIST (message_list)); + e_message_list_save_state (E_MESSAGE_LIST (message_list)); /* Do not sync folder content here, it's duty of EMailBackend, * which does it for all accounts */ @@ -817,7 +817,7 @@ e_mail_shell_view_restore_state (EMailShellView *mail_shell_view) message_list = e_mail_reader_get_message_list (reader); /* Avoid loading search state unnecessarily. */ - if ((!tmp && IS_MESSAGE_LIST (message_list) && MESSAGE_LIST (message_list)->just_set_folder) || + if ((!tmp && E_IS_MESSAGE_LIST (message_list) && E_MESSAGE_LIST (message_list)->just_set_folder) || g_strcmp0 (new_state_group, old_state_group) != 0) { e_shell_searchbar_set_state_group (searchbar, new_state_group); e_shell_searchbar_load_state (searchbar); @@ -845,7 +845,7 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view) CamelFolderInfoFlags flags = 0; CamelFolderSummary *folder_summary; MailFolderCache *folder_cache; - MessageList *message_list; + EMessageList *message_list; guint selected_count; GString *buffer, *title_short = NULL; gboolean store_is_local, is_inbox; @@ -903,8 +903,8 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view) num_visible = camel_folder_summary_get_visible_count (folder_summary); buffer = g_string_sized_new (256); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); - selected_count = message_list_selected_count (message_list); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + selected_count = e_message_list_selected_count (message_list); if (selected_count > 1) g_string_append_printf ( diff --git a/src/modules/mail/e-mail-shell-view-private.h b/src/modules/mail/e-mail-shell-view-private.h index f8e335d7357db705e3757474bfefed7e95f2594e..e69ec3d1f79a996675e5b1bd87ee96a8d8c9fdd6 100644 --- a/src/modules/mail/e-mail-shell-view-private.h +++ b/src/modules/mail/e-mail-shell-view-private.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include "e-mail-shell-backend.h" #include "e-mail-shell-content.h" @@ -53,7 +53,7 @@ (E_SHELL_VIEW_ACTION_##name (shell_view)) /* ETable Specifications */ -#define ETSPEC_FILENAME "message-list.etspec" +#define ETSPEC_FILENAME "e-message-list.etspec" /* State File Keys */ #define STATE_KEY_SEARCH_FILTER "SearchFilter" diff --git a/src/modules/mail/e-mail-shell-view.c b/src/modules/mail/e-mail-shell-view.c index 29afdf2e51458f72289a0df469a3a30624b8b821..2d245884d4d33849ae0ba333bffbba08623406a6 100644 --- a/src/modules/mail/e-mail-shell-view.c +++ b/src/modules/mail/e-mail-shell-view.c @@ -107,7 +107,7 @@ add_folders_from_store (GList **folders, typedef struct { MailMsg base; - MessageList *message_list; + EMessageList *message_list; CamelFolder *folder; GCancellable *cancellable; GList *stores_list; @@ -149,7 +149,7 @@ search_results_exec (SearchResultsMsg *msg, static void search_results_done (SearchResultsMsg *msg) { - message_list_dec_setting_up_search_folder (msg->message_list); + e_message_list_dec_setting_up_search_folder (msg->message_list); } static void @@ -169,7 +169,7 @@ static MailMsgInfo search_results_setup_info = { }; static gint -mail_shell_view_setup_search_results_folder (MessageList *message_list, +mail_shell_view_setup_search_results_folder (EMessageList *message_list, CamelFolder *folder, GList *stores, GCancellable *cancellable) @@ -185,7 +185,7 @@ mail_shell_view_setup_search_results_folder (MessageList *message_list, msg->cancellable = cancellable; msg->stores_list = stores; - message_list_inc_setting_up_search_folder (message_list); + e_message_list_inc_setting_up_search_folder (message_list); id = msg->base.seq; mail_msg_slow_ordered_push (msg); @@ -196,7 +196,7 @@ mail_shell_view_setup_search_results_folder (MessageList *message_list, typedef struct { MailMsg base; - MessageList *message_list; + EMessageList *message_list; CamelFolder *vfolder; GCancellable *cancellable; CamelFolder *root_folder; @@ -269,7 +269,7 @@ search_results_with_subfolders_exec (SearchResultsWithSubfoldersMsg *msg, static void search_results_with_subfolders_done (SearchResultsWithSubfoldersMsg *msg) { - message_list_dec_setting_up_search_folder (msg->message_list); + e_message_list_dec_setting_up_search_folder (msg->message_list); } static void @@ -289,7 +289,7 @@ static MailMsgInfo search_results_with_subfolders_setup_info = { }; static gint -mail_shell_view_setup_search_results_folder_and_subfolders (MessageList *message_list, +mail_shell_view_setup_search_results_folder_and_subfolders (EMessageList *message_list, CamelFolder *vfolder, CamelFolder *root_folder, GCancellable *cancellable) @@ -306,7 +306,7 @@ mail_shell_view_setup_search_results_folder_and_subfolders (MessageList *message msg->cancellable = cancellable; msg->root_folder = g_object_ref (root_folder); - message_list_inc_setting_up_search_folder (message_list); + e_message_list_inc_setting_up_search_folder (message_list); id = msg->base.seq; mail_msg_slow_ordered_push (msg); @@ -330,7 +330,7 @@ mail_shell_view_show_search_results_folder (EMailShellView *mail_shell_view, message_list = e_mail_reader_get_message_list (reader); - message_list_freeze (MESSAGE_LIST (message_list)); + e_message_list_freeze (E_MESSAGE_LIST (message_list)); e_mail_reader_set_folder (reader, folder); view_instance = e_mail_view_get_view_instance (mail_view); @@ -348,7 +348,7 @@ mail_shell_view_show_search_results_folder (EMailShellView *mail_shell_view, g_object_unref (state); } - message_list_thaw (MESSAGE_LIST (message_list)); + e_message_list_thaw (E_MESSAGE_LIST (message_list)); } static void @@ -1389,7 +1389,7 @@ filter: self->priv->search_account_cancel = camel_operation_new (); mail_shell_view_setup_search_results_folder_and_subfolders ( - MESSAGE_LIST (message_list), + E_MESSAGE_LIST (message_list), CAMEL_FOLDER (search_folder), folder, self->priv->search_account_cancel); @@ -1464,7 +1464,7 @@ all_accounts_setup: /* This takes ownership of the stores list. */ mail_shell_view_setup_search_results_folder ( - MESSAGE_LIST (message_list), + E_MESSAGE_LIST (message_list), CAMEL_FOLDER (search_folder), list, self->priv->search_account_cancel); @@ -1549,7 +1549,7 @@ current_accout_setup: /* This takes ownership of the stores list. */ mail_shell_view_setup_search_results_folder ( - MESSAGE_LIST (message_list), + E_MESSAGE_LIST (message_list), CAMEL_FOLDER (search_folder), list, self->priv->search_account_cancel); @@ -1564,7 +1564,7 @@ execute: /* Finally, execute the search. */ - message_list_set_search (MESSAGE_LIST (message_list), query); + e_message_list_set_search (E_MESSAGE_LIST (message_list), query); e_mail_view_set_search_strings (mail_view, search_strings); diff --git a/src/modules/mdn/evolution-mdn.c b/src/modules/mdn/evolution-mdn.c index f23e124d16298178ff58eee97adb373637ba8cb4..78960f4059635503f6e20321b9e8076e2f5b071b 100644 --- a/src/modules/mdn/evolution-mdn.c +++ b/src/modules/mdn/evolution-mdn.c @@ -22,11 +22,11 @@ #include -#include #include -#include -#include +#include #include +#include +#include #define MDN_USER_FLAG "receipt-handled" @@ -454,13 +454,13 @@ static void mdn_mail_reader_changed_cb (EMailReader *reader, EMdn *mdn) { - MessageList *message_list; + EMessageList *message_list; g_return_if_fail (E_IS_MAIL_READER (reader)); - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (reader)); - if (!message_list || message_list_selected_count (message_list) != 1) + if (!message_list || e_message_list_selected_count (message_list) != 1) mdn_remove_alert (mdn); } diff --git a/src/modules/settings/e-settings-message-list.c b/src/modules/settings/e-settings-message-list.c index 731d8b0deaedd1ee3f2e7e93fbf1d121f4860a0a..60ab2fb184dd2017aa747a6439af1d9b70e5bb35 100644 --- a/src/modules/settings/e-settings-message-list.c +++ b/src/modules/settings/e-settings-message-list.c @@ -17,28 +17,28 @@ #include "e-settings-message-list.h" -#include +#include G_DEFINE_DYNAMIC_TYPE ( ESettingsMessageList, e_settings_message_list, E_TYPE_EXTENSION) -static MessageList * +static EMessageList * settings_message_list_get_extensible (ESettingsMessageList *extension) { EExtensible *extensible; extensible = e_extension_get_extensible (E_EXTENSION (extension)); - return MESSAGE_LIST (extensible); + return E_MESSAGE_LIST (extensible); } static void settings_message_list_constructed (GObject *object) { ESettingsMessageList *extension; - MessageList *message_list; + EMessageList *message_list; GSettings *settings; extension = E_SETTINGS_MESSAGE_LIST (object); @@ -83,7 +83,7 @@ settings_message_list_constructed (GObject *object) /* This setting only controls the initial message list * state when in threaded mode, so just apply it here. */ - message_list_set_expanded_default ( + e_message_list_set_expanded_default ( message_list, g_settings_get_boolean (settings, "thread-expand")); @@ -103,7 +103,7 @@ e_settings_message_list_class_init (ESettingsMessageListClass *class) object_class->constructed = settings_message_list_constructed; extension_class = E_EXTENSION_CLASS (class); - extension_class->extensible_type = MESSAGE_LIST_TYPE; + extension_class->extensible_type = E_TYPE_MESSAGE_LIST; } static void diff --git a/src/plugins/mail-notification/mail-notification.c b/src/plugins/mail-notification/mail-notification.c index d91f9f5d2d0f4c81ed392a7e2b85c39efc31be96..4db4335acc89e2bfe3ebe50104b2b022111ebb4a 100644 --- a/src/plugins/mail-notification/mail-notification.c +++ b/src/plugins/mail-notification/mail-notification.c @@ -40,10 +40,10 @@ #include "mail/e-mail-backend.h" #include "mail/e-mail-ui-session.h" #include "mail/e-mail-view.h" +#include "mail/e-message-list.h" #include "mail/em-utils.h" #include "mail/em-event.h" #include "mail/em-folder-tree.h" -#include "mail/message-list.h" #include "shell/e-shell-view.h" #ifdef HAVE_LIBNOTIFY @@ -465,11 +465,11 @@ notify_default_action_cb (NotifyNotification *notification, g_object_get (e_shell_view_get_shell_content (shell_view), "mail-view", &mail_view, NULL); if (mail_view) { - MessageList *message_list; + EMessageList *message_list; /* Select the message. */ - message_list = MESSAGE_LIST (e_mail_reader_get_message_list (E_MAIL_READER (mail_view))); - message_list_select_uid (message_list, data->msg_uid, TRUE); + message_list = E_MESSAGE_LIST (e_mail_reader_get_message_list (E_MAIL_READER (mail_view))); + e_message_list_select_uid (message_list, data->msg_uid, TRUE); g_clear_object (&mail_view); } diff --git a/src/plugins/mail-to-task/mail-to-task.c b/src/plugins/mail-to-task/mail-to-task.c index b668efb8109be8adc9e3d69eec9c407a2acd34ae..421f6c544475ca238b26eb5d19c7d217c6dd48d7 100644 --- a/src/plugins/mail-to-task/mail-to-task.c +++ b/src/plugins/mail-to-task/mail-to-task.c @@ -37,7 +37,6 @@ #include "mail/e-mail-browser.h" #include "mail/e-mail-view.h" #include "mail/em-utils.h" -#include "mail/message-list.h" #include "calendar/gui/calendar-config.h" #include "calendar/gui/comp-util.h" diff --git a/src/plugins/mailing-list-actions/mailing-list-actions.c b/src/plugins/mailing-list-actions/mailing-list-actions.c index 571a981a3dd335279d6ee7e081086b57fcb2213d..8b799334dd33ddb0d19cba10566397c554a16eca 100644 --- a/src/plugins/mailing-list-actions/mailing-list-actions.c +++ b/src/plugins/mailing-list-actions/mailing-list-actions.c @@ -40,7 +40,6 @@ #include "mail/em-composer-utils.h" #include "mail/em-config.h" #include "mail/em-utils.h" -#include "mail/message-list.h" /* EAlert Message IDs */ #define MESSAGE_PREFIX "org.gnome.mailing-list-actions:" diff --git a/src/plugins/templates/templates.c b/src/plugins/templates/templates.c index 8dce69c7372cc7ebd21bfaf2109770f5aa1b759b..3ac5712a01d9f4c3a1ae29ecaa940324d80f2d06 100644 --- a/src/plugins/templates/templates.c +++ b/src/plugins/templates/templates.c @@ -38,7 +38,6 @@ #include "mail/e-mail-templates-store.h" #include "mail/em-composer-utils.h" #include "mail/em-utils.h" -#include "mail/message-list.h" #include "composer/e-msg-composer.h"