From 56002201ec066e97e4ec452794af3c0f9366f4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Mon, 20 Jan 2025 11:55:19 +0100 Subject: [PATCH] M!161 - Remove ESendOptionsDialog There is no user of this API. Closes: https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/161 --- .../evolution-util-docs.sgml.in | 1 - po/POTFILES.in | 2 - src/calendar/gui/CMakeLists.txt | 2 - src/calendar/gui/e-send-options-utils.c | 260 ----- src/calendar/gui/e-send-options-utils.h | 40 - src/e-util/CMakeLists.txt | 3 - src/e-util/e-send-options.c | 758 ------------- src/e-util/e-send-options.h | 153 --- src/e-util/e-send-options.ui | 1006 ----------------- src/e-util/e-util.h | 1 - 10 files changed, 2226 deletions(-) delete mode 100644 src/calendar/gui/e-send-options-utils.c delete mode 100644 src/calendar/gui/e-send-options-utils.h delete mode 100644 src/e-util/e-send-options.c delete mode 100644 src/e-util/e-send-options.h delete mode 100644 src/e-util/e-send-options.ui diff --git a/docs/reference/evolution-util/evolution-util-docs.sgml.in b/docs/reference/evolution-util/evolution-util-docs.sgml.in index ef6313d83b..02545d65b5 100644 --- a/docs/reference/evolution-util/evolution-util-docs.sgml.in +++ b/docs/reference/evolution-util/evolution-util-docs.sgml.in @@ -318,7 +318,6 @@ - diff --git a/po/POTFILES.in b/po/POTFILES.in index 11bec864c9..d05f675674 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -253,8 +253,6 @@ src/e-util/e-rule-editor.c src/e-util/e-search-bar.c src/e-util/e-selection-model-array.c src/e-util/e-selection-model.c -src/e-util/e-send-options.c -[type: gettext/glade]src/e-util/e-send-options.ui src/e-util/e-source-config.c src/e-util/e-source-config-dialog.c src/e-util/e-source-selector.c diff --git a/src/calendar/gui/CMakeLists.txt b/src/calendar/gui/CMakeLists.txt index e85154d380..f32145f5da 100644 --- a/src/calendar/gui/CMakeLists.txt +++ b/src/calendar/gui/CMakeLists.txt @@ -74,7 +74,6 @@ set(SOURCES e-month-view.c e-select-names-editable.c e-select-names-renderer.c - e-send-options-utils.c e-task-table.c e-to-do-pane.c e-week-view.c @@ -154,7 +153,6 @@ set(HEADERS e-month-view.h e-select-names-editable.h e-select-names-renderer.h - e-send-options-utils.h e-task-table.h e-to-do-pane.h e-week-view-event-item.h diff --git a/src/calendar/gui/e-send-options-utils.c b/src/calendar/gui/e-send-options-utils.c deleted file mode 100644 index c8ae310778..0000000000 --- a/src/calendar/gui/e-send-options-utils.c +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Evolution calendar - Timezone selector dialog - * - * 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: - * Damon Chaplin - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "evolution-config.h" - -#include "e-send-options-utils.h" - -#include -#include - -void -e_send_options_utils_set_default_data (ESendOptionsDialog *sod, - ESource *source, - const gchar *type) -{ - ESendOptionsGeneral *gopts = NULL; - ESendOptionsStatusTracking *sopts; - ESourceExtension *extension; - const gchar *extension_name; - gchar *value; - - /* FIXME These is all GroupWise-specific settings. - * They absolutely do not belong here. */ - - extension_name = "GroupWise Backend"; - - if (!e_source_has_extension (source, extension_name)) - return; - - extension = e_source_get_extension (source, extension_name); - - gopts = sod->data->gopts; - sopts = sod->data->sopts; - - /* priority */ - g_object_get (extension, "priority", &value, NULL); - if (value) { - if (!strcmp (value, "high")) - gopts->priority = E_PRIORITY_HIGH; - else if (!strcmp (value, "standard")) - gopts->priority = E_PRIORITY_STANDARD; - else if (!strcmp (value, "low")) - gopts->priority = E_PRIORITY_LOW; - else - gopts->priority = E_PRIORITY_UNDEFINED; - } - g_free (value); - - /* Reply requested */ - g_object_get (extension, "reply-requested", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - gopts->reply_enabled = FALSE; - else if (!strcmp (value, "convinient")) { - gopts->reply_enabled = TRUE; - gopts->reply_convenient = TRUE; - } else { - gint i = atoi (value); - gopts->reply_within = i; - } - } - g_free (value); - - /* Delay delivery */ - g_object_get (extension, "delivery-delay", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - gopts->delay_enabled = FALSE; - else { - ICalTime *itt; - - itt = i_cal_time_new_from_string (value); - - gopts->delay_enabled = TRUE; - gopts->delay_until = i_cal_time_as_timet (itt); - - g_clear_object (&itt); - } - } - g_free (value); - - /* Expiration Date */ - g_object_get (extension, "expiration", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - gopts->expiration_enabled = FALSE; - else { - gint i = atoi (value); - if (i == 0) - gopts->expiration_enabled = FALSE; - else - gopts->expiration_enabled = TRUE; - gopts->expire_after = i; - } - } - g_free (value); - - /* status tracking */ - g_object_get (extension, "status-tracking", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - sopts->tracking_enabled = FALSE; - else { - sopts->tracking_enabled = TRUE; - if (!strcmp (value, "delivered")) - sopts->track_when = E_DELIVERED; - else if (!strcmp (value, "delivered-opened")) - sopts->track_when = E_DELIVERED_OPENED; - else - sopts->track_when = E_ALL; - } - } - g_free (value); - - /* Return Notifications */ - - g_object_get (extension, "return-open", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - sopts->opened = E_RETURN_NOTIFY_NONE; - else - sopts->opened = E_RETURN_NOTIFY_MAIL; - } - g_free (value); - - g_object_get (extension, "return-accept", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - sopts->accepted = E_RETURN_NOTIFY_NONE; - else - sopts->accepted = E_RETURN_NOTIFY_MAIL; - } - g_free (value); - - g_object_get (extension, "return-decline", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - sopts->declined = E_RETURN_NOTIFY_NONE; - else - sopts->declined = E_RETURN_NOTIFY_MAIL; - } - g_free (value); - - g_object_get (extension, "return-complete", &value, NULL); - if (value) { - if (!strcmp (value, "none")) - sopts->completed = E_RETURN_NOTIFY_NONE; - else - sopts->completed = E_RETURN_NOTIFY_MAIL; - } - g_free (value); -} - -static ICalProperty * -esnd_opts_new_property_take_value (gchar *value) -{ - ICalProperty *prop; - - prop = i_cal_property_new_x (value); - - g_free (value); - - return prop; -} - -void -e_send_options_utils_fill_component (ESendOptionsDialog *sod, - ECalComponent *comp, - ICalTimezone *zone) -{ - ICalProperty *prop; - ICalComponent *icomp; - ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; - - gopts = sod->data->gopts; - sopts = sod->data->sopts; - - icomp = e_cal_component_get_icalcomponent (comp); - - if (e_send_options_get_need_general_options (sod)) { - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", gopts->priority)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-PRIORITY"); - i_cal_component_take_property (icomp, prop); - - if (gopts->reply_enabled) { - if (gopts->reply_convenient) - prop = i_cal_property_new_x ("convenient"); - else - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", gopts->reply_within)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-REPLY"); - i_cal_component_take_property (icomp, prop); - } - - if (gopts->expiration_enabled && gopts->expire_after) { - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", gopts->expire_after)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-EXPIRE"); - i_cal_component_take_property (icomp, prop); - } - - if (gopts->delay_enabled) { - ICalTime *temp; - gchar *str; - - temp = i_cal_time_new_from_timet_with_zone (gopts->delay_until, FALSE, zone); - - str = i_cal_time_as_ical_string (temp); - prop = i_cal_property_new_x (str); - g_free (str); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-DELAY"); - i_cal_component_take_property (icomp, prop); - - g_clear_object (&temp); - } - } - - if (sopts->tracking_enabled) - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", sopts->track_when)); - else - prop = i_cal_property_new_x ("0"); - - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-TRACKINFO"); - i_cal_component_take_property (icomp, prop); - - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", sopts->opened)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED"); - i_cal_component_take_property (icomp, prop); - - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", sopts->accepted)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-ACCEPTED"); - i_cal_component_take_property (icomp, prop); - - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", sopts->declined)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-DECLINED"); - i_cal_component_take_property (icomp, prop); - - prop = esnd_opts_new_property_take_value (g_strdup_printf ("%d", sopts->completed)); - i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-COMPLETED"); - i_cal_component_take_property (icomp, prop); -} diff --git a/src/calendar/gui/e-send-options-utils.h b/src/calendar/gui/e-send-options-utils.h deleted file mode 100644 index 592b26ff45..0000000000 --- a/src/calendar/gui/e-send-options-utils.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Evolution calendar - Timezone selector dialog - * - * 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: - * Damon Chaplin - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef __E_SENDOPTIONS_UTILS_H__ -#define __E_SENDOPTIONS_UTILS_H__ - -#include - -#include - -void e_send_options_utils_set_default_data - (ESendOptionsDialog *sod, - ESource *source, - const gchar *type); -void e_send_options_utils_fill_component - (ESendOptionsDialog *sod, - ECalComponent *comp, - ICalTimezone *zone); - -#endif diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt index 95fcb3fdd9..8f79f9e159 100644 --- a/src/e-util/CMakeLists.txt +++ b/src/e-util/CMakeLists.txt @@ -8,7 +8,6 @@ add_error_files(e-util ) set(uifiles - e-send-options.ui e-table-config.ui e-timezone-dialog.ui filter.ui @@ -211,7 +210,6 @@ set(SOURCES e-selection-model-simple.c e-selection-model.c e-selection.c - e-send-options.c e-simple-async-result.c e-sorter-array.c e-sorter.c @@ -495,7 +493,6 @@ set(HEADERS e-selection-model-simple.h e-selection-model.h e-selection.h - e-send-options.h e-simple-async-result.h e-sorter-array.h e-sorter.h diff --git a/src/e-util/e-send-options.c b/src/e-util/e-send-options.c deleted file mode 100644 index fe8ae1284e..0000000000 --- a/src/e-util/e-send-options.c +++ /dev/null @@ -1,758 +0,0 @@ -/* - * Evolution calendar - Main page of the Groupwise send options Dialog - * - * 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: - * Chenthill Palanisamy - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "evolution-config.h" - -#include "e-send-options.h" - -#include -#include -#include - -#include "e-dateedit.h" -#include "e-misc-utils.h" -#include "e-util-private.h" - -struct _ESendOptionsDialogPrivate { - GtkBuilder *builder; - - gboolean gopts_needed; - gboolean global; - - /* Widgets */ - - GtkWidget *main; - - /* Noteboook to add options page and status tracking page*/ - GtkNotebook *notebook; - - GtkWidget *status; - - /* priority */ - GtkWidget *priority; - - /* Security */ - GtkWidget *security; - - /* Widgets for Reply Requestion options */ - GtkWidget *reply_request; - GtkWidget *reply_convenient; - GtkWidget *reply_within; - GtkWidget *within_days; - - /* Widgets for delay delivery Option */ - GtkWidget *delay_delivery; - GtkWidget *delay_until; - - /* Widgets for Choosing expiration date */ - GtkWidget *expiration; - GtkWidget *expire_after; - - /* Widgets to for tracking information through sent Item */ - GtkWidget *create_sent; - GtkWidget *delivered; - GtkWidget *delivered_opened; - GtkWidget *all_info; - GtkWidget *autodelete; - - /* Widgets for setting the Return Notification */ - GtkWidget *when_opened; - GtkWidget *when_declined; - GtkWidget *when_accepted; - GtkWidget *when_completed; - - /* label widgets */ - GtkWidget *security_label; - GtkWidget *priority_label; - GtkWidget *gopts_label; - GtkWidget *opened_label; - GtkWidget *declined_label; - GtkWidget *accepted_label; - GtkWidget *completed_label; - GtkWidget *until_label; - gchar *help_section; -}; - -static void e_send_options_dialog_finalize (GObject *object); -static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data); - -enum { - SOD_RESPONSE, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = {0}; - -G_DEFINE_TYPE_WITH_PRIVATE (ESendOptionsDialog, e_send_options_dialog, G_TYPE_OBJECT) - -static void -e_send_options_get_widgets_data (ESendOptionsDialog *sod) -{ - ESendOptionsDialogPrivate *priv; - ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; - - priv = sod->priv; - gopts = sod->data->gopts; - sopts = sod->data->sopts; - - gopts->priority = gtk_combo_box_get_active ((GtkComboBox *) priv->priority); - gopts->security = gtk_combo_box_get_active ((GtkComboBox *) priv->security); - - gopts->reply_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_request)); - gopts->reply_convenient = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_convenient)); - gopts->reply_within = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->within_days)); - - gopts->expiration_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->expiration)); - gopts->expire_after = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->expire_after)); - gopts->delay_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delay_delivery)); - - if (e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until)) && - e_date_edit_time_is_valid (E_DATE_EDIT (priv->delay_until))) - gopts->delay_until = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until)); - - sopts->tracking_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->create_sent)); - - sopts->autodelete = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->autodelete)); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delivered))) - sopts->track_when = E_DELIVERED; - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delivered_opened))) - sopts->track_when = E_DELIVERED_OPENED; - else - sopts->track_when = E_ALL; - - sopts->opened = gtk_combo_box_get_active ((GtkComboBox *) priv->when_opened); - sopts->accepted = gtk_combo_box_get_active ((GtkComboBox *) priv->when_accepted); - sopts->declined = gtk_combo_box_get_active ((GtkComboBox *) priv->when_declined); - sopts->completed = gtk_combo_box_get_active ((GtkComboBox *) priv->when_completed); -} - -static void -e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod) -{ - ESendOptionsDialogPrivate *priv; - ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; - time_t tmp; - - priv = sod->priv; - gopts = sod->data->gopts; - sopts = sod->data->sopts; - tmp = time (NULL); - - gtk_combo_box_set_active ((GtkComboBox *) priv->priority, gopts->priority); - gtk_combo_box_set_active ((GtkComboBox *) priv->security, gopts->security); - - if (gopts->reply_enabled) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), FALSE); - - if (gopts->reply_convenient) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_convenient), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_within), TRUE); - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->within_days), (gdouble) gopts->reply_within); - - if (gopts->expiration_enabled) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->expiration), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->expiration), FALSE); - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->expire_after), (gdouble) gopts->expire_after); - - if (gopts->delay_enabled) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delay_delivery), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delay_delivery), FALSE); - - if (!gopts->delay_until || difftime (gopts->delay_until, tmp) < 0) - e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0); - else - e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), gopts->delay_until); - - if (sopts->tracking_enabled) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->create_sent), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->create_sent), FALSE); - - if (sopts->autodelete) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->autodelete), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->autodelete), FALSE); - - switch (sopts->track_when) { - case E_DELIVERED: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delivered), TRUE); - break; - case E_DELIVERED_OPENED: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delivered_opened), TRUE); - break; - case E_ALL: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->all_info), TRUE); - } - - gtk_combo_box_set_active ((GtkComboBox *) priv->when_opened, sopts->opened); - gtk_combo_box_set_active ((GtkComboBox *) priv->when_declined, sopts->declined); - gtk_combo_box_set_active ((GtkComboBox *) priv->when_accepted, sopts->accepted); - gtk_combo_box_set_active ((GtkComboBox *) priv->when_completed, sopts->completed); -} - -static void -sensitize_widgets (ESendOptionsDialog *sod) -{ - ESendOptionsDialogPrivate *priv; - ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; - - priv = sod->priv; - gopts = sod->data->gopts; - sopts = sod->data->sopts; - - if (!gopts->reply_enabled) { - gtk_widget_set_sensitive (priv->reply_convenient, FALSE); - gtk_widget_set_sensitive (priv->reply_within, FALSE); - gtk_widget_set_sensitive (priv->within_days, FALSE); - } - - if (!gopts->expiration_enabled) - gtk_widget_set_sensitive (priv->expire_after, FALSE); - - if (!gopts->delay_enabled) { - gtk_widget_set_sensitive (priv->delay_until, FALSE); - } - - if (!sopts->tracking_enabled) { - gtk_widget_set_sensitive (priv->delivered, FALSE); - gtk_widget_set_sensitive (priv->delivered_opened, FALSE); - gtk_widget_set_sensitive (priv->all_info, FALSE); - gtk_widget_set_sensitive (priv->autodelete, FALSE); - } -} - -static void -expiration_toggled_cb (GtkToggleButton *toggle, - gpointer data) -{ - gboolean active; - ESendOptionsDialog *sod; - ESendOptionsDialogPrivate *priv; - - sod = data; - priv = sod->priv; - - active = gtk_toggle_button_get_active (toggle); - - gtk_widget_set_sensitive (priv->expire_after, active); -} - -static void -reply_request_toggled_cb (GtkToggleButton *toggle, - gpointer data) -{ - gboolean active; - ESendOptionsDialog *sod; - ESendOptionsDialogPrivate *priv; - - sod = data; - priv = sod->priv; - active = gtk_toggle_button_get_active (toggle); - - gtk_widget_set_sensitive (priv->reply_convenient, active); - gtk_widget_set_sensitive (priv->reply_within, active); - gtk_widget_set_sensitive (priv->within_days, active); - -} - -static void -delay_delivery_toggled_cb (GtkToggleButton *toggle, - gpointer data) -{ - gboolean active; - ESendOptionsDialog *sod; - ESendOptionsDialogPrivate *priv; - - sod = data; - priv = sod->priv; - active = gtk_toggle_button_get_active (toggle); - - gtk_widget_set_sensitive (priv->delay_until, active); -} - -static void -sent_item_toggled_cb (GtkToggleButton *toggle, - gpointer data) -{ - gboolean active; - ESendOptionsDialog *sod; - ESendOptionsDialogPrivate *priv; - - sod = data; - priv = sod->priv; - active = gtk_toggle_button_get_active (toggle); - - gtk_widget_set_sensitive (priv->delivered, active); - gtk_widget_set_sensitive (priv->delivered_opened, active); - gtk_widget_set_sensitive (priv->all_info, active); - gtk_widget_set_sensitive (priv->autodelete, active); -} - -static void -delay_until_date_changed_cb (GtkWidget *dedit, - gpointer data) -{ - ESendOptionsDialog *sod; - ESendOptionsDialogPrivate *priv; - time_t tmp, current; - - sod = data; - priv = sod->priv; - - current = time (NULL); - tmp = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until)); - - if ((difftime (tmp, current) < 0) || !e_date_edit_time_is_valid (E_DATE_EDIT (priv->delay_until)) - || !e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until))) - e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0); - -} -static void -page_changed_cb (GtkNotebook *notebook, - GtkWidget *page, - gint num, - gpointer data) -{ - ESendOptionsDialog *sod = data; - ESendOptionsDialogPrivate *priv = sod->priv; - - e_send_options_get_widgets_data (sod); - if (num > 0) { - GtkWidget *child; - - if (num == 1) { - gtk_widget_hide (priv->accepted_label); - gtk_widget_hide (priv->when_accepted); - gtk_widget_hide (priv->completed_label); - gtk_widget_hide (priv->when_completed); - gtk_widget_set_sensitive (priv->autodelete, TRUE); - sod->data->sopts = sod->data->mopts; - - child = gtk_notebook_get_nth_page (notebook, 1); - if (child != priv->status && (!GTK_IS_BIN (child) || gtk_bin_get_child (GTK_BIN (child)) != priv->status)) - gtk_widget_reparent (priv->status, child); - } else if (num == 2) { - gtk_widget_hide (priv->completed_label); - gtk_widget_hide (priv->when_completed); - gtk_widget_set_sensitive (priv->autodelete, FALSE); - - gtk_widget_show (priv->accepted_label); - gtk_widget_show (priv->when_accepted); - sod->data->sopts = sod->data->copts; - - child = gtk_notebook_get_nth_page (notebook, 2); - if (gtk_bin_get_child (GTK_BIN (child)) != priv->status) - gtk_widget_reparent (priv->status, child); - } else { - gtk_widget_set_sensitive (priv->autodelete, FALSE); - - gtk_widget_show (priv->completed_label); - gtk_widget_show (priv->when_completed); - gtk_widget_show (priv->accepted_label); - gtk_widget_show (priv->when_accepted); - sod->data->sopts = sod->data->topts; - - child = gtk_notebook_get_nth_page (notebook, 3); - if (gtk_bin_get_child (GTK_BIN (child)) != priv->status) - gtk_widget_reparent (priv->status, child); - } - } - e_send_options_fill_widgets_with_data (sod); -} - -static void -init_widgets (ESendOptionsDialog *sod) -{ - ESendOptionsDialogPrivate *priv; - - priv = sod->priv; - - g_signal_connect ( - priv->expiration, "toggled", - G_CALLBACK (expiration_toggled_cb), sod); - g_signal_connect ( - priv->reply_request, "toggled", - G_CALLBACK (reply_request_toggled_cb), sod); - g_signal_connect ( - priv->delay_delivery, "toggled", - G_CALLBACK (delay_delivery_toggled_cb), sod); - g_signal_connect ( - priv->create_sent, "toggled", - G_CALLBACK (sent_item_toggled_cb), sod); - - g_signal_connect ( - priv->main, "response", - G_CALLBACK (e_send_options_cb), sod); - g_signal_connect ( - priv->delay_until, "changed", - G_CALLBACK (delay_until_date_changed_cb), sod); - - if (priv->global) - g_signal_connect ( - priv->notebook, "switch-page", - G_CALLBACK (page_changed_cb), sod); - -} - -static gboolean -get_widgets (ESendOptionsDialog *sod) -{ - ESendOptionsDialogPrivate *priv; - GtkBuilder *builder; - - priv = sod->priv; - builder = sod->priv->builder; - - priv->main = e_builder_get_widget (builder, "send-options-dialog"); - if (!priv->main) - return FALSE; - - priv->priority = e_builder_get_widget (builder, "combo-priority"); - priv->status = e_builder_get_widget (builder, "status-tracking"); - priv->security = e_builder_get_widget (builder, "security-combo"); - priv->notebook = (GtkNotebook *) e_builder_get_widget (builder, "notebook"); - priv->reply_request = e_builder_get_widget (builder, "reply-request-button"); - priv->reply_convenient = e_builder_get_widget (builder, "reply-convinient"); - priv->reply_within = e_builder_get_widget (builder, "reply-within"); - priv->within_days = e_builder_get_widget (builder, "within-days"); - priv->delay_delivery = e_builder_get_widget (builder, "delay-delivery-button"); - priv->delay_until = e_builder_get_widget (builder, "until-date"); - gtk_widget_show (priv->delay_until); - priv->expiration = e_builder_get_widget (builder, "expiration-button"); - priv->expire_after = e_builder_get_widget (builder, "expire-after"); - priv->create_sent = e_builder_get_widget (builder, "create-sent-button"); - priv->delivered = e_builder_get_widget (builder, "delivered"); - priv->delivered_opened = e_builder_get_widget (builder, "delivered-opened"); - priv->all_info = e_builder_get_widget (builder, "all-info"); - priv->autodelete = e_builder_get_widget (builder, "autodelete"); - priv->when_opened = e_builder_get_widget (builder, "open-combo"); - priv->when_declined = e_builder_get_widget (builder, "delete-combo"); - priv->when_accepted = e_builder_get_widget (builder, "accept-combo"); - priv->when_completed = e_builder_get_widget (builder, "complete-combo"); - priv->security_label = e_builder_get_widget (builder, "security-label"); - priv->gopts_label = e_builder_get_widget (builder, "gopts-label"); - priv->priority_label = e_builder_get_widget (builder, "priority-label"); - priv->until_label = e_builder_get_widget (builder, "until-label"); - priv->opened_label = e_builder_get_widget (builder, "opened-label"); - priv->declined_label = e_builder_get_widget (builder, "declined-label"); - priv->accepted_label = e_builder_get_widget (builder, "accepted-label"); - priv->completed_label = e_builder_get_widget (builder, "completed-label"); - - return (priv->priority - && priv->security - && priv->status - && priv->reply_request - && priv->reply_convenient - && priv->reply_within - && priv->within_days - && priv->delay_delivery - && priv->delay_until - && priv->expiration - && priv->expire_after - && priv->create_sent - && priv->delivered - && priv->delivered_opened - && priv->autodelete - && priv->all_info - && priv->when_opened - && priv->when_declined - && priv->when_accepted - && priv->when_completed - && priv->security_label - && priv->priority_label - && priv->opened_label - && priv->gopts_label - && priv->declined_label - && priv->accepted_label - && priv->completed_label); - -} - -static void -setup_widgets (ESendOptionsDialog *sod, - Item_type type) -{ - ESendOptionsDialogPrivate *priv; - - priv = sod->priv; - - gtk_notebook_set_show_border (priv->notebook, FALSE); - if (!priv->gopts_needed) { - gtk_notebook_set_show_tabs (priv->notebook, FALSE); - gtk_notebook_set_current_page (priv->notebook, 1); - gtk_widget_hide (priv->delay_until); - } else - gtk_notebook_set_show_tabs (priv->notebook, TRUE); - - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->priority_label), priv->priority); - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->security_label), priv->security); - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->accepted_label), priv->when_accepted); - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->declined_label), priv->when_declined); - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->opened_label), priv->when_opened); - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->completed_label), priv->when_completed); - gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until); - - if (priv->global) { - GtkWidget *widget, *page; - - widget = gtk_label_new (_("Mail")); - page = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - gtk_widget_reparent (priv->status, page); - gtk_notebook_append_page (priv->notebook, page, widget); - gtk_container_child_set (GTK_CONTAINER (priv->notebook), page, "tab-fill", FALSE, "tab-expand", FALSE, NULL); - gtk_widget_show (page); - gtk_widget_show (widget); - - widget = gtk_label_new (_("Calendar")); - page = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - gtk_notebook_append_page (priv->notebook, page, widget); - gtk_container_child_set (GTK_CONTAINER (priv->notebook), page, "tab-fill", FALSE, "tab-expand", FALSE, NULL); - gtk_widget_show (page); - gtk_widget_show (widget); - - widget = gtk_label_new (_("Task")); - page = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - gtk_notebook_append_page (priv->notebook, page, widget); - gtk_container_child_set (GTK_CONTAINER (priv->notebook), page, "tab-fill", FALSE, "tab-expand", FALSE, NULL); - gtk_widget_show (page); - gtk_widget_show (widget); - - gtk_notebook_set_show_tabs (priv->notebook, TRUE); - } - - switch (type) { - case E_ITEM_MAIL: - priv->help_section = g_strdup ("groupwise-placeholder"); - gtk_widget_hide (priv->accepted_label); - gtk_widget_hide (priv->when_accepted); - gtk_widget_hide (priv->completed_label); - gtk_widget_hide (priv->when_completed); - gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->declined_label), (_("When de_leted:"))); - break; - case E_ITEM_CALENDAR: - priv->help_section = g_strdup ("groupwise-placeholder"); - gtk_widget_hide (priv->completed_label); - gtk_widget_hide (priv->when_completed); - break; - case E_ITEM_TASK: - priv->help_section = g_strdup ("groupwise-placeholder"); - gtk_widget_hide (priv->security_label); - gtk_widget_hide (priv->security); - gtk_widget_set_sensitive (priv->autodelete, FALSE); - break; - default: - break; - } -} - -ESendOptionsDialog * -e_send_options_dialog_new (void) -{ - ESendOptionsDialog *sod; - - sod = g_object_new (E_TYPE_SEND_OPTIONS_DIALOG, NULL); - - return sod; -} - -void -e_send_options_set_need_general_options (ESendOptionsDialog *sod, - gboolean needed) -{ - g_return_if_fail (E_IS_SEND_OPTIONS_DIALOG (sod)); - - sod->priv->gopts_needed = needed; -} - -gboolean -e_send_options_get_need_general_options (ESendOptionsDialog *sod) -{ - g_return_val_if_fail (E_IS_SEND_OPTIONS_DIALOG (sod), FALSE); - - return sod->priv->gopts_needed; -} - -gboolean -e_send_options_set_global (ESendOptionsDialog *sod, - gboolean set) -{ - g_return_val_if_fail (E_IS_SEND_OPTIONS_DIALOG (sod), FALSE); - - sod->priv->global = set; - - return TRUE; -} - -static void -e_send_options_cb (GtkDialog *dialog, - gint state, - gpointer func_data) -{ - ESendOptionsDialogPrivate *priv; - ESendOptionsDialog *sod; - - sod = func_data; - priv = sod->priv; - - switch (state) { - case GTK_RESPONSE_OK: - e_send_options_get_widgets_data (sod); - /* coverity[fallthrough] */ - /* falls through */ - case GTK_RESPONSE_CANCEL: - gtk_widget_hide (priv->main); - gtk_widget_destroy (priv->main); - g_object_unref (priv->builder); - break; - case GTK_RESPONSE_HELP: - e_display_help ( - GTK_WINDOW (priv->main), - priv->help_section); - break; - } - - g_signal_emit (func_data, signals[SOD_RESPONSE], 0, state); -} - -gboolean -e_send_options_dialog_run (ESendOptionsDialog *sod, - GtkWidget *parent, - Item_type type) -{ - ESendOptionsDialogPrivate *priv; - GtkWidget *toplevel; - - g_return_val_if_fail (sod != NULL || E_IS_SEND_OPTIONS_DIALOG (sod), FALSE); - - priv = sod->priv; - - /* Make sure our custom widget classes are registered with - * GType before we load the GtkBuilder definition file. */ - g_type_ensure (E_TYPE_DATE_EDIT); - - priv->builder = gtk_builder_new (); - e_load_ui_builder_definition (priv->builder, "e-send-options.ui"); - - if (!get_widgets (sod)) { - g_object_unref (priv->builder); - g_message (G_STRLOC ": Could not get the Widgets \n"); - return FALSE; - } - - if (priv->global) { - g_free (sod->data->sopts); - sod->data->sopts = sod->data->mopts; - } - - setup_widgets (sod, type); - - toplevel = gtk_widget_get_toplevel (priv->main); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW (toplevel), - GTK_WINDOW (parent)); - - e_send_options_fill_widgets_with_data (sod); - sensitize_widgets (sod); - init_widgets (sod); - gtk_window_set_modal ((GtkWindow *) priv->main, TRUE); - - gtk_widget_show (priv->main); - - return TRUE; -} - -static void -e_send_options_dialog_finalize (GObject *object) -{ - ESendOptionsDialog *sod; - - sod = E_SEND_OPTIONS_DIALOG (object); - - g_free (sod->priv->help_section); - - g_free (sod->data->gopts); - - if (!sod->priv->global) - g_free (sod->data->sopts); - - g_free (sod->data->mopts); - g_free (sod->data->copts); - g_free (sod->data->topts); - g_free (sod->data); - - /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (e_send_options_dialog_parent_class)->finalize (object); -} - -/* Object initialization function for the task page */ -static void -e_send_options_dialog_init (ESendOptionsDialog *sod) -{ - ESendOptionsData *new; - - new = g_new0 (ESendOptionsData, 1); - new->gopts = g_new0 (ESendOptionsGeneral, 1); - new->sopts = g_new0 (ESendOptionsStatusTracking, 1); - new->mopts = g_new0 (ESendOptionsStatusTracking, 1); - new->copts = g_new0 (ESendOptionsStatusTracking, 1); - new->topts = g_new0 (ESendOptionsStatusTracking, 1); - - sod->priv = e_send_options_dialog_get_instance_private (sod); - - sod->data = new; - sod->data->initialized = FALSE; - sod->data->gopts->security = 0; - - sod->priv->gopts_needed = TRUE; -} - -/* Class initialization function for the Send Options */ -static void -e_send_options_dialog_class_init (ESendOptionsDialogClass *class) -{ - GObjectClass *object_class; - - object_class = G_OBJECT_CLASS (class); - object_class->finalize = e_send_options_dialog_finalize; - - signals[SOD_RESPONSE] = g_signal_new ( - "sod_response", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (ESendOptionsDialogClass, sod_response), - NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, - G_TYPE_INT); -} diff --git a/src/e-util/e-send-options.h b/src/e-util/e-send-options.h deleted file mode 100644 index 49ea559f0e..0000000000 --- a/src/e-util/e-send-options.h +++ /dev/null @@ -1,153 +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: - * Damon Chaplin - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION) -#error "Only should be included directly." -#endif - -#ifndef E_SEND_OPTIONS_DIALOG_H -#define E_SEND_OPTIONS_DIALOG_H - -#include -#include - -/* Standard GObject macros */ -#define E_TYPE_SEND_OPTIONS_DIALOG \ - (e_send_options_dialog_get_type ()) -#define E_SEND_OPTIONS_DIALOG(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialog)) -#define E_SEND_OPTIONS_DIALOG_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialogClass)) -#define E_IS_SEND_OPTIONS_DIALOG(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), E_TYPE_SEND_OPTIONS_DIALOG)) -#define E_IS_SEND_OPTIONS_DIALOG_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), E_TYPE_SEND_OPTIONS_DIALOG)) -#define E_SEND_OPTIONS_DIALOG_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), E_TYPE_SEND_OPTIONS_DIALOG, ESendOptionsDialogClass)) - -G_BEGIN_DECLS - -typedef struct _ESendOptionsDialog ESendOptionsDialog; -typedef struct _ESendOptionsDialogClass ESendOptionsDialogClass; -typedef struct _ESendOptionsDialogPrivate ESendOptionsDialogPrivate; - -typedef enum { - E_ITEM_NONE, - E_ITEM_MAIL, - E_ITEM_CALENDAR, - E_ITEM_TASK -} Item_type; - -typedef enum { - E_PRIORITY_UNDEFINED, - E_PRIORITY_HIGH, - E_PRIORITY_STANDARD, - E_PRIORITY_LOW -} ESendOptionsPriority; - -typedef enum { - E_SECURITY_NORMAL, - E_SECURITY_PROPRIETARY, - E_SECURITY_CONFIDENTIAL, - E_SECURITY_SECRET, - E_SECURITY_TOP_SECRET, - E_SECURITY_FOR_YOUR_EYES_ONLY -} ESendOptionsSecurity; - -typedef enum { - E_RETURN_NOTIFY_NONE, - E_RETURN_NOTIFY_MAIL -} ESendOptionsReturnNotify; - -typedef enum { - E_DELIVERED = 1, - E_DELIVERED_OPENED = 2, - E_ALL = 3 -} TrackInfo; - -typedef struct { - ESendOptionsPriority priority; - gint classify; - gboolean reply_enabled; - gboolean reply_convenient; - gint reply_within; - gboolean expiration_enabled; - gint expire_after; - gboolean delay_enabled; - time_t delay_until; - gint security; -} ESendOptionsGeneral; - -typedef struct { - gboolean tracking_enabled; - TrackInfo track_when; - gboolean autodelete; - ESendOptionsReturnNotify opened; - ESendOptionsReturnNotify accepted; - ESendOptionsReturnNotify declined; - ESendOptionsReturnNotify completed; -} ESendOptionsStatusTracking; - -typedef struct { - gboolean initialized; - - ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; - ESendOptionsStatusTracking *mopts; - ESendOptionsStatusTracking *copts; - ESendOptionsStatusTracking *topts; -} ESendOptionsData; - -struct _ESendOptionsDialog { - GObject parent; - - ESendOptionsData *data; - ESendOptionsDialogPrivate *priv; -}; - -struct _ESendOptionsDialogClass { - GObjectClass parent_class; - - void (*sod_response) (ESendOptionsDialog *sod, - gint status); -}; - -GType e_send_options_dialog_get_type (void) G_GNUC_CONST; -ESendOptionsDialog * - e_send_options_dialog_new (void); -void e_send_options_set_need_general_options - (ESendOptionsDialog *sod, - gboolean needed); -gboolean e_send_options_get_need_general_options - (ESendOptionsDialog *sod); -gboolean e_send_options_dialog_run (ESendOptionsDialog *sod, - GtkWidget *parent, - Item_type type); -gboolean e_send_options_set_global (ESendOptionsDialog *sod, - gboolean set); - -#endif /* E_SEND_OPTIONS_DIALOG_H */ diff --git a/src/e-util/e-send-options.ui b/src/e-util/e-send-options.ui deleted file mode 100644 index b324e0283c..0000000000 --- a/src/e-util/e-send-options.ui +++ /dev/null @@ -1,1006 +0,0 @@ - - - - - - 100 - 5 - 1 - 10 - - - 100 - 2 - 1 - 10 - - - - - - - - - Undefined - - - High - - - Standard - - - Low - - - - - - - - - - - Normal - - - Proprietary - - - Confidential - - - Secret - - - Top Secret - - - For Your Eyes Only - - - - - - - - - - - None - - - Mail Receipt - - - - - - - - - - - None - - - Mail Receipt - - - - - - - - - - - None - - - Mail Receipt - - - - - - - - - - - None - - - Mail Receipt - - - - - True - False - True - Send Options - False - True - mouse - dialog - - - True - False - True - - - True - False - end - - - _Help - True - True - True - False - True - - - False - False - 0 - - - - - _Cancel - True - True - True - False - True - - - False - False - 1 - - - - - _OK - True - True - True - False - True - - - False - False - 2 - - - - - False - False - end - 0 - - - - - True - True - - - True - False - 12 - 4 - 4 - 12 - 12 - - - True - False - 0 - - - 2 - 4 - 1 - 2 - - - - - - True - False - 0 - none - - - True - False - 12 - 2 - 3 - 12 - 12 - - - R_eply requested - True - True - False - True - True - - - 3 - GTK_FILL - - - - - - True - False - 0 - 12 - - - True - False - 2 - 3 - 12 - 12 - - - Wi_thin - True - True - False - True - True - - - 1 - 2 - GTK_FILL - - - - - - True - True - adjustment1 - 1 - - - 1 - 2 - 1 - 2 - - - - - - True - False - days - 0 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - _When convenient - True - True - False - True - True - reply-within - - - 3 - GTK_FILL - - - - - - - - 3 - 1 - 2 - - - - - - - - - True - False - Replies - - - - - - - - 4 - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - none - - - True - False - 12 - 4 - 2 - - - _Delay message delivery - True - True - False - True - True - - - GTK_FILL - - - - - - True - False - 0 - - - 1 - 2 - - - - - - True - False - 12 - - - True - False - 12 - 12 - - - True - False - _After - True - expire-after - 0 - - - False - False - 0 - - - - - True - True - adjustment2 - 1 - - - False - False - 1 - - - - - True - False - days - 0 - - - False - False - 2 - - - - - - - 2 - 3 - 4 - GTK_EXPAND - - - - - _Set expiration date - True - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - False - 12 - - - True - True - 12 - 12 - - - True - False - _Until - True - until-date - 0 - - - False - False - 0 - - - - - True - - - False - False - 1 - - - - - - - 2 - 1 - 2 - - - - - - - - True - False - Delivery Options - - - - - - - - 4 - 3 - 4 - GTK_FILL - - - - - - - - - - - - True - False - model1 - - - - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - _Priority: - True - combo-priority - 1 - - - 1 - 2 - - - - - - True - False - _Classification: - True - security-combo - 1 - - - GTK_FILL - - - - - - True - False - model2 - - - - 0 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - - - True - False - Gene_ral Options - True - - - False - - - - - True - False - 12 - 12 - - - True - False - 0 - none - - - True - False - 12 - - - True - False - 12 - 12 - - - Creat_e a sent item to track information - True - True - False - True - True - - - False - False - 0 - - - - - True - False - 19 - - - _Delivered - True - True - False - True - True - - - - - False - False - 1 - - - - - True - False - 19 - - - Deli_vered and opened - True - True - False - True - True - delivered - - - - - False - False - 2 - - - - - True - False - 19 - - - _All information - True - True - False - True - True - delivered - - - - - False - False - 3 - - - - - True - False - 19 - - - A_uto-delete sent item - True - True - False - True - True - - - - - False - False - 4 - - - - - - - - - True - False - Status Tracking - True - - - - - - - - False - False - 0 - - - - - True - False - 0 - none - - - True - False - 12 - - - True - False - 12 - 4 - 2 - 12 - 12 - - - True - False - _When opened: - True - open-combo - 1 - - - GTK_FILL - - - - - - True - False - When decli_ned: - True - delete-combo - 1 - - - 1 - 2 - GTK_FILL - - - - - - True - False - When co_mpleted: - True - complete-combo - 0 - - - 3 - 4 - GTK_FILL - - - - - - True - False - When acce_pted: - True - accept-combo - 1 - - - 2 - 3 - GTK_FILL - - - - - - True - False - model3 - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - True - False - model4 - - - - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - model5 - - - - 0 - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - False - model6 - - - - 0 - - - - - 1 - 2 - 3 - 4 - - - - - - - - - True - False - Return Notification - True - - - - - - - - False - False - 1 - - - - - 1 - - - - - True - False - Sta_tus Tracking - True - - - 1 - False - - - - - False - True - 2 - - - - - - helpbutton1 - cancelbutton1 - okbutton1 - - - diff --git a/src/e-util/e-util.h b/src/e-util/e-util.h index 8aae005b10..5ec314d622 100644 --- a/src/e-util/e-util.h +++ b/src/e-util/e-util.h @@ -199,7 +199,6 @@ #include #include #include -#include #include #include #include