Use guint for 1 bit bitfield, use g_slist_delete_link instead of

2006-01-24  Kjartan Maraas  <kmaraas@gnome.org>

	* e-msg-composer-hdrs.c: (account_removed_cb),
	(header_new_recipient): Use guint for 1 bit bitfield, use
	g_slist_delete_link instead of g_slist_remove_link+g_slist_free1,
	Remove some unused vars.
	* e-msg-composer.c: (build_message), (set_editor_text),
	(autosave_manager_query_load_orphans),
	(e_msg_composer_new_with_message): Remove unused vars and rename
	a local variable with a name clash.
	* evolution-composer.c: (evolution_composer_init): Remove unused var
	* listener.c: Remove stray semi colon.

svn path=/trunk/; revision=31358

5 files changed, 22 insertions, 20 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index eb470046f5..2884cf7d09 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,16 @@
+2006-01-24  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-msg-composer-hdrs.c: (account_removed_cb),
+	(header_new_recipient): Use guint for 1 bit bitfield, use
+	g_slist_delete_link instead of g_slist_remove_link+g_slist_free1,
+	Remove some unused vars.
+	* e-msg-composer.c: (build_message), (set_editor_text),
+	(autosave_manager_query_load_orphans),
+	(e_msg_composer_new_with_message): Remove unused vars and rename
+	a local variable with a name clash.
+	* evolution-composer.c: (evolution_composer_init): Remove unused var
+	* listener.c: Remove stray semi colon.
+
 2006-1-13  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** Fixes bug #323127
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 8a52188e9e..18bd8235ae 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -92,7 +92,7 @@ extern struct _EMFolderTreeModel *mail_component_peek_tree_model(struct _MailCom
 typedef struct {
 	GtkWidget *label;
 	GtkWidget *entry;
-	int visible:1;
+	guint visible:1;
 } EMsgComposerHdrPair;
 
 struct _EMsgComposerHdrsPrivate {
@@ -317,8 +317,7 @@ account_removed_cb (EAccountList *accounts, EAccount *account, EMsgComposerHdrs
 			if (hdrs->account == account)
 				hdrs->account = NULL;
 			
-			priv->from_options = g_slist_remove_link (priv->from_options, node);
-			g_slist_free_1 (node);
+			priv->from_options = g_slist_delete_link (priv->from_options, node);
 			g_object_unref (account);
 			gtk_widget_destroy (item);
 			break;
@@ -576,11 +575,8 @@ post_entry_changed_cb (GtkButton *button, EMsgComposerHdrs *hdrs)
 static EMsgComposerHdrPair 
 header_new_recipient (EMsgComposerHdrs *hdrs, const char *name, const char *tip)
 {
-	EMsgComposerHdrsPrivate *priv;
 	EMsgComposerHdrPair ret;
 	
-	priv = hdrs->priv;
-	
 	ret.label = gtk_button_new_with_mnemonic (name);
 	GTK_OBJECT_UNSET_FLAGS (ret.label, GTK_CAN_FOCUS);
 	g_signal_connect_data (ret.label, "clicked",
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 55eea52e44..008c583b00 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -714,8 +714,6 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		e_attachment_bar_to_multipart (attachment_bar, multipart, p->charset);
 		
 		if (p->is_alternative) {
-			int i;
-			
 			for (i = camel_multipart_get_number (multipart); i > 1; i--) {
 				part = camel_multipart_get_part (multipart, i - 1);
 				camel_medium_remove_header (CAMEL_MEDIUM (part), "Content-Disposition");
@@ -733,7 +731,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	    || p->smime_encrypt
 #endif
 		) {
-		int i, j;
+		int j;
 		const char *types[] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC, CAMEL_RECIPIENT_TYPE_BCC };
 
 		recipients = g_ptr_array_new();
@@ -1253,7 +1251,6 @@ set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_s
 	EMsgComposerPrivate *p = composer->priv;
 	Bonobo_PersistStream persist;
 	BonoboStream *stream;
-	BonoboWidget *editor;
 	CORBA_Environment ev;
 	Bonobo_Unknown object;
 
@@ -1261,8 +1258,6 @@ set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_s
 	
 	persist = p->persist_stream_interface;
 	
-	editor = BONOBO_WIDGET (p->eeditor);
-	
 	CORBA_exception_init (&ev);
 
 	if (len == -1)
@@ -1533,7 +1528,8 @@ autosave_manager_query_load_orphans (AutosaveManager *am, GtkWindow *parent)
 		char *filename = match->data;
 		EMsgComposer *composer;
 		
-		if (load) { 
+		if (load) {
+			/* FIXME: composer is never used */ 
 			composer = autosave_load_draft (filename);
 		} else {
 			g_unlink (filename);
@@ -4610,11 +4606,11 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 			handle_multipart (new, multipart, 0);
 		}
 	} else {
-		ssize_t len;
+		ssize_t length;
 		char *html;
 
-		html = em_utils_part_to_html((CamelMimePart *)message, &len, NULL);
-		e_msg_composer_set_pending_body(new, html, len);
+		html = em_utils_part_to_html((CamelMimePart *)message, &length, NULL);
+		e_msg_composer_set_pending_body(new, html, length);
 	}
 	
 	/* We wait until now to set the body text because we need to ensure that
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index aea958058f..93d519cb34 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -319,9 +319,6 @@ evolution_composer_class_init (EvolutionComposerClass *klass)
 static void
 evolution_composer_init (EvolutionComposer *composer)
 {
-	EAccount *account;
-	
-	account = mail_config_get_default_account ();
 	composer->composer = e_msg_composer_new ();
 	composer->priv = g_malloc0(sizeof(*composer->priv));
 }
diff --git a/composer/listener.c b/composer/listener.c
index 0ec7b17dbf..8f2f293994 100644
--- a/composer/listener.c
+++ b/composer/listener.c
@@ -138,7 +138,7 @@ listener_init(EditorListener *object)
 {
 }
 
-BONOBO_TYPE_FUNC_FULL(EditorListener, GNOME_GtkHTML_Editor_Listener, BONOBO_TYPE_OBJECT, listener);
+BONOBO_TYPE_FUNC_FULL(EditorListener, GNOME_GtkHTML_Editor_Listener, BONOBO_TYPE_OBJECT, listener)
 
 EditorListener *
 listener_new (EMsgComposer *composer)