fix typo breaking compilation

2001-07-12  JP Rosevear  <jpr@ximian.com>

	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix
	typo breaking compilation

	* gui/dialogs/meeting-page.c: fix include

	* gui/dialogs/Makefile.am: build select names idl here

	* gui/Makefile.am: remove select names compilation from here

svn path=/trunk/; revision=11050

7 files changed, 41 insertions, 15 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d60ab5b902..3982b43b96 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,16 @@
 2001-07-12  JP Rosevear  <jpr@ximian.com>
 
+	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix
+	typo breaking compilation
+
+	* gui/dialogs/meeting-page.c: fix include
+
+	* gui/dialogs/Makefile.am: build select names idl here
+
+	* gui/Makefile.am: remove select names compilation from here
+	
+2001-07-12  JP Rosevear  <jpr@ximian.com>
+
 	* gui/dialogs/task-details-page.c (task_details_page_set_dates):
 	guard against infinite loops with the updating boolean, fixes 4270
 
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
index 2ee62bb203..0c53690409 100644
--- a/calendar/gui/.cvsignore
+++ b/calendar/gui/.cvsignore
@@ -15,10 +15,6 @@ Evolution-Composer-common.c
 Evolution-Composer-skels.c
 Evolution-Composer-stubs.c
 Evolution-Composer.h
-Evolution-Addressbook-SelectNames.h
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-common.c
 GNOME_Evolution_Calendar_Control.oaf
 GNOME_Evolution_Calendar.oaf
 GNOME_Evolution_Calendar_gnomecal.oaf
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b7d2d73a6d..4d22893263 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -2,7 +2,6 @@
 
 IDLS =												   \
 	$(top_srcdir)/composer/Evolution-Composer.idl						   \
-	$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl \
 	$(top_srcdir)/calendar/idl/evolution-calendar.idl
 
 IDL_GENERATED =                 			\
@@ -10,10 +9,6 @@ IDL_GENERATED =                 			\
         Evolution-Composer-common.c       		\
         Evolution-Composer-skels.c        		\
         Evolution-Composer-stubs.c			\
-	Evolution-Addressbook-SelectNames.h		\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c	\
 	evolution-calendar.h				\
 	evolution-calendar-common.c			\
 	evolution-calendar-skels.c			\
@@ -23,8 +18,6 @@ $(IDL_GENERATED): $(IDLS)
 	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
                 $(srcdir)/../../composer/Evolution-Composer.idl
 	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
                 $(top_srcdir)/calendar/idl/evolution-calendar.idl
 
 BUILT_SOURCES = $(IDL_GENERATED)
diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
index e995588475..3b97f6881d 100644
--- a/calendar/gui/dialogs/.cvsignore
+++ b/calendar/gui/dialogs/.cvsignore
@@ -1,3 +1,7 @@
 .deps
 Makefile
 Makefile.in
+Evolution-Addressbook-SelectNames.h
+Evolution-Addressbook-SelectNames-stubs.c
+Evolution-Addressbook-SelectNames-skels.c
+Evolution-Addressbook-SelectNames-common.c
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index bb0778162b..f9c95f3341 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -1,4 +1,19 @@
-gladedir = $(datadir)/evolution/glade
+## CORBA stuff
+
+IDLS =												   \
+	$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+
+IDL_GENERATED =                 			\
+	Evolution-Addressbook-SelectNames.h		\
+	Evolution-Addressbook-SelectNames-common.c	\
+	Evolution-Addressbook-SelectNames-skels.c	\
+	Evolution-Addressbook-SelectNames-stubs.c
+
+$(IDL_GENERATED): $(IDLS)
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
+                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+
+BUILT_SOURCES = $(IDL_GENERATED)
 
 INCLUDES = 						\
 	-DG_LOG_DOMAIN=\"calendar-gui\"			\
@@ -21,6 +36,7 @@ INCLUDES = 						\
 noinst_LIBRARIES = libcal-dialogs.a
 
 libcal_dialogs_a_SOURCES =	\
+	$(IDL_GENERATED)	\
 	alarm-options.c		\
 	alarm-options.h		\
 	alarm-page.c		\
@@ -60,6 +76,7 @@ libcal_dialogs_a_SOURCES =	\
 	task-page.c		\
 	task-page.h
 
+gladedir = $(datadir)/evolution/glade
 glade_DATA =				\
 	alarm-options.glade		\
 	alarm-page.glade		\
@@ -74,6 +91,11 @@ glade_DATA =				\
 etspecdir = $(datadir)/evolution/etspec/
 etspec_DATA = meeting-page.etspec
 
+CLEANFILES += $(BUILT_SOURCES)
+
+dist-hook:
+	cd $(distdir); rm -f $(BUILT_SOURCES)
+
 EXTRA_DIST =			\
 	$(glade_DATA)		\
 	$(etspec_DATA)
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index b4e5732e11..c4e05be8f5 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -46,7 +46,7 @@
 #include <gal/widgets/e-gui-utils.h>
 #include <widgets/misc/e-dateedit.h>
 #include <e-util/e-dialog-widgets.h>
-#include "../Evolution-Addressbook-SelectNames.h"
+#include "Evolution-Addressbook-SelectNames.h"
 #include "../component-factory.h"
 #include "../itip-utils.h"
 #include "comp-editor-util.h"
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index dee26ae88b..ef87a9167a 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -779,7 +779,7 @@ void
 e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
 {
 	ETable *etable;
-
+	
 	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
 
 	if (cal_table->clipboard_selection) {
@@ -795,7 +795,7 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
 
 	cal_table->clipboard_selection = icalcomponent_as_ical_string (cal_table->tmp_vcal);
 	icalcomponent_free (cal_table->tmp_vcal);
-	cal_table->tmp_val = NULL;
+	cal_table->tmp_vcal = NULL;
 
 	gtk_selection_owner_set (cal_table->invisible, clipboard_atom, GDK_CURRENT_TIME);
 }