Remove unused code and fix format specifiers in some cases.

2006-01-29  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.

svn path=/trunk/; revision=31367

7 files changed, 16 insertions, 23 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4d636697e3..52805c3a7d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-29  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-26  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
 
 	** Fixes Bug #257654
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c
index 64e79782e7..15894dbadb 100644
--- a/shell/e-corba-config-page.c
+++ b/shell/e-corba-config-page.c
@@ -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
diff --git a/shell/e-history.c b/shell/e-history.c
index ff4755bb8d..e279fb81bc 100644
--- a/shell/e-history.c
+++ b/shell/e-history.c
@@ -226,7 +226,7 @@ e_history_add (EHistory *history,
 		priv->current_item->next = NULL;
 	}
 
-	g_list_append (priv->current_item, data);
+	priv->current_item = g_list_append (priv->current_item, data);
 	priv->current_item = priv->current_item->next;
 }
 
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 7b87214a2d..db0e9d4d41 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -478,13 +478,11 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar)
 {
 	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);
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 41540126a5..2d7d6aaba4 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -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);
diff --git a/shell/e-shell.c b/shell/e-shell.c
index affa0df9d7..396ab8a4bd 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -555,7 +555,7 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
 	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 startup_line_mode,
 	     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 startup_line_mode,
 		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,11 +1013,8 @@ 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 );
 
 	client = gconf_client_get_default ();
diff --git a/shell/main.c b/shell/main.c
index 8b10c0725f..c29e25c4bd 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -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,8 +373,6 @@ 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);