From a474f3b1b6a754c35e28ec919cbda72b82386f28 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Mon, 17 Jul 2006 11:35:44 +0000 Subject: Evolution side coding for implementing security-classification send-options for GroupWise svn path=/trunk/; revision=32329 --- plugins/groupwise-features/ChangeLog | 6 ++ plugins/groupwise-features/mail-send-options.c | 8 +- plugins/groupwise-features/mail-send-options.h | 1 + widgets/misc/ChangeLog | 6 ++ widgets/misc/e-send-options.c | 30 +++---- widgets/misc/e-send-options.glade | 104 +++++++++++++++++++++++-- widgets/misc/e-send-options.h | 10 +++ 7 files changed, 143 insertions(+), 22 deletions(-) diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 752ced4961..c83b63ccdd 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,9 @@ +2006-07-17 Sankar P + + * mail-send-options.c: (feed_input_data) + * mail-send-options.h: + Added support for X_SEND_OPT_SECURITY + 2006-07-17 Sankar P * Added support for GroupWise Message Retract diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 48a7b026c1..0bd494bcd9 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -112,7 +112,13 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) if (dialog->data->gopts->priority) { temp = g_strdup_printf ("%d",dialog->data->gopts->priority); - e_msg_composer_add_header (comp, X_SEND_OPT_PRIORITY,temp); + e_msg_composer_add_header (comp, X_SEND_OPT_PRIORITY, temp); + g_free (temp); + } + + if (dialog->data->gopts->security) { + temp = g_strdup_printf ("%d",dialog->data->gopts->security); + e_msg_composer_add_header (comp, X_SEND_OPT_SECURITY, temp); g_free (temp); } } diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h index 0e6ef03ec5..1e3efc256e 100644 --- a/plugins/groupwise-features/mail-send-options.h +++ b/plugins/groupwise-features/mail-send-options.h @@ -26,6 +26,7 @@ #define X_SEND_OPTIONS "X-gw-send-options" /*General Options*/ #define X_SEND_OPT_PRIORITY "X-gw-send-opt-priority" +#define X_SEND_OPT_SECURITY "X-gw-send-opt-security" #define X_REPLY_CONVENIENT "X-reply-convenient" #define X_REPLY_WITHIN "X-reply-within" #define X_EXPIRE_AFTER "X-expire-after" diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 2f8c25c8c2..75fd7d9f78 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,9 @@ +2006-07-17 Sankar P + + * Replaced classification with security in the send-options + so that the client ui looks consistent (GW) + * e-send-options.[c|h|glade]: + 2006-07-11 Hiroyuki Ikezoe ** Fixes bug #347166 diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 7778d9e17b..644d054905 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -57,8 +57,8 @@ struct _ESendOptionsDialogPrivate { /* priority */ GtkWidget *priority; - /* Classification */ - GtkWidget *classification; + /* Security */ + GtkWidget *security; /* Widgets for Reply Requestion options */ GtkWidget *reply_request; @@ -88,7 +88,7 @@ struct _ESendOptionsDialogPrivate { GtkWidget *when_completed; /* label widgets */ - GtkWidget *classification_label; + GtkWidget *security_label; GtkWidget *priority_label; GtkWidget *gopts_label; GtkWidget *sopts_label; @@ -126,7 +126,7 @@ e_send_options_get_widgets_data (ESendOptionsDialog *sod) sopts = sod->data->sopts; gopts->priority = gtk_combo_box_get_active ((GtkComboBox *) priv->priority); - gopts->classify = gtk_combo_box_get_active ((GtkComboBox *) priv->classification); + 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)); @@ -171,7 +171,7 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod) tmp = time (NULL); gtk_combo_box_set_active ((GtkComboBox *) priv->priority, gopts->priority); - gtk_combo_box_set_active ((GtkComboBox *) priv->classification, gopts->classify); + 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); @@ -417,7 +417,7 @@ get_widgets (ESendOptionsDialog *sod) priv->priority = GW ("combo-priority"); priv->status = GW ("status-tracking"); - priv->classification = GW ("classification-combo"); + priv->security = GW ("security-combo"); priv->notebook = (GtkNotebook *)GW ("notebook"); priv->reply_request = GW ("reply-request-button"); priv->reply_convenient = GW ("reply-convinient"); @@ -437,7 +437,7 @@ get_widgets (ESendOptionsDialog *sod) priv->when_declined = GW ("delete-combo"); priv->when_accepted = GW ("accept-combo"); priv->when_completed = GW ("complete-combo"); - priv->classification_label = GW ("classification-label"); + priv->security_label = GW ("security-label"); priv->gopts_label = GW ("gopts-label"); priv->sopts_label = GW ("slabel"); priv->priority_label = GW ("priority-label"); @@ -450,7 +450,7 @@ get_widgets (ESendOptionsDialog *sod) #undef GW return (priv->priority - && priv->classification + && priv->security && priv->status && priv->reply_request && priv->reply_convenient @@ -469,7 +469,7 @@ get_widgets (ESendOptionsDialog *sod) && priv->when_declined && priv->when_accepted && priv->when_completed - && priv->classification_label + && priv->security_label && priv->priority_label && priv->opened_label && priv->gopts_label @@ -494,7 +494,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) 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->classification_label), priv->classification); + 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); @@ -527,8 +527,8 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_widget_hide (priv->when_completed); case E_ITEM_TASK: priv->help_section = g_strdup ("usage-calendar-todo"); - gtk_widget_hide (priv->classification_label); - gtk_widget_hide (priv->classification); + gtk_widget_hide (priv->security_label); + gtk_widget_hide (priv->security); gtk_widget_set_sensitive (priv->autodelete, FALSE); break; default: @@ -752,7 +752,7 @@ e_sendoptions_dialog_init (GObject *object) sod->priv = priv; sod->data = new; sod->data->initialized = FALSE; - sod->data->gopts->classify = 0; + sod->data->gopts->security = 0; priv->gopts_needed = TRUE; priv->xml = NULL; @@ -761,7 +761,7 @@ e_sendoptions_dialog_init (GObject *object) priv->notebook = NULL; priv->priority = NULL; priv->status = NULL; - priv->classification = NULL; + priv->security = NULL; priv->reply_request = NULL; priv->reply_convenient = NULL; priv->within_days = NULL; @@ -778,7 +778,7 @@ e_sendoptions_dialog_init (GObject *object) priv->when_declined = NULL; priv->when_accepted = NULL; priv->when_completed = NULL; - priv->classification_label = NULL; + priv->security_label = NULL; priv->priority_label = NULL; priv->opened_label = NULL; priv->gopts_label = NULL; diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.glade index 2a627fb406..da19eb46ec 100644 --- a/widgets/misc/e-send-options.glade +++ b/widgets/misc/e-send-options.glade @@ -18,6 +18,8 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -112,6 +114,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 @@ -238,6 +244,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 @@ -299,6 +309,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -367,6 +381,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -410,6 +428,10 @@ 0 0 expire-after + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -450,6 +472,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -504,6 +530,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -548,6 +578,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -597,6 +631,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -620,6 +658,8 @@ High Standard Low + False + True 1 @@ -643,6 +683,10 @@ Low 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -654,9 +698,9 @@ Low - + True - C_lassification + Classification True False GTK_JUSTIFY_LEFT @@ -666,6 +710,10 @@ Low 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -678,12 +726,16 @@ Low - + True - Public -Private + Normal +Proprietary Confidential - +Secret +Top Secret +For Your Eyes Only + False + True 1 @@ -714,6 +766,10 @@ Confidential 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -923,6 +979,10 @@ Confidential 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -978,6 +1038,10 @@ Confidential 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1002,6 +1066,10 @@ Confidential 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1026,6 +1094,10 @@ Confidential 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1050,6 +1122,10 @@ Confidential 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1066,6 +1142,8 @@ Confidential True None Mail Receipt + False + True 1 @@ -1081,6 +1159,8 @@ Mail Receipt True None Mail Receipt + False + True 1 @@ -1096,6 +1176,8 @@ Mail Receipt True None Mail Receipt + False + True 1 @@ -1111,6 +1193,8 @@ Mail Receipt True None Mail Receipt + False + True 1 @@ -1137,6 +1221,10 @@ Mail Receipt 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -1169,6 +1257,10 @@ Mail Receipt 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h index 0ea71e269b..7b49ebcbd6 100644 --- a/widgets/misc/e-send-options.h +++ b/widgets/misc/e-send-options.h @@ -50,6 +50,15 @@ typedef enum { 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 @@ -71,6 +80,7 @@ typedef struct { gint expire_after; gboolean delay_enabled; time_t delay_until; + gint security; } ESendOptionsGeneral; typedef struct { -- cgit v1.2.3