diff options
| author | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
| commit | 200606f92810d3de322e5ee96f8326e1a656f8bb (patch) | |
| tree | da0dc27f5311128dcb6e7eb6400931e45743372e /shell | |
| parent | e5472b4cc9a4bb80b89437a16f8b77943ea35555 (diff) | |
| download | gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.gz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.bz2 gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.lz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.xz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.zst gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.zip | |
Various changes to merge in evolution-data-server reliance.
svn path=/trunk/; revision=23206
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/Makefile.am | 33 | ||||
| -rw-r--r-- | shell/main.c | 8 |
3 files changed, 25 insertions, 22 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 68cd5346da..aea1998abc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2003-11-07 JP Rosevear <jpr@ximian.com> + + * main.c: use e-d-s idl to check interface version + + * Makefile.am: build e-d-s idl + 2003-11-03 Ettore Perazzoli <ettore@ximian.com> * e-shell-shared-folder-picker-dialog.c (setup_name_selector): diff --git a/shell/Makefile.am b/shell/Makefile.am index ac0e2d75d9..52cb69d8e2 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -19,6 +19,7 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(datadir)"\" \ -DG_LOG_DOMAIN=\"evolution-shell\" \ + $(TZDIALOG_CFLAGS) \ $(SHELL_CFLAGS) noinst_PROGRAMS = evolution evolution-test-component @@ -79,25 +80,21 @@ $(SELECT_NAMES_IDL_GENERATED_H): $(SELECT_NAMES_IDL) $(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H) -# Wombat CORBA stuff +# Data Server CORBA stuff +DATASERVER_IDL_GENERATED_H = \ + Evolution-DataServer.h -WOMBAT_IDL = \ - $(top_srcdir)/wombat/Evolution-Wombat.idl +DATASERVER_IDL_GENERATED_C = \ + Evolution-DataServer-common.c \ + Evolution-DataServer-skels.c \ + Evolution-DataServer-stubs.c -WOMBAT_IDL_GENERATED_H = \ - Evolution-Wombat.h +DATASERVER_IDL_GENERATED = $(DATASERVER_IDL_GENERATED_C) $(DATASERVER_IDL_GENERATED_H) -WOMBAT_IDL_GENERATED_C = \ - Evolution-Wombat-common.c \ - Evolution-Wombat-skels.c \ - Evolution-Wombat-stubs.c +$(DATASERVER_IDL_GENERATED_H): $(DATASERVER_IDL) + $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(DATASERVER_IDL) -WOMBAT_IDL_GENERATED = $(WOMBAT_IDL_GENERATED_C) $(WOMBAT_IDL_GENERATED_H) - -$(WOMBAT_IDL_GENERATED_H): $(WOMBAT_IDL) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(WOMBAT_IDL) - -$(WOMBAT_IDL_GENERATED_C): $(WOMBAT_IDL_GENERATED_H) +$(DATASERVER_IDL_GENERATED_C): $(DATASERVER_IDL_GENERATED_H) # IDL install @@ -182,7 +179,7 @@ libeshell_la_LIBADD = \ evolution_SOURCES = \ $(SELECT_NAMES_IDL_GENERATED) \ - $(WOMBAT_IDL_GENERATED) \ + $(DATASERVER_IDL_GENERATED) \ e-component-registry.c \ e-component-registry.h \ e-config-upgrade.c \ @@ -232,7 +229,7 @@ evolution_LDADD = \ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/libical/src/libical/libical-evolution.la \ + $(TZDIALOG_LIBS) \ $(SHELL_LIBS) # Test component @@ -327,7 +324,7 @@ evolution.pure: evolution endif -BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(WOMBAT_IDL_GENERATED) +BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) CLEANFILES = $(BUILT_SOURCES) dist-hook: diff --git a/shell/main.c b/shell/main.c index 6d84090840..8a6d011cb6 100644 --- a/shell/main.c +++ b/shell/main.c @@ -60,7 +60,7 @@ #include <glade/glade.h> #include "e-config-upgrade.h" -#include "Evolution-Wombat.h" +#include "Evolution-DataServer.h" #ifdef GTKHTML_HAVE_GCONF #include <gconf/gconf.h> @@ -178,20 +178,20 @@ kill_wombat (void) static void kill_old_wombat (void) { - GNOME_Evolution_WombatInterfaceCheck iface; + GNOME_Evolution_DataServer_InterfaceCheck iface; CORBA_Environment ev; CORBA_char *version; CORBA_exception_init (&ev); - iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Wombat_InterfaceCheck", 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { kill_wombat (); CORBA_exception_free (&ev); return; } - version = GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion (iface, &ev); + version = GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion (iface, &ev); if (BONOBO_EX (&ev)) { kill_wombat (); CORBA_Object_release (iface, &ev); |