aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/calendar-commands.c1
-rw-r--r--calendar/gui/calendar-component.h2
-rw-r--r--calendar/gui/gnome-cal.c4
4 files changed, 12 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index dfb8323c51..b335913d39 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-04 Matthew Barnes <mbarnes@redhat.com>
+
+ * gui/calendar-commands.c:
+ * gui/calendar-component.h:
+ * gui/gnome-cal.c:
+ Fix compiler warnings.
+
2008-11-02 Matthew Barnes <mbarnes@redhat.com>
* gui/e-itip-control.c (write_recurrence_piece):
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 1d55920779..074b902063 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -47,6 +47,7 @@
#include <libecal/e-cal-time-util.h>
#include "shell/Evolution.h"
#include "calendar-commands.h"
+#include "calendar-component.h"
#include "calendar-config.h"
#include "e-day-view.h"
#include "e-week-view.h"
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 1688618197..ec3183726d 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -26,6 +26,7 @@
#include <bonobo/bonobo-object.h>
#include <libedataserver/e-source-list.h>
+#include <widgets/misc/e-activity-handler.h>
#include "Evolution.h"
@@ -60,6 +61,7 @@ CalendarComponent *calendar_component_peek (void);
const char *calendar_component_peek_base_directory (CalendarComponent *component);
const char *calendar_component_peek_config_directory (CalendarComponent *component);
ESourceList *calendar_component_peek_source_list (CalendarComponent *component);
+EActivityHandler *calendar_component_peek_activity_handler (CalendarComponent *component);
void calendar_component_show_logger (gpointer);
#endif /* _CALENDAR_COMPONENT_H_ */
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index ef9e3b7f25..1e08f727c5 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -3075,8 +3075,8 @@ backend_died_cb (ECal *ecal, gpointer data)
w = e_error_new(GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:backend_died", NULL);
e_calendar_utils_show_error_silent (w);
- g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
- g_signal_connect((GtkObject *)w, "destroy", G_CALLBACK(non_intrusive_error_remove),id);
+ g_hash_table_insert (non_intrusive_error_table, (gpointer) id, g_object_ref(w));
+ g_signal_connect((GtkObject *)w, "destroy", G_CALLBACK(non_intrusive_error_remove), (gpointer) id);
}
GtkWidget *