aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/GnomeCal.idl2
-rw-r--r--calendar/gui/Makefile.am3
-rw-r--r--calendar/gui/corba-cal-factory.c18
-rw-r--r--calendar/gui/prop.c2
4 files changed, 13 insertions, 12 deletions
diff --git a/calendar/gui/GnomeCal.idl b/calendar/gui/GnomeCal.idl
index a58358f3f1..1e426fae36 100644
--- a/calendar/gui/GnomeCal.idl
+++ b/calendar/gui/GnomeCal.idl
@@ -1,3 +1,5 @@
+#include <Bonobo.idl>
+
module GNOME {
module Calendar {
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 89f6becfa1..fd7767ebcc 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -138,8 +138,7 @@ tlacuache_SOURCES = \
tlacuache.c
LINK_FLAGS = \
- $(GNOME_LIBDIR) \
- $(GNOMEGNORBA_LIBS) \
+ $(BONOBO_VFS_GNOME_LIBS) \
$(INTLLIBS) \
../libversit/libversit.la
diff --git a/calendar/gui/corba-cal-factory.c b/calendar/gui/corba-cal-factory.c
index c10929376b..a86af3c238 100644
--- a/calendar/gui/corba-cal-factory.c
+++ b/calendar/gui/corba-cal-factory.c
@@ -14,8 +14,8 @@
#include "alarm.h"
#include "timeutil.h"
#include "../libversit/vcc.h"
-#include <libgnorba/gnome-factory.h>
#include <libgnorba/gnorba.h>
+#include <bonobo.h>
#include "GnomeCal.h"
#include "corba-cal-factory.h"
#include "corba-cal.h"
@@ -24,14 +24,14 @@ CORBA_ORB orb;
PortableServer_POA poa;
PortableServer_POAManager poa_manager;
-static POA_GNOME_GenericFactory__epv calendar_epv;
-static POA_GNOME_GenericFactory__vepv calendar_vepv;
+static POA_Bonobo_GenericFactory__epv calendar_epv;
+static POA_Bonobo_GenericFactory__vepv calendar_vepv;
/*
* Servant and Object Factory
*/
-static POA_GNOME_GenericFactory calendar_servant;
-static GNOME_GenericFactory calendar_factory;
+static POA_Bonobo_GenericFactory calendar_servant;
+static Bonobo_GenericFactory calendar_factory;
static CORBA_boolean
calendar_supports (PortableServer_Servant servant,
@@ -61,7 +61,7 @@ calendar_create_object (PortableServer_Servant servant,
if (strcmp (goad_id, "IDL:GNOME:Calendar:Repository:1.0") != 0){
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_GNOME_GenericFactory_CannotActivate,
+ ex_Bonobo_GenericFactory_CannotActivate,
NULL);
return CORBA_OBJECT_NIL;
}
@@ -72,7 +72,7 @@ calendar_create_object (PortableServer_Servant servant,
if (stat (name, &s) != 0){
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_GNOME_GenericFactory_CannotActivate,
+ ex_Bonobo_GenericFactory_CannotActivate,
NULL);
return CORBA_OBJECT_NIL;
}
@@ -99,12 +99,12 @@ init_corba_server (void)
PortableServer_POAManager_activate (poa_manager, &ev);
/* First create the locator for the repositories as a factory object */
- calendar_vepv.GNOME_GenericFactory_epv = &calendar_epv;
+ calendar_vepv.Bonobo_GenericFactory_epv = &calendar_epv;
calendar_epv.supports = calendar_supports;
calendar_epv.create_object = calendar_create_object;
calendar_servant.vepv = &calendar_vepv;
- POA_GNOME_GenericFactory__init ((PortableServer_Servant) &calendar_servant, &ev);
+ POA_Bonobo_GenericFactory__init ((PortableServer_Servant) &calendar_servant, &ev);
CORBA_free (PortableServer_POA_activate_object (
poa, (PortableServer_Servant)&calendar_servant, &ev));
diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
index 6f2fec605b..8e91f4d730 100644
--- a/calendar/gui/prop.c
+++ b/calendar/gui/prop.c
@@ -776,7 +776,7 @@ create_alarm_page (void)
main_box = gtk_vbox_new (FALSE, GNOME_PAD);
gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);
gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win),
- main_box, gtk_label_new (_("Alarms")));
+ main_box, gtk_label_new (_("Alarms")));
/* build miscellaneous box */
misc_frame = gtk_frame_new (_("Alarm Properties"));