From d2fb5ee1a86539e49f02c1fe9ea10cf55b0b351a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Nov 2012 13:12:41 -0500 Subject: Avoid using GdkEventButton directly in certain places. Prefer dealing with GdkEvent pointers and using accessor functions like gdk_event_get_button(). This is complicated by the fact that some GtkWidget method declarations still use GdkEventButton pointers, and synthesizing button events pretty much requires direct GdkEventButton access. But GDK seems to be nudging itself toward sealing the GdkEvent union. Likely to happen in GDK4. Mainly clean up signal handlers and leave method overrides alone for now. --- modules/calendar/e-cal-shell-view-private.c | 16 ++++++++-------- modules/calendar/e-memo-shell-view-private.c | 8 ++++---- modules/calendar/e-task-shell-view-private.c | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 8d20cd974a..8159e3d22b 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -283,7 +283,7 @@ cal_shell_view_date_navigator_scroll_event_cb (ECalShellView *cal_shell_view, static void cal_shell_view_popup_event_cb (EShellView *shell_view, - GdkEventButton *event) + GdkEvent *button_event) { GList *list; GnomeCalendar *calendar; @@ -309,18 +309,18 @@ cal_shell_view_popup_event_cb (EShellView *shell_view, else widget_path = "/calendar-event-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); } static gboolean cal_shell_view_selector_popup_event_cb (EShellView *shell_view, ESource *primary_source, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/calendar-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); return TRUE; } @@ -361,22 +361,22 @@ cal_shell_view_selector_client_removed_cb (ECalShellView *cal_shell_view, static void cal_shell_view_memopad_popup_event_cb (EShellView *shell_view, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/calendar-memopad-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); } static void cal_shell_view_taskpad_popup_event_cb (EShellView *shell_view, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/calendar-taskpad-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); } static void diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c index 5e7c7552cc..9f31e446ac 100644 --- a/modules/calendar/e-memo-shell-view-private.c +++ b/modules/calendar/e-memo-shell-view-private.c @@ -48,12 +48,12 @@ memo_shell_view_model_row_appended_cb (EMemoShellView *memo_shell_view, static void memo_shell_view_table_popup_event_cb (EShellView *shell_view, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/memo-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); } static void @@ -90,12 +90,12 @@ memo_shell_view_selector_client_removed_cb (EMemoShellView *memo_shell_view, static gboolean memo_shell_view_selector_popup_event_cb (EShellView *shell_view, ESource *primary_source, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/memo-list-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); return TRUE; } diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c index b77317a1dd..ba66c59caa 100644 --- a/modules/calendar/e-task-shell-view-private.c +++ b/modules/calendar/e-task-shell-view-private.c @@ -92,12 +92,12 @@ task_shell_view_schedule_process_completed_tasks (ETaskShellView *task_shell_vie static void task_shell_view_table_popup_event_cb (EShellView *shell_view, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/task-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); } static void @@ -134,12 +134,12 @@ task_shell_view_selector_client_removed_cb (ETaskShellView *task_shell_view, static gboolean task_shell_view_selector_popup_event_cb (EShellView *shell_view, ESource *primary_source, - GdkEventButton *event) + GdkEvent *button_event) { const gchar *widget_path; widget_path = "/task-list-popup"; - e_shell_view_show_popup_menu (shell_view, widget_path, event); + e_shell_view_show_popup_menu (shell_view, widget_path, button_event); return TRUE; } -- cgit v1.2.3