aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@novell.com>2005-04-02 02:31:18 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2005-04-02 02:31:18 +0800
commit156a9657910c830f4439d1b1f750f605b7a56e4a (patch)
tree1709a715b56544493ac22f4ed8084f9513e38280
parent794cee91015ee7c9f935c2325a355a4e724047e8 (diff)
downloadgsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.tar
gsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.tar.gz
gsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.tar.bz2
gsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.tar.lz
gsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.tar.xz
gsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.tar.zst
gsoc2013-evolution-156a9657910c830f4439d1b1f750f605b7a56e4a.zip
Fixes #41740
2005-04-01 Rodrigo Moya <rodrigo@novell.com> Fixes #41740 * gui/calendar-errors.xml: * gui/calendar-errors.xml.h: added editor error. * gui/alarm-notify/alarm-queue.c (edit_component): display error messages when we can't load the component in the editor. * gui/alarm-notify/Makefile.am: linked against libemiscwidgets.la. svn path=/trunk/; revision=29148
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/calendar-errors.xml6
-rw-r--r--calendar/calendar-errors.xml.h4
-rw-r--r--calendar/gui/alarm-notify/Makefile.am1
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c5
5 files changed, 25 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fec984101f..2b411c8185 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-01 Rodrigo Moya <rodrigo@novell.com>
+
+ Fixes #41740
+
+ * gui/calendar-errors.xml:
+ * gui/calendar-errors.xml.h: added editor error.
+
+ * gui/alarm-notify/alarm-queue.c (edit_component): display error messages
+ when we can't load the component in the editor.
+
+ * gui/alarm-notify/Makefile.am: linked against libemiscwidgets.la.
+
2005-04-01 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #73879
diff --git a/calendar/calendar-errors.xml b/calendar/calendar-errors.xml
index 68707787fe..5cc062746d 100644
--- a/calendar/calendar-errors.xml
+++ b/calendar/calendar-errors.xml
@@ -138,7 +138,6 @@
<button label="Send" response="GTK_RESPONSE_YES"/>
</error>
-
<error id="prompt-send-task" type="question" default="GTK_RESPONSE_YES">
<primary>Would you like to send this task to participants?</primary>
<secondary>Email invitations will be sent to all participants and allow them to accept this task.</secondary>
@@ -163,6 +162,11 @@
<secondary>Your calendars will not be available until Evolution is restarted.</secondary>
</error>
+ <error id="editor-error" type="error">
+ <primary>Editor could not be loaded.</primary>
+ <secondary>{0}.</secondary>
+ </error>
+
<error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
<primary>Delete calendar '{0}'?</primary>
<secondary>This calendar will be removed permanently.</secondary>
diff --git a/calendar/calendar-errors.xml.h b/calendar/calendar-errors.xml.h
index cec7a7a993..bc83bdc92f 100644
--- a/calendar/calendar-errors.xml.h
+++ b/calendar/calendar-errors.xml.h
@@ -112,6 +112,10 @@ char *s = N_("Your tasks will not be available until Evolution is restarted.");
char *s = N_("The Evolution calendar has quit unexpectedly.");
/* calendar:calendar-crashed secondary */
char *s = N_("Your calendars will not be available until Evolution is restarted.");
+/* calendar:editor-error primary */
+char *s = N_("Editor could not be loaded.");
+/* calendar:editor-error secondary */
+char *s = N_("{0}.");
/* calendar:prompt-delete-calendar primary */
char *s = N_("Delete calendar '{0}'?");
/* calendar:prompt-delete-calendar secondary */
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index ffe95557ec..2040efcc94 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -49,6 +49,7 @@ evolution_alarm_notify_SOURCES = \
evolution_alarm_notify_LDADD = \
$(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
$(EVOLUTION_CALENDAR_LIBS)
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index e8797639a6..9fc55e5869 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -52,6 +52,7 @@
#include "config-data.h"
#include "util.h"
#include "e-util/e-popup.h"
+#include "widgets/misc/e-error.h"
@@ -683,7 +684,7 @@ edit_component (ECal *client, ECalComponent *comp)
0, NULL, &ev);
if (BONOBO_EX (&ev)) {
- g_message (G_STRLOC ": Could not activate the component editor factory");
+ e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
CORBA_exception_free (&ev);
return;
}
@@ -700,7 +701,7 @@ edit_component (ECal *client, ECalComponent *comp)
GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
if (BONOBO_EX (&ev))
- g_message (G_STRLOC ": Exception while editing the component");
+ e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
CORBA_exception_free (&ev);