From 2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Tue, 8 Feb 2011 11:57:50 -0500 Subject: Bug 641756 - Fix warnings from GCC 4.6 GCC learned how to find dead assignments. --- modules/calendar/e-cal-shell-sidebar.c | 4 +--- modules/calendar/e-memo-shell-view-private.c | 7 ------- modules/calendar/e-task-shell-view-private.c | 7 ------- modules/mail/e-mail-shell-content.c | 4 ---- modules/mail/e-mail-shell-view.c | 2 -- modules/mailto-handler/evolution-mailto-handler.c | 2 -- 6 files changed, 1 insertion(+), 25 deletions(-) (limited to 'modules') diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index f61e0a60a7..5227df6bcd 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -571,14 +571,12 @@ cal_shell_sidebar_finalize (GObject *object) static void new_calendar_clicked (GtkButton *button, - EShellSidebar *shell_sidebar) + EShellSidebar *shell_sidebar) { EShellView *shell_view; EShellWindow *shell_window; - EShellBackend *shell_backend; shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); - shell_backend = e_shell_view_get_shell_backend (shell_view); shell_window = e_shell_view_get_shell_window (shell_view); calendar_setup_new_calendar (GTK_WINDOW (shell_window)); diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c index 0880750828..f4049d7ce4 100644 --- a/modules/calendar/e-memo-shell-view-private.c +++ b/modules/calendar/e-memo-shell-view-private.c @@ -436,24 +436,17 @@ e_memo_shell_view_update_timezone (EMemoShellView *memo_shell_view) { EMemoShellContent *memo_shell_content; EMemoShellSidebar *memo_shell_sidebar; - ECalComponentPreview *memo_preview; - EPreviewPane *preview_pane; - EWebView *web_view; icaltimezone *timezone; ECalModel *model; GList *clients, *iter; memo_shell_content = memo_shell_view->priv->memo_shell_content; - preview_pane = e_memo_shell_content_get_preview_pane (memo_shell_content); model = e_memo_shell_content_get_memo_model (memo_shell_content); timezone = e_cal_model_get_timezone (model); memo_shell_sidebar = memo_shell_view->priv->memo_shell_sidebar; clients = e_memo_shell_sidebar_get_clients (memo_shell_sidebar); - web_view = e_preview_pane_get_web_view (preview_pane); - memo_preview = E_CAL_COMPONENT_PREVIEW (web_view); - for (iter = clients; iter != NULL; iter = iter->next) { ECal *client = iter->data; diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c index 83b0e9408f..5567cf9c6e 100644 --- a/modules/calendar/e-task-shell-view-private.c +++ b/modules/calendar/e-task-shell-view-private.c @@ -587,24 +587,17 @@ e_task_shell_view_update_timezone (ETaskShellView *task_shell_view) { ETaskShellContent *task_shell_content; ETaskShellSidebar *task_shell_sidebar; - ECalComponentPreview *task_preview; - EPreviewPane *preview_pane; - EWebView *web_view; icaltimezone *timezone; ECalModel *model; GList *clients, *iter; task_shell_content = task_shell_view->priv->task_shell_content; - preview_pane = e_task_shell_content_get_preview_pane (task_shell_content); model = e_task_shell_content_get_task_model (task_shell_content); timezone = e_cal_model_get_timezone (model); task_shell_sidebar = task_shell_view->priv->task_shell_sidebar; clients = e_task_shell_sidebar_get_clients (task_shell_sidebar); - web_view = e_preview_pane_get_web_view (preview_pane); - task_preview = E_CAL_COMPONENT_PREVIEW (web_view); - for (iter = clients; iter != NULL; iter = iter->next) { ECal *client = iter->data; diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 9ec0cb80f8..2f7bea3017 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -170,8 +170,6 @@ mail_shell_content_constructed (GObject *object) { EMailShellContentPrivate *priv; EShellContent *shell_content; - EShellBackend *shell_backend; - EShellWindow *shell_window; EShellView *shell_view; GtkWidget *container; GtkWidget *widget; @@ -183,8 +181,6 @@ mail_shell_content_constructed (GObject *object) shell_content = E_SHELL_CONTENT (object); shell_view = e_shell_content_get_shell_view (shell_content); - shell_window = e_shell_view_get_shell_window (shell_view); - shell_backend = e_shell_view_get_shell_backend (shell_view); /* Build content widgets. */ diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 1754fbb955..f43b1f3732 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -218,7 +218,6 @@ mail_shell_view_execute_search (EShellView *shell_view) EMailBackend *backend; EMailSession *session; EMFolderTree *folder_tree; - GtkTreeSelection *selection; GtkWidget *message_list; EFilterRule *rule; EMailReader *reader; @@ -263,7 +262,6 @@ mail_shell_view_execute_search (EShellView *shell_view) mail_shell_sidebar = E_MAIL_SHELL_SIDEBAR (shell_sidebar); folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_tree)); reader = E_MAIL_READER (mail_view); folder = e_mail_reader_get_folder (reader); diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c index 42c661a541..afba8af0c9 100644 --- a/modules/mailto-handler/evolution-mailto-handler.c +++ b/modules/mailto-handler/evolution-mailto-handler.c @@ -230,13 +230,11 @@ static void mailto_handler_constructed (GObject *object) { EShell *shell; - EShellSettings *shell_settings; EMailtoHandler *extension; extension = E_MAILTO_HANDLER (object); shell = mailto_handler_get_shell (extension); - shell_settings = e_shell_get_shell_settings (shell); e_shell_settings_install_property_for_key ( "mailto-handler-check", -- cgit v1.2.3