Re: [evolution-patches] patch for #41740 (calendar)

[Rodrigo Moya <rodrigo novell com>]

On Thu, 2005-03-24 at 10:11 -0500, JP Rosevear wrote:
> On Wed, 2005-03-23 at 13:15 +0100, Rodrigo Moya wrote:
> > I would have used e_error, but this would mean adding new strings, so
> > sticking with what we use in other parts of the calendar.
> > 
> > For HEAD, I can change it to use e_error, ok?
> 
> It seems better to me to just do it right for head for and skip it on
> the the branch, its not a regression.
> 
ok, patch for HEAD only attached
-- 
Rodrigo Moya <rodrigo novell com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2703
diff -u -p -r1.2703 ChangeLog
--- ChangeLog	28 Mar 2005 11:27:17 -0000	1.2703
+++ ChangeLog	28 Mar 2005 12:51:20 -0000
@@ -1,3 +1,15 @@
+2005-03-xx  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-03-28  Rodrigo Moya <rodrigo novell com>
 
 	Fixes #44719
Index: calendar-errors.xml
===================================================================
RCS file: /cvs/gnome/evolution/calendar/calendar-errors.xml,v
retrieving revision 1.9
diff -u -p -r1.9 calendar-errors.xml
--- calendar-errors.xml	16 Mar 2005 14:51:00 -0000	1.9
+++ calendar-errors.xml	28 Mar 2005 12:51:20 -0000
@@ -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>
@@ -161,6 +160,11 @@
  <error id="calendar-crashed" type="error">
   <primary>The Evolution calendar has quit unexpectedly.</primary>
   <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">
Index: calendar-errors.xml.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/calendar-errors.xml.h,v
retrieving revision 1.11
diff -u -p -r1.11 calendar-errors.xml.h
--- calendar-errors.xml.h	16 Mar 2005 14:51:00 -0000	1.11
+++ calendar-errors.xml.h	28 Mar 2005 12:51:20 -0000
@@ -112,6 +112,10 @@ char *s = N_("Your tasks will not be ava
 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 */
Index: gui/alarm-notify/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/Makefile.am,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile.am
--- gui/alarm-notify/Makefile.am	16 Feb 2004 14:46:36 -0000	1.40
+++ gui/alarm-notify/Makefile.am	28 Mar 2005 12:51:20 -0000
@@ -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)
 
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.83
diff -u -p -r1.83 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	28 Mar 2005 11:27:17 -0000	1.83
+++ gui/alarm-notify/alarm-queue.c	28 Mar 2005 12:51:20 -0000
@@ -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, ECalCompon
 						      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, ECalCompon
 	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);