Argh

svn path=/trunk/; revision=135

4 files changed, 52 insertions, 2 deletions

diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c
index 8c3bf31db2..a9c157c172 100644
--- a/calendar/gncal-full-day.c
+++ b/calendar/gncal-full-day.c
@@ -1212,6 +1212,16 @@ get_row_from_y (GncalFullDay *fullday, int y, int round)
 	return y;
 }
 
+static void
+button_1 (GncalFullDay *fullday, GdkEventButton *event)
+{
+}
+
+static void
+button_3 (GncalFullDay *fullday, GdkEventButton *event)
+{
+}
+
 static gint
 gncal_full_day_button_press (GtkWidget *widget, GdkEventButton *event)
 {
@@ -1230,6 +1240,19 @@ gncal_full_day_button_press (GtkWidget *widget, GdkEventButton *event)
 
 	fullday = GNCAL_FULL_DAY (widget);
 
+	switch (event->button) {
+	case 1:
+		button_1 (fullday, event);
+		break;
+
+	case 3:
+		button_3 (fullday, event);
+		break;
+
+	default:
+		break;
+	}
+
 	if (event->window == widget->window) {
 		/* Clicked on main window */
 
diff --git a/calendar/gnome-cal.c b/calendar/gnome-cal.c
index 0b2da0a0e2..710a9033b9 100644
--- a/calendar/gnome-cal.c
+++ b/calendar/gnome-cal.c
@@ -9,6 +9,7 @@
 #include "calendar.h"
 #include "gnome-cal.h"
 #include "gncal-full-day.h"
+#include "gncal-year-view.h"
 #include "gncal-week-view.h"
 #include "timeutil.h"
 #include "views.h"
@@ -82,7 +83,7 @@ setup_widgets (GnomeCalendar *gcal)
 	
 	gcal->notebook  = gtk_notebook_new ();
 	gcal->week_view = gncal_week_view_new (gcal, now);
-	gcal->year_view = year_view_create (gcal);
+	gcal->year_view = gncal_year_view_new ();
 	gcal->task_view = tasks_create (gcal);
 
 	setup_day_view (gcal);
@@ -104,6 +105,7 @@ gnome_calendar_init(GnomeCalendar *gcal)
 	gcal->cal = 0;
 	gcal->day_view = 0;
 	gcal->week_view = 0;
+	gcal->year_view = 0;
 	gcal->event_editor = 0;
 
 	setup_widgets (gcal);
diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c
index 8c3bf31db2..a9c157c172 100644
--- a/calendar/gui/gncal-full-day.c
+++ b/calendar/gui/gncal-full-day.c
@@ -1212,6 +1212,16 @@ get_row_from_y (GncalFullDay *fullday, int y, int round)
 	return y;
 }
 
+static void
+button_1 (GncalFullDay *fullday, GdkEventButton *event)
+{
+}
+
+static void
+button_3 (GncalFullDay *fullday, GdkEventButton *event)
+{
+}
+
 static gint
 gncal_full_day_button_press (GtkWidget *widget, GdkEventButton *event)
 {
@@ -1230,6 +1240,19 @@ gncal_full_day_button_press (GtkWidget *widget, GdkEventButton *event)
 
 	fullday = GNCAL_FULL_DAY (widget);
 
+	switch (event->button) {
+	case 1:
+		button_1 (fullday, event);
+		break;
+
+	case 3:
+		button_3 (fullday, event);
+		break;
+
+	default:
+		break;
+	}
+
 	if (event->window == widget->window) {
 		/* Clicked on main window */
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 0b2da0a0e2..710a9033b9 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -9,6 +9,7 @@
 #include "calendar.h"
 #include "gnome-cal.h"
 #include "gncal-full-day.h"
+#include "gncal-year-view.h"
 #include "gncal-week-view.h"
 #include "timeutil.h"
 #include "views.h"
@@ -82,7 +83,7 @@ setup_widgets (GnomeCalendar *gcal)
 	
 	gcal->notebook  = gtk_notebook_new ();
 	gcal->week_view = gncal_week_view_new (gcal, now);
-	gcal->year_view = year_view_create (gcal);
+	gcal->year_view = gncal_year_view_new ();
 	gcal->task_view = tasks_create (gcal);
 
 	setup_day_view (gcal);
@@ -104,6 +105,7 @@ gnome_calendar_init(GnomeCalendar *gcal)
 	gcal->cal = 0;
 	gcal->day_view = 0;
 	gcal->week_view = 0;
+	gcal->year_view = 0;
 	gcal->event_editor = 0;
 
 	setup_widgets (gcal);