From 042e514a262c922d258ca8f0557500199f7088d9 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 4 Dec 2000 17:56:54 +0000 Subject: return NULL if we can't create a view. 2000-12-04 Michael Meeks * e-shell-view.c (get_control_for_uri): return NULL if we can't create a view. (setup_evolution_shell_view_interface): add precondition. + lots of cleans. svn path=/trunk/; revision=6778 --- calendar/cal-client/cal-client.c | 2 +- calendar/gui/GNOME_Evolution_Calendar.oaf.in | 18 ++--- calendar/gui/GNOME_Evolution_Calendar.oafinfo | 18 ++--- .../gui/GNOME_Evolution_Calendar_Control.oaf.in | 6 +- .../gui/GNOME_Evolution_Calendar_Control.oafinfo | 6 +- .../gui/GNOME_Evolution_Calendar_gnomecal.oaf.in | 78 ++----------------- .../gui/GNOME_Evolution_Calendar_gnomecal.oafinfo | 78 ++----------------- calendar/gui/Makefile.am | 5 +- calendar/gui/calendar-component.c | 4 +- calendar/gui/calendar-control.oafinfo | 28 ------- calendar/gui/component-factory.c | 4 +- calendar/gui/control-factory.c | 2 +- calendar/gui/e-itip-control.c | 13 ++-- calendar/gui/e-meeting-edit.c | 5 +- calendar/gui/evolution-calendar.oafinfo | 89 ---------------------- calendar/gui/gnomecal.oafinfo | 27 ------- 16 files changed, 56 insertions(+), 327 deletions(-) delete mode 100644 calendar/gui/calendar-control.oafinfo delete mode 100644 calendar/gui/evolution-calendar.oafinfo delete mode 100644 calendar/gui/gnomecal.oafinfo (limited to 'calendar') diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 39d59defe2..1eca55a2d3 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -389,7 +389,7 @@ cal_client_construct (CalClient *client) priv = client->priv; factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id ( - "OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554", + "OAFIID:GNOME_Evolution_Wombat_CalendarFactory", OAF_FLAG_NO_LOCAL, NULL, &ev); result = CORBA_Object_is_nil (factory, &ev); diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in index b7eb514f7e..c587055282 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in +++ b/calendar/gui/GNOME_Evolution_Calendar.oaf.in @@ -1,6 +1,6 @@ - @@ -13,9 +13,9 @@ - + location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"> @@ -34,7 +34,7 @@ - @@ -47,9 +47,9 @@ - + location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"> @@ -62,7 +62,7 @@ value="evolution-calendar.png"/> - @@ -74,9 +74,9 @@ value="Factory for the Calendar Summary component."/> - + location="OAFIID:GNOME_Evolution_ExecutiveSummaryComponentFactory"> diff --git a/calendar/gui/GNOME_Evolution_Calendar.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo index b7eb514f7e..c587055282 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.oafinfo +++ b/calendar/gui/GNOME_Evolution_Calendar.oafinfo @@ -1,6 +1,6 @@ - @@ -13,9 +13,9 @@ - + location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"> @@ -34,7 +34,7 @@ - @@ -47,9 +47,9 @@ - + location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"> @@ -62,7 +62,7 @@ value="evolution-calendar.png"/> - @@ -74,9 +74,9 @@ value="Factory for the Calendar Summary component."/> - + location="OAFIID:GNOME_Evolution_ExecutiveSummaryComponentFactory"> diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in index f67c8eb416..48cbfa7cbb 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in +++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in @@ -1,6 +1,6 @@ - @@ -12,9 +12,9 @@ value="Factory for the sample Calendar control"/> - + location="OAFIID:GNOME_Evolution_Calendar_ControlFactory"> diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo index f67c8eb416..48cbfa7cbb 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo +++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo @@ -1,6 +1,6 @@ - @@ -12,9 +12,9 @@ value="Factory for the sample Calendar control"/> - + location="OAFIID:GNOME_Evolution_Calendar_ControlFactory"> diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in index b7eb514f7e..c4b91b9dd8 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in +++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in @@ -1,89 +1,27 @@ - - - - - - - - - - - + location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"> - - + - - - - - - - + value="Calendar Repository"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + location="gnomecal"> - + + value="Calendar Server"/> diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo index b7eb514f7e..c4b91b9dd8 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo +++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo @@ -1,89 +1,27 @@ - - - - - - - - - - - + location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"> - - + - - - - - - - + value="Calendar Repository"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + location="gnomecal"> - + + value="Calendar Server"/> diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 8729b20f80..df422d6b96 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -128,7 +128,7 @@ evolution_calendar_LDADD = \ evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf` oafdir = $(datadir)/oaf -oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo +oaf_DATA = GNOME_Evolution_Calendar_Control.oafinfo GNOME_Evolution_Calendar.oafinfo EXTRA_DIST = \ $(glade_DATA) \ @@ -146,8 +146,7 @@ EXTRA_DIST = \ weekview.xpm \ workweekview.xpm \ yearview.xpm \ - calendar-control.oafinfo \ - evolution-calendar.oafinfo + $(oaf_DATA) install-data-local: $(mkinstalldirs) $(DESTDIR)$(help_base)/C diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index b30bae6a02..91e50f84eb 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -35,8 +35,8 @@ #endif -#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" -#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" +#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ExecutiveSummaryComponentFactory" static BonoboGenericFactory *factory = NULL; static BonoboGenericFactory *summary_factory = NULL; diff --git a/calendar/gui/calendar-control.oafinfo b/calendar/gui/calendar-control.oafinfo deleted file mode 100644 index f67c8eb416..0000000000 --- a/calendar/gui/calendar-control.oafinfo +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index b30bae6a02..91e50f84eb 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -35,8 +35,8 @@ #endif -#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" -#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" +#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ExecutiveSummaryComponentFactory" static BonoboGenericFactory *factory = NULL; static BonoboGenericFactory *summary_factory = NULL; diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index c38a0f26f9..ea68675e43 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -41,7 +41,7 @@ #define PROPERTY_CALENDAR_URI_IDX 1 -#define CONTROL_FACTORY_ID "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc" +#define CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ControlFactory" CORBA_Environment ev; diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 476853c707..0d894ec2e8 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -16,18 +16,18 @@ #include #include #include +#include #include "e-itip-control.h" #include #include #include "itip-utils.h" +#define MAIL_COMPOSER_OAF_IID "OAFIID:GNOME_Evolution_Mail_Composer" #define DEFAULT_WIDTH 400 #define DEFAULT_HEIGHT 300 -#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b" - extern gchar *evolution_dir; typedef struct _EItipControlPrivate EItipControlPrivate; @@ -231,7 +231,7 @@ send_itip_reply (EItipControlPrivate *priv) CORBA_exception_init (&ev); /* First, I obtain an object reference that represents the Composer. */ - bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0); + bonobo_server = bonobo_object_activate (MAIL_COMPOSER_OAF_IID, 0); g_return_if_fail (bonobo_server != NULL); @@ -1044,10 +1044,9 @@ e_itip_control_factory_init (void) if (factory != NULL) return; - factory = - bonobo_generic_factory_new ( - "OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a", - e_itip_control_factory, NULL); + factory = bonobo_generic_factory_new ( + "OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory", + e_itip_control_factory, NULL); if (factory == NULL) g_error ("I could not register an iTip control factory."); diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c index b6435a12fc..efe41bbf09 100644 --- a/calendar/gui/e-meeting-edit.c +++ b/calendar/gui/e-meeting-edit.c @@ -465,8 +465,7 @@ schedule_button_clicked_cb (GtkWidget *widget, gpointer data) return; } -#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b" - +#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer" static gchar *itip_methods[] = { "REQUEST", @@ -503,7 +502,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) CORBA_exception_init (&ev); /* First, I obtain an object reference that represents the Composer. */ - bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0); + bonobo_server = bonobo_object_activate (GNOME_EVOLUTION_COMPOSER_OAFIID, 0); g_return_if_fail (bonobo_server != NULL); diff --git a/calendar/gui/evolution-calendar.oafinfo b/calendar/gui/evolution-calendar.oafinfo deleted file mode 100644 index b7eb514f7e..0000000000 --- a/calendar/gui/evolution-calendar.oafinfo +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/gui/gnomecal.oafinfo b/calendar/gui/gnomecal.oafinfo deleted file mode 100644 index 6af67e9fe0..0000000000 --- a/calendar/gui/gnomecal.oafinfo +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -- cgit