diff options
author | Kjartan Maraas <kmaraas@gnome.org> | 2006-02-08 19:51:32 +0800 |
---|---|---|
committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2006-02-08 19:51:32 +0800 |
commit | f6e0e26a6febd0c934a166437bb344f2dbb735a9 (patch) | |
tree | e0020bed35ced9e71df75bc9c015f844c4645707 /mail/em-folder-tree.c | |
parent | ea9e711fe9b31a61fa9ace5dd5d84740d216f182 (diff) | |
download | gsoc2013-evolution-f6e0e26a6febd0c934a166437bb344f2dbb735a9.tar.gz gsoc2013-evolution-f6e0e26a6febd0c934a166437bb344f2dbb735a9.tar.zst gsoc2013-evolution-f6e0e26a6febd0c934a166437bb344f2dbb735a9.zip |
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
Diffstat (limited to 'mail/em-folder-tree.c')
-rw-r--r-- | mail/em-folder-tree.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index c709165c02..a85c98bd39 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -91,8 +91,8 @@ struct _EMFolderTreePrivate { gboolean (*excluded_func)(EMFolderTree *emft, GtkTreeModel *model, GtkTreeIter *iter, void *data); void *excluded_data; - int do_multiselect:1; /* multiple select mode */ - int cursor_set:1; /* set to TRUE means we or something + guint do_multiselect:1; /* multiple select mode */ + guint cursor_set:1; /* set to TRUE means we or something * else has set the cursor, otherwise * we need to set it when we set the * selection */ @@ -1155,15 +1155,15 @@ emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path) /* Check for special sources, and vfolder stuff */ if (src_uri) { CamelURL *url; - char *path; + char *url_path; /* FIXME: this is a total hack, but i think all we can do at present */ /* Check for dragging from special folders which can't be moved/copied */ url = camel_url_new(src_uri, NULL); - path = url->fragment?url->fragment:url->path; - if (path && path[0]) { + url_path = url->fragment?url->fragment:url->path; + if (url_path && url_path[0]) { /* don't allow moving any of the the local special folders */ - if (sstore == local && is_special_local_folder (path)) { + if (sstore == local && is_special_local_folder (url_path)) { GdkAtom xfolder; camel_url_free (url); @@ -1184,16 +1184,16 @@ emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path) } /* don't allow copying/moving of the UNMATCHED vfolder */ - if (!strcmp (url->protocol, "vfolder") && !strcmp (path, CAMEL_UNMATCHED_NAME)) { + if (!strcmp (url->protocol, "vfolder") && !strcmp (url_path, CAMEL_UNMATCHED_NAME)) { camel_url_free (url); goto done; } /* don't allow copying/moving of any vTrash/vJunk folder nor maildir 'inbox' */ - if (strcmp(path, CAMEL_VTRASH_NAME) == 0 - || strcmp(path, CAMEL_VJUNK_NAME) == 0 + if (strcmp(url_path, CAMEL_VTRASH_NAME) == 0 + || strcmp(url_path, CAMEL_VJUNK_NAME) == 0 /* Dont allow drag from maildir 'inbox' */ - || strcmp(path, ".") == 0) { + || strcmp(url_path, ".") == 0) { camel_url_free(url); goto done; } |