Fix more compiler warnings.

3 files changed, 2 insertions, 38 deletions

diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index e0e64fa90a..71f5a1f037 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -655,33 +655,6 @@ emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMime
 
 
 static gboolean
-emfv_spin(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject)
-{
-	GtkWidget *ep;
-
-	if (!strcmp(eb->classid, "spinner")) {
-		GtkWidget *box, *label;
-		gchar *msg = g_strdup_printf("<b>%s</b>", _("Retrieving Message..."));
-
-		label = gtk_label_new (NULL);
-		gtk_label_set_markup ((GtkLabel *)label, msg);
-		box = gtk_hbox_new (FALSE, 0);
-		g_free (msg);
-
-		ep = e_spinner_new_spinning_small_shown ();
-		gtk_box_pack_start ((GtkBox *)box, ep, FALSE, FALSE, 0);
-		gtk_box_pack_start ((GtkBox *)box, label, FALSE, FALSE, 0);
-
-		gtk_container_add ((GtkContainer *)eb, box);
-		gtk_widget_show_all ((GtkWidget *)eb);
-
-		g_signal_handlers_disconnect_by_func(efh, emfv_spin, NULL);
-	}
-
-	return TRUE;
-}
-
-static gboolean
 emfv_message_selected_timeout(gpointer data)
 {
 	EMFolderView *emfv = data;
@@ -696,15 +669,6 @@ emfv_message_selected_timeout(gpointer data)
 			g_object_ref (emfv);
 			/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
 			e_profile_event_emit("goto.load", emfv->displayed_uid, 0);
-/*			hstream = gtk_html_begin(((EMFormatHTML *)emfv->preview)->html);
-
-			g_signal_connect(((EMFormatHTML *)emfv->preview)->html, "object_requested", G_CALLBACK(emfv_spin), NULL);
-
-			gtk_html_stream_printf(hstream, "<object classid=\"spinner\"><h2>%s</h2><p>%s</p></object>",
-						       _("Retrieving Message"),
-						       emfv->displayed_uid);
-			gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
-*/
 			mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push);
 		} else {
 			e_profile_event_emit("goto.empty", "", 0);
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index cc8168159b..7dd3f5b3e3 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -46,7 +46,7 @@ static EImportImporter *import_importer;
 static GtkWidget *import_dialog, *import_progress, *import_label;
 static GSList *import_iterator, *import_importers;
 
-static void
+G_GNUC_NORETURN static void
 startup_wizard_delete (void) {
 	gtk_main_quit ();
 	_exit (0);
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 83f4fda189..dcab44ac4b 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -607,7 +607,7 @@ search_bar_dispose (GObject *object)
 /* /\* Callback used when an option item is destroyed.  We have to destroy its */
 /*  * suboption items. */
 /*  *\/ */
-/* static gpointer /
+/* static gpointer */
 /* option_item_destroy_cb (GtkObject *object, gpointer data) */
 /* { */
 /* /\*	ESearchBarSubitem *subitems; *\/ */