diff options
| -rw-r--r-- | modules/calendar/e-cal-shell-view-actions.c | 27 | ||||
| -rw-r--r-- | widgets/misc/e-web-view.c | 10 |
2 files changed, 5 insertions, 32 deletions
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 19812751d8..16b5ecfb34 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1228,31 +1228,13 @@ action_event_schedule_cb (GtkAction *action, edit_event_as (cal_shell_view, TRUE); } - static void -quit_calendar_cb (GtkAction *action, - ECalShellView *cal_shell_view) -{ - EShellView *shell_view; - EShellWindow *shell_window; - GdkEvent *event; - - shell_view = E_SHELL_VIEW (cal_shell_view); - shell_window = e_shell_view_get_shell_window (shell_view); - - /* Synthesize a delete_event on this window. */ - event = gdk_event_new (GDK_DELETE); - event->any.window = g_object_ref (((GtkWidget *) shell_window)->window); - event->any.send_event = TRUE; - gtk_main_do_event (event); - gdk_event_free (event); -} - static void quit_calendar_cb (GtkAction *action, - ECalShellView *cal_shell_view) + ECalShellView *cal_shell_view) { EShellView *shell_view; EShellWindow *shell_window; + GdkWindow *window; GdkEvent *event; shell_view = E_SHELL_VIEW (cal_shell_view); @@ -1260,7 +1242,8 @@ quit_calendar_cb (GtkAction *action, /* Synthesize a delete_event on this window. */ event = gdk_event_new (GDK_DELETE); - event->any.window = g_object_ref (gtk_widget_get_window (GTK_WIDGET (shell_window))); + window = gtk_widget_get_window (GTK_WIDGET (shell_window)); + event->any.window = g_object_ref (window); event->any.send_event = TRUE; gtk_main_do_event (event); gdk_event_free (event); @@ -1269,7 +1252,7 @@ quit_calendar_cb (GtkAction *action, static void action_event_schedule_appointment_cb (GtkAction *action, - ECalShellView *cal_shell_view) + ECalShellView *cal_shell_view) { edit_event_as (cal_shell_view, FALSE); } diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 8e1878869e..71eb1acd34 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -895,16 +895,6 @@ web_view_load_string (EWebView *web_view, } static void -web_view_load_string (EWebView *web_view, - const gchar *string) -{ - if (string != NULL && *string != '\0') - gtk_html_load_from_string (GTK_HTML (web_view), string, -1); - else - e_web_view_clear (web_view); -} - -static void web_view_copy_clipboard (EWebView *web_view) { gtk_html_command (GTK_HTML (web_view), "copy"); |