diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 13 | ||||
| -rw-r--r-- | mail/em-format.c | 7 | ||||
| -rw-r--r-- | mail/em-popup.c | 2 |
4 files changed, 20 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b51720be54..72f22728a9 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-03-27 Matthew Barnes <mbarnes@redhat.com> + + * em-folder-browser.c: + * em-format.c: + * em-popup.c: + Don't mix declarations and code (#405495). + 2007-03-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #419524 diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 329af0b290..2903a2e19d 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -959,7 +959,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) EMFolderView *emfv = (EMFolderView *) emfb; EFilterBar *efb = (EFilterBar *)esb; char *search_state, *view_sexp, *folder_uri=NULL; - char *word = NULL, *storeuri = NULL, *search_word = NULL;; + char *word = NULL, *storeuri = NULL, *search_word = NULL; gint id, i; CamelFolder *folder; CamelStore *store; @@ -1784,6 +1784,7 @@ static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) { EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; + char *state; message_list_freeze(emfv->list); @@ -1805,11 +1806,11 @@ emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) emfb_parent->set_folder(emfv, folder, uri); /* etspec for search results */ - char *state = "<ETableState>" - "<column source=\"0\"/> <column source=\"3\"/> <column source=\"1\"/>" - "<column source=\"14\"/> <column source=\"5\"/>" - "<column source=\"7\"/> <column source=\"13\"/> " - "<grouping><leaf column=\"7\" ascending=\"false\"/> </grouping> </ETableState>"; + state = "<ETableState>" + "<column source=\"0\"/> <column source=\"3\"/> <column source=\"1\"/>" + "<column source=\"14\"/> <column source=\"5\"/>" + "<column source=\"7\"/> <column source=\"13\"/> " + "<grouping><leaf column=\"7\" ascending=\"false\"/> </grouping> </ETableState>"; e_tree_set_state (((MessageList *)emfv->list)->tree, state); message_list_thaw(emfv->list); diff --git a/mail/em-format.c b/mail/em-format.c index 32fc1d0b91..1871e885c3 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -1235,10 +1235,13 @@ emf_multipart_alternative(EMFormat *emf, CamelStream *stream, CamelMimePart *par /* as per rfc, find the last part we know how to display */ nparts = camel_multipart_get_number(mp); for (i = 0; i < nparts; i++) { + CamelContentType *type; + char *mime_type; + /* is it correct to use the passed in *part here? */ part = camel_multipart_get_part(mp, i); - CamelContentType *type = camel_mime_part_get_content_type (part); - char *mime_type = camel_content_type_simple (type); + type = camel_mime_part_get_content_type (part); + mime_type = camel_content_type_simple (type); camel_strdown (mime_type); diff --git a/mail/em-popup.c b/mail/em-popup.c index 833da13696..c48f901d94 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -633,11 +633,11 @@ static EPopupItem emp_standard_uri_popups[] = { static void emp_apps_open_in(EPopup *ep, EPopupItem *item, void *data) { - printf("in emp_apps_open_in\n"); char *path; EPopupTarget *target = ep->target; CamelMimePart *part; + printf("in emp_apps_open_in\n"); if (target->type == EM_POPUP_TARGET_ATTACHMENTS) part = ((EAttachment *) ((EMPopupTargetAttachments *) target)->attachments->data)->body; else |