aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-03-30 01:29:46 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-03-30 01:29:46 +0800
commit72f0d0c0001ed7de14640579b9473fed811b866c (patch)
treea666a4db9172c1fa9879092b534b3613d81e5e68 /calendar
parentb12d14e70117e2287cf3b11137c1f2636c09f4d9 (diff)
downloadgsoc2013-evolution-72f0d0c0001ed7de14640579b9473fed811b866c.tar.gz
gsoc2013-evolution-72f0d0c0001ed7de14640579b9473fed811b866c.tar.zst
gsoc2013-evolution-72f0d0c0001ed7de14640579b9473fed811b866c.zip
Fix "incompatible pointer type" warnings (#360619).
2007-03-29 Matthew Barnes <mbarnes@redhat.com> * calendar/gui/e-day-view.c: * calendar/gui/e-week-view.c: * calendar/gui/tasks-control.c: * composer/e-msg-composer-select-file.c: * mail/em-account-editor.c: * mail/em-folder-view.c: * mail/em-format-html-display.c: * mail/em-format-html.c: * mail/em-format.h: * mail/em-mailer-prefs.c: * mail/em-vfolder-rule.c: * mail/mail-ops.c: * mail/mail-send-recv.c: * mail/message-list.c: * plugins/bbdb/gaimbuddies.c: * plugins/itip-formatter/itip-formatter.c: * plugins/save-calendar/save-calendar.c: * shell/e-shell-window.c: * widgets/misc/e-icon-entry.c: * widgets/table/e-table-header-utils.c: * widgets/table/e-table-item.c: * widgets/table/e-tree-header-item.c: * widgets/table/e-tree-table-adapter.c: Fix "incompatible pointer type" warnings (#360619). svn path=/trunk/; revision=33339
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-day-view.c2
-rw-r--r--calendar/gui/e-week-view.c8
-rw-r--r--calendar/gui/tasks-control.c1
4 files changed, 12 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c689008374..eb3ed1a71a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * gui/e-day-view.c:
+ * gui/e-week-view.c:
+ * gui/tasks-control.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-27 Matthew Barnes <mbarnes@redhat.com>
* gui/alarm-notify/alarm-queue.c:
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 4a31780d61..07f11c40b2 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -7158,7 +7158,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)day_view;
data->day = day;
data->event_num = event_num;
- data->get_view_event = tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
return TRUE;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b9da861609..02250ed228 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2128,7 +2128,7 @@ e_week_view_on_scroll (GtkWidget *widget,
GtkWidget *tool_window = g_object_get_data (G_OBJECT (week_view), "tooltip-window");
guint timeout;
- timeout = GPOINTER_TO_UINT (g_object_get_data (week_view, "tooltip-timeout"));
+ timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout"));
if (timeout) {
g_source_remove (timeout);
g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL);
@@ -2549,7 +2549,7 @@ tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item)
EWeekViewEvent *pevent;
guint timeout;
- timeout = GPOINTER_TO_UINT (g_object_get_data (week_view, "tooltip-timeout"));
+ timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout"));
if (timeout) {
g_source_remove (timeout);
g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL);
@@ -2590,7 +2590,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)view;
data->day = -1;
data->event_num = event_num;
- data->get_view_event = tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
@@ -3163,7 +3163,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)week_view;
data->day = -1;
data->event_num = nevent;
- data->get_view_event = tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index e81fd85d93..2393c8fd8b 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -252,7 +252,6 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
BONOBO_UI_VERB ("TasksAssign", tasks_control_assign_cmd),
BONOBO_UI_VERB ("TasksForward", tasks_control_forward_cmd),
- BONOBO_UI_VERB ("ViewPreview", tasks_control_view_preview),
BONOBO_UI_VERB_END
};