s/int/guint/g for 1-bit bitfield. Remove cruft use guint for 1-bit

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

	* em-account-editor.h: s/int/guint/g for 1-bit bitfield.
	* em-composer-utils.c: (em_utils_redirect_message): Remove cruft
	* em-folder-tree.c: (emft_drop_target): use guint for 1-bit bitfield
	and rename a variable with a name clash.
	* em-folder-utils.c: (em_folder_utils_rename_folder): Rename var to
	avoid name clashes.
	* em-folder-view.c: guint for 1-bit bitfields.
	* em-folder-view.h: Same as above.
	* em-format-html-print.h: Again.
	* em-format-html.c: (efh_text_html), (efh_multipart_related): Add comments
	* em-format.c: (emf_multipart_alternative): Add comment about using var that
	is passed in rather than a local variable.
	* em-inline-filter.c: (emif_scan): Remove unused var. Mark code static.
	* em-mailer-prefs.h: guint for 1-bit bitfields.
	* em-migrate.c: (em_migrate_folder): mark a struct static. remove unused var
	* em-subscribe-editor.c: guint for 1-bit bitfield
	* em-utils.c: remove unused function
	* em-vfolder-rule.c: mark array static
	* importers/mail-importer.c: (decode_status): Remove unused code. Use guint
	for 1-bit bitfield.
	* mail-autofilter.c: (rule_from_message): rename a variable
	* mail-component.c: guint for 1-bit bitfield
	* mail-folder-cache.c: (update_1folder): remove unused code
	* mail-mt.c: mark some structs static
	* message-list.c: (message_list_select_uid), (ml_value_to_string),
	(ml_tree_value_at), (find_next_undeleted), (build_tree),
	(build_flat): Remove unused code and fix some format specifiers.

svn path=/trunk/; revision=31448

1 files changed, 4 insertions, 4 deletions

diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 6578423880..ff5947bcdd 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -513,14 +513,14 @@ em_folder_utils_rename_folder (CamelFolder *folder)
 		} else {
 			CamelFolderInfo *fi;
 			CamelException ex;
-			char *path, *p;
+			char *path, *tmp;
 			
 			if (base_len > 0) {
 				path = g_malloc (base_len + strlen (new_name) + 2);
 				memcpy (path, folder->full_name, base_len);
-				p = path + base_len;
-				*p++ = '/';
-				strcpy (p, new_name);
+				tmp = path + base_len;
+				*tmp++ = '/';
+				strcpy (tmp, new_name);
 			} else {
 				path = g_strdup (new_name);
 			}