? shell.error
? warnings
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1554
diff -u -p -r1.1554 ChangeLog
--- ChangeLog	6 Jan 2006 14:19:24 -0000	1.1554
+++ ChangeLog	9 Jan 2006 09:49:30 -0000
@@ -1,3 +1,14 @@
+2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-corba-config-page.c: (e_corba_config_page_class_init):
+	* e-shell-folder-title-bar.c: (e_shell_folder_title_bar_construct):
+	* e-shell-window.c: (init_view):
+	* e-shell.c: (detect_version), (e_shell_construct), (e_shell_new),
+	(e_shell_attempt_upgrade), (e_shell_create_window),
+	(e_shell_save_settings):
+	* main.c: (idle_cb):
+	Remove unused code and fix format specifiers in some cases.
+
 2006-01-06  Andre Klapper <a9016009@gmx.de>
 	* shell/e-shell-window.c: fixing two missing whitespaces.
 	Fixes bug 325568.
Index: e-corba-config-page.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-corba-config-page.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-corba-config-page.c
--- e-corba-config-page.c	21 Dec 2004 15:42:46 -0000	1.11
+++ e-corba-config-page.c	9 Jan 2006 09:49:30 -0000
@@ -86,13 +86,10 @@ static void
 e_corba_config_page_class_init (ECorbaConfigPageClass *class)
 {
 	GObjectClass *object_class;
-	EConfigPageClass *config_page_class;
 
 	object_class = G_OBJECT_CLASS (class);
 	object_class->dispose  = impl_dispose;
 	object_class->finalize = impl_finalize;
-
-	config_page_class = E_CONFIG_PAGE_CLASS (class);
 }
 
 static void
Index: e-shell-folder-title-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-folder-title-bar.c,v
retrieving revision 1.52
diff -u -p -r1.52 e-shell-folder-title-bar.c
--- e-shell-folder-title-bar.c	23 Jun 2005 09:11:08 -0000	1.52
+++ e-shell-folder-title-bar.c	9 Jan 2006 09:49:30 -0000
@@ -478,13 +478,11 @@ e_shell_folder_title_bar_construct (EShe
 {
 	EShellFolderTitleBarPrivate *priv;
 	GtkWidget *title_button_hbox;
-	GtkWidget *widget;
 
 	g_return_if_fail (folder_title_bar != NULL);
 	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
 
 	priv = folder_title_bar->priv;
-	widget = GTK_WIDGET (folder_title_bar);
 
 	priv->title_icon = new_empty_image_widget ();
 	gtk_misc_set_alignment (GTK_MISC (priv->title_icon), 1.0, .5);
Index: e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.45
diff -u -p -r1.45 e-shell-window.c
--- e-shell-window.c	6 Jan 2006 14:19:26 -0000	1.45
+++ e-shell-window.c	9 Jan 2006 09:49:30 -0000
@@ -214,7 +214,6 @@ init_view (EShellWindow *window,
 	CORBA_Environment ev;
 	int sidebar_notebook_page_num;
 	int view_notebook_page_num;
-	int statusbar_notebook_page_num;
 
 	g_assert (view->view_widget == NULL);
 	g_assert (view->sidebar_widget == NULL);
@@ -280,7 +279,6 @@ init_view (EShellWindow *window,
 
 	sidebar_notebook_page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->sidebar_notebook), view->sidebar_widget);
 	view_notebook_page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->view_notebook), view->view_widget);
-	statusbar_notebook_page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->view_notebook), view->statusbar_widget);
 
 	/* Since we always add a view page and a sidebar page at the same time...  */
 	g_assert (sidebar_notebook_page_num == view_notebook_page_num);
Index: e-shell.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell.c,v
retrieving revision 1.271
diff -u -p -r1.271 e-shell.c
--- e-shell.c	22 Dec 2005 11:11:15 -0000	1.271
+++ e-shell.c	9 Jan 2006 09:49:31 -0000
@@ -555,7 +555,7 @@ detect_version (GConfClient *gconf, int 
 	val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);	
 	if (val) {
 		/* Since 1.4.0 We've been keeping the version key in gconf */
-		sscanf(val, "%u.%u.%u", major, minor, revision);
+		sscanf(val, "%d.%d.%d", major, minor, revision);
 		g_free(val);
 	} else if (g_lstat (evolution_dir, &st) != 0 || !S_ISDIR (st.st_mode)) {
 		/* If ~/evolution does not exit or is not a directory it must be a new installation */
@@ -683,6 +683,7 @@ e_shell_construct (EShell *shell,
 		gtk_main_iteration ();	
 	
 	/* activate all the components (peek list does this implictly) */
+	/* Do we really need to assign the result of this to the list? */
 	component = e_component_registry_peek_list (shell->priv->component_registry);
 	
 	e_shell_attempt_upgrade(shell);
@@ -727,7 +728,6 @@ e_shell_new (EShellStartupLineMode start
 	     EShellConstructResult *construct_result_return)
 {
 	EShell *new;
-	EShellPrivate *priv;
 	EShellConstructResult construct_result;
 
 	new = g_object_new (e_shell_get_type (), NULL);
@@ -740,8 +740,6 @@ e_shell_new (EShellStartupLineMode start
 		return NULL;
 	}
 
-	priv = new->priv;
-
 	*construct_result_return = E_SHELL_CONSTRUCT_RESULT_OK;
 	return new;
 }
@@ -862,7 +860,7 @@ check_old:
 	    && S_ISDIR(st.st_mode)) {
 		int res;
 
-		last_version = g_strdup_printf("%u.%u.%u", lmajor, lminor, lrevision);
+		last_version = g_strdup_printf("%d.%d.%d", lmajor, lminor, lrevision);
 		res = e_error_run(NULL, "shell:upgrade-remove-1-4", last_version, NULL);
 		g_free(last_version);
 
@@ -889,7 +887,7 @@ check_old:
 		lrevision = crevision;
 	}
 
-	last_version = g_strdup_printf("%u.%u.%u", lmajor, lminor, lrevision);
+	last_version = g_strdup_printf("%d.%d.%d", lmajor, lminor, lrevision);
 	gconf_client_set_string (gconf_client, "/apps/evolution/last_version", last_version, NULL);
 	g_free(last_version);
 
@@ -925,15 +923,12 @@ e_shell_create_window (EShell *shell,
 		       EShellWindow *template_window)
 {
 	EShellWindow *window;
-	EShellPrivate *priv;
 
 	/* FIXME need to actually copy settings from template_window.  */
 
 	g_return_val_if_fail (shell != NULL, NULL);
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
-	priv = shell->priv;
-
 	window = E_SHELL_WINDOW (e_shell_window_new (shell, component_id));
 
 	g_signal_connect (window, "delete_event", G_CALLBACK (window_delete_event_cb), shell);
@@ -1018,10 +1013,7 @@ gboolean
 e_shell_save_settings (EShell *shell)
 {
 	GConfClient *client;
-	EShellPrivate *priv;
 	gboolean is_offline;
-
-	priv = shell->priv;
 
 	is_offline = ( e_shell_get_line_status (shell) == E_SHELL_LINE_STATUS_OFFLINE );
 
Index: main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.176
diff -u -p -r1.176 main.c
--- main.c	20 Dec 2005 17:33:35 -0000	1.176
+++ main.c	9 Jan 2006 09:49:31 -0000
@@ -328,7 +328,6 @@ idle_cb (void *data)
 	CORBA_Environment ev;
 	EShellConstructResult result;
 	EShellStartupLineMode startup_line_mode;
-	gboolean have_evolution_uri;
 
 #ifdef KILL_PROCESS_CMD
 	kill_old_dataserver ();
@@ -374,14 +373,10 @@ idle_cb (void *data)
 
 	}
 
-	have_evolution_uri = FALSE;
-
 	if (shell != NULL) {
 		e_shell_create_window (shell, default_component_id, NULL);
 		open_uris (corba_shell, uri_list);
 	} else {
-		CORBA_Environment ev;
-
 		CORBA_exception_init (&ev);
 		if (uri_list != NULL)
 			open_uris (corba_shell, uri_list);
