aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2005-07-06 15:14:57 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2005-07-06 15:14:57 +0800
commit4b7c5fbf0983dc5bba622220637ac574d289a615 (patch)
treed5556ce5c5e7dedbe22b10c76029b2b395729e5e /calendar
parentc16a419919c06c72e872cb11e9c83c7dbcfd99fd (diff)
downloadgsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.tar
gsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.tar.gz
gsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.tar.bz2
gsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.tar.lz
gsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.tar.xz
gsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.tar.zst
gsoc2013-evolution-4b7c5fbf0983dc5bba622220637ac574d289a615.zip
Changed the way in which calendars having null summary are handled.
Fixes #237844 svn path=/trunk/; revision=29647
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/calendar.error.xml2
-rw-r--r--calendar/gui/dialogs/comp-editor.c25
3 files changed, 22 insertions, 14 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fa95f6ab1c..398c5166a5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-06 Sankar P <psankar@novell.com>
+
+ * gui/dialogs/comp-editor.c (response_cb):
+ Changed the way in which calendars having null summary are handled.
+ Fixes #237844
+
+ * calendar-errors.xml:
+ Changed the button label from Send to Save
+
2005-07-05 Srinivasa Ragavan <sragavan@novell.com>
* gui/e-cal-popup.c: Created new target type
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 672ec7a247..231440c402 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -199,7 +199,7 @@
<_primary>Are you sure you want to send the appointment without a summary?</_primary>
<_secondary>Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button _label="_Send" response="GTK_RESPONSE_YES"/>
+ <button _label="_Save" response="GTK_RESPONSE_YES"/>
</error>
<error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index c7a7c10d6d..fe7cba9dfd 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -806,7 +806,8 @@ response_cb (GtkWidget *widget, int response, gpointer data)
CompEditorPrivate *priv;
ECalComponentText text;
gboolean delegated;
-
+ ECalComponent *comp;
+
priv = editor->priv;
delegated = (priv->flags & COMP_EDITOR_DELEGATE);
@@ -831,23 +832,21 @@ response_cb (GtkWidget *widget, int response, gpointer data)
return;
}
commit_all_fields (editor);
-
if (e_cal_component_is_instance (priv->comp))
if (!recur_component_dialog (priv->client, priv->comp, &priv->mod, GTK_WINDOW (editor), delegated))
return;
-
- if (save_comp_with_send (editor)) {
-
- e_cal_component_get_summary (priv->comp, &text);
-
- if (!text.value) {
- if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
- return;
- }
- close_dialog (editor);
- }
+ comp = comp_editor_get_current_comp (editor);
+ e_cal_component_get_summary (comp, &text);
+ g_object_unref (comp);
+
+ if (!text.value)
+ if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
+ return;
+ if (save_comp_with_send (editor))
+ close_dialog (editor);
break;
+
case GTK_RESPONSE_HELP:
comp_editor_show_help (editor);