Remove cruft. Rename ICONSDIR to IMAGESDIR. (gladedir, etspecdir): Remove

	* gui/dialogs/Makefile.am (INCLUDES): Remove cruft. Rename
	ICONSDIR to IMAGESDIR.
	(gladedir, etspecdir): Remove definitions

	* gui/dialogs/alarm-page.c: #include gtktreeselection.h and
	gtkcellrenderertext.h
	(append_reminder): Remove unused variable.
	(alarm_page_fill_component): Likewise.
	(alarm_page_set_summary): Likewise.
	(delete_clicked_cb): Likewise.

	* gui/dialogs/comp-editor.c (make_icon_from_comp):
	s/ICONSDIR/IMAGESDIR/

	* gui/dialogs/event-page.c: #include <string.h>

	* gui/dialogs/meeting-page.c (meeting_page_construct): Remove
	unused variable.
	(meeting_page_fill_widgets): Likewise

	* gui/dialogs/recurrence-page.c: #include gtktreeselection.h and
	gtkcellrenderertext.h
	(append_exception): Remove unused variable
	(fill_component): Likewise
	(recurrence_page_set_summary): Likewise.
	(exception_delete_cb): Likewise

svn path=/trunk/; revision=19792

6 files changed, 11 insertions, 20 deletions

diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 795944dcd5..97f67831cf 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -24,13 +24,11 @@ INCLUDES = 								\
 	-I$(top_srcdir)/shell						\
 	-I$(top_srcdir)/addressbook/backend				\
 	-I$(top_builddir)/addressbook/backend				\
-	-I$(includedir)							\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 noinst_LIBRARIES = libcal-dialogs.a
@@ -78,7 +76,6 @@ libcal_dialogs_a_SOURCES =	\
 	task-page.c		\
 	task-page.h
 
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA =				\
 	alarm-options.glade		\
 	alarm-page.glade		\
@@ -91,7 +88,6 @@ glade_DATA =				\
 	task-details-page.glade		\
 	task-page.glade
 
-etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
 etspec_DATA = meeting-page.etspec
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index 1447f8aca8..c817508eba 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -29,8 +29,10 @@
 #endif
 
 #include <string.h>
+#include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreeview.h>
+#include <gtk/gtktreeselection.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
@@ -471,7 +473,6 @@ append_reminder (AlarmPage *apage, CalComponentAlarm *alarm)
 	AlarmPagePrivate *priv;
 	GtkTreeView *view;
 	GtkTreeIter  iter;
-	int i;
 
 	priv = apage->priv;
 	view = GTK_TREE_VIEW (priv->list);
@@ -546,7 +547,6 @@ alarm_page_fill_component (CompEditorPage *page, CalComponent *comp)
 	GtkTreeIter iter;
 	gboolean valid_iter;
 	GList *list, *l;
-	int i;
 
 	apage = ALARM_PAGE (page);
 	priv = apage->priv;
@@ -615,7 +615,6 @@ alarm_page_set_summary (CompEditorPage *page, const char *summary)
 {
 	AlarmPage *apage;
 	AlarmPagePrivate *priv;
-	gchar *s;
 
 	apage = ALARM_PAGE (page);
 	priv = apage->priv;
@@ -768,7 +767,6 @@ delete_clicked_cb (GtkButton *button, gpointer data)
 	GtkTreeIter iter;
 	GtkTreePath *path;
 	gboolean valid_iter;
-	int sel;
 
 	apage = ALARM_PAGE (data);
 	priv = apage->priv;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 61ce7e072e..7d619380b7 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -811,18 +811,18 @@ make_icon_from_comp (CalComponent *comp)
 	CalComponentVType type;
 
 	if (!comp)
-		return EVOLUTION_ICONSDIR "/evolution-calendar-mini.png";
+		return EVOLUTION_IMAGESDIR "/evolution-calendar-mini.png";
 
 	type = cal_component_get_vtype (comp);
 	switch (type) {
 	case CAL_COMPONENT_EVENT:
-		return EVOLUTION_ICONSDIR "/buttons/new_appointment.png";
+		return EVOLUTION_IMAGESDIR "/buttons/new_appointment.png";
 		break;
 	case CAL_COMPONENT_TODO:
-		return EVOLUTION_ICONSDIR "/buttons/new_task.png";
+		return EVOLUTION_IMAGESDIR "/buttons/new_task.png";
 		break;
 	default:
-		return EVOLUTION_ICONSDIR "/evolution-calendar-mini.png";
+		return EVOLUTION_IMAGESDIR "/evolution-calendar-mini.png";
 	}
 }
 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 0c46735f43..5cf2024515 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 6089af5707..72e70f20e3 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -328,7 +328,7 @@ meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
 		cal_component_get_organizer (comp, &organizer);
 		if (organizer.value != NULL) {
 			const gchar *strip = itip_strip_mailto (organizer.value);
-			gchar *s, *string;
+			gchar *string;
 
 			gtk_widget_hide (priv->organizer_table);
 			gtk_widget_show (priv->existing_organizer_table);
@@ -740,7 +740,6 @@ meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm,
 	priv->addresses = itip_addresses_get ();
 	for (l = priv->addresses; l != NULL; l = l->next) {
 		ItipAddress *a = l->data;
-		char *s;
 		
 		priv->address_strings = g_list_append (priv->address_strings, g_strdup (a->full));
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5902e959e7..5608ffadff 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -28,12 +28,14 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtktreeview.h>
+#include <gtk/gtktreeselection.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
@@ -439,7 +441,6 @@ append_exception (RecurrencePage *rpage, CalComponentDateTime *datetime)
 	RecurrencePagePrivate *priv;
 	GtkTreeView *view;
 	GtkTreeIter  iter;
-	struct icaltimetype *tt;
 
 	priv = rpage->priv;
 	view = GTK_TREE_VIEW (priv->exception_list);
@@ -772,12 +773,10 @@ fill_component (RecurrencePage *rpage, CalComponent *comp)
 {
 	RecurrencePagePrivate *priv;
 	enum recur_type recur_type;
-	GtkTreeView *exception_list;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	gboolean valid_iter;
 	GSList *list;
-	int i;
 
 	priv = rpage->priv;
 	model = GTK_TREE_MODEL (priv->exception_list_store);
@@ -1882,7 +1881,6 @@ recurrence_page_set_summary (CompEditorPage *page, const char *summary)
 {
 	RecurrencePage *rpage;
 	RecurrencePagePrivate *priv;
-	gchar *s;
 	
 	rpage = RECURRENCE_PAGE (page);
 	priv = rpage->priv;
@@ -2171,7 +2169,6 @@ exception_delete_cb (GtkWidget *widget, gpointer data)
 	GtkTreeIter iter;
 	GtkTreePath *path;
 	gboolean valid_iter;
-	int sel;
 
 	rpage = RECURRENCE_PAGE (data);
 	priv = rpage->priv;