aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--a11y/ChangeLog11
-rw-r--r--a11y/calendar/Makefile.am31
-rw-r--r--a11y/calendar/ea-calendar-helpers.c5
3 files changed, 14 insertions, 33 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index a7b15a3b5d..507ce171ed 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,3 +1,14 @@
+2005-01-15 JP Rosevear <jpr@novell.com>
+
+ * calendar/ea-calendar-helpers.c
+ (ea_calendar_helpers_get_cal_view_from): use E_CALENDAR_VIEW, not
+ E_CAL_VIEW
+
+ Fixes #71306
+
+ * calendar/Makefile.am: no need for any idl in this directory, it
+ was not used anywhere
+
2005-01-04 Harry Lu <harry.lu@sun.com>
* widgets/Makefile.am: add ea-combo-button.[ch] to Makefile.
diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am
index d57e64ecce..9688fc7ead 100644
--- a/a11y/calendar/Makefile.am
+++ b/a11y/calendar/Makefile.am
@@ -3,34 +3,6 @@
# for debug
#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-CALENDAR_IDLS = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-SHELL_IDLS = \
- $(top_srcdir)/shell/Evolution.idl
-
-CALENDAR_IDL_GENERATED_H = evolution-calendar.h
-CALENDAR_IDL_GENERATED_C = \
- evolution-calendar-common.c \
- evolution-calendar-skels.c \
- evolution-calendar-stubs.c
-
-SHELL_IDL_GENERATED_H = Evolution.h
-SHELL_IDL_GENERATED_C = \
- Evolution-common.c \
- Evolution-skels.c \
- Evolution-stubs.c
-
-$(CALENDAR_IDL_GENERATED_H): $(CALENDAR_IDLS)
- $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
- $(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-$(SHELL_IDL_GENERATED_H): $(SHELL_IDLS)
- $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
- $(top_srcdir)/shell/Evolution.idl
-
-IDL_GENERATED = $(SHELL_IDL_GENERATED_H) $(CALENDAR_IDL_GENERATED_H)
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES) $(CALENDAR_IDL_GENERATED_C) $(SHELL_IDL_GENERATED_C)
-
privlib_LTLIBRARIES = libevolution-calendar-a11y.la
INCLUDES = \
@@ -54,8 +26,6 @@ INCLUDES = \
$(EVOLUTION_CALENDAR_CFLAGS)
libevolution_calendar_a11y_la_SOURCES = \
- $(CALENDAR_IDL_GENERATED_H) \
- $(SHELL_IDL_GENERATED_H) \
ea-calendar.c \
ea-calendar.h \
ea-calendar-helpers.c \
@@ -83,4 +53,3 @@ libevolution_calendar_a11y_la_SOURCES = \
libevolution_calendar_a11y_la_LIBADD = \
$(top_builddir)/a11y/libevolution-a11y.la
-
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
index 9b484d0040..ff3a502a67 100644
--- a/a11y/calendar/ea-calendar-helpers.c
+++ b/a11y/calendar/ea-calendar-helpers.c
@@ -87,9 +87,10 @@ ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
/* parent of canvas_item->canvas is the EDayView or EWeekView widget */
canvas = canvas_item->canvas;
view_widget = gtk_widget_get_parent (GTK_WIDGET(canvas));
- if (!view_widget || !E_IS_CAL_VIEW (view_widget))
+ if (!view_widget || !E_IS_CALENDAR_VIEW (view_widget))
return NULL;
- return E_CAL_VIEW (view_widget);
+
+ return E_CALENDAR_VIEW (view_widget);
}
/**