diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-06 09:57:53 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 09:57:53 +0800 |
| commit | 5bc569e2871012d7b76ee1f780b704d610e9b600 (patch) | |
| tree | 806f6479828bae6d98383fbad3f4c0ee3a43f44b /calendar | |
| parent | d203ba5167e373502758a284dbdfaae1296b27a6 (diff) | |
| download | gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.tar gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.tar.gz gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.tar.bz2 gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.tar.lz gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.tar.xz gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.tar.zst gsoc2013-evolution-5bc569e2871012d7b76ee1f780b704d610e9b600.zip | |
Define in terms of privincludedir
* cal-client/Makefile.am (libcal_clientincludedir): Define in
terms of privincludedir
* cal-client/client-test.c (main): Fix up gettext initialization
* cal-client/cal-client.c (cal_client_construct): Likewise
svn path=/trunk/; revision=19791
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/cal-client/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/cal-client/cal-client.c | 4 | ||||
| -rw-r--r-- | calendar/cal-client/client-test.c | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index 50cd31e912..a36bb7ded8 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -21,7 +21,7 @@ $(CORBA_GENERATED): $(idls) $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl INCLUDES = \ - -DGNOMELOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=\"cal-client\" \ -I$(top_srcdir)/calendar \ -I$(srcdir) -I$(top_srcdir) \ @@ -36,7 +36,7 @@ INCLUDES = \ privlib_LTLIBRARIES = libcal-client.la -libcal_clientincludedir = $(includedir)/evolution-$(BASE_VERSION)/cal-client +libcal_clientincludedir = $(privincludedir)/cal-client libcal_client_la_SOURCES = \ $(CORBA_SOURCES_GENERATED) \ diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index ddf3617072..3363b450e9 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -768,10 +768,6 @@ CalClient * cal_client_construct (CalClient *client) { CalClientPrivate *priv; - GNOME_Evolution_Calendar_CalFactory factory; - Bonobo_ServerInfoList *servers; - CORBA_Environment ev; - int i; g_return_val_if_fail (client != NULL, NULL); g_return_val_if_fail (IS_CAL_CLIENT (client), NULL); diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c index f4cb06b8dd..cb6eed17b2 100644 --- a/calendar/cal-client/client-test.c +++ b/calendar/cal-client/client-test.c @@ -214,8 +214,8 @@ main (int argc, char **argv) { char *dir; - bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); g_type_init (); bonobo_activation_init (argc, argv); |