From 4a28d533aca4ed8438819170c84eb1657d693c02 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 25 May 2007 06:50:30 +0000 Subject: [PATCH] 2007-05-25 [colin] 2.9.2cvs14 * src/imap.c Fix a memory leak * src/imap_gtk.c Be more helpful in the subscription message --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 6 +++++- src/imap.c | 22 ---------------------- src/imap_gtk.c | 4 +++- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13c93a18d..a39f3a396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-05-25 [colin] 2.9.2cvs14 + + * src/imap.c + Fix a memory leak + * src/imap_gtk.c + Be more helpful in the subscription + message + 2007-05-23 [wwp] 2.9.2cvs13 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 83e5d2812..bb1fd6522 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2589,3 +2589,4 @@ ( cvs diff -u -r 1.382.2.378 -r 1.382.2.379 src/compose.c; cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/prefs_template.c; cvs diff -u -r 1.5.12.7 -r 1.5.12.8 src/quote_fmt.h; cvs diff -u -r 1.22.2.29 -r 1.22.2.30 src/quote_fmt_parse.y; ) > 2.9.2cvs11.patchset ( cvs diff -u -r 1.22.2.30 -r 1.22.2.31 src/quote_fmt_parse.y; ) > 2.9.2cvs12.patchset ( cvs diff -u -r 1.382.2.379 -r 1.382.2.380 src/compose.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_quote.c; cvs diff -u -r 1.12.2.43 -r 1.12.2.44 src/prefs_template.c; cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/prefs_template.h; cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/quote_fmt.c; cvs diff -u -r 1.5.12.8 -r 1.5.12.9 src/quote_fmt.h; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.31 -r 1.22.2.32 src/quote_fmt_parse.y; ) > 2.9.2cvs13.patchset +( cvs diff -u -r 1.179.2.173 -r 1.179.2.174 src/imap.c; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/imap_gtk.c; ) > 2.9.2cvs14.patchset diff --git a/configure.ac b/configure.ac index dc909cb0c..e5813ca22 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=13 +EXTRA_VERSION=14 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -146,6 +146,10 @@ case "$target" in CFLAGS="$CFLAGS -mms-bitfields" LIBS="$LIBS -l${pthread_name} -lws2_32 -lregex" ;; +*-sun-solaris2.8) + CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" + CFLAGS="$CFLAGS -DSOLARIS" + ;; esac dnl Checks for iconv diff --git a/src/imap.c b/src/imap.c index fc9640cd9..ff8f9447e 100644 --- a/src/imap.c +++ b/src/imap.c @@ -401,7 +401,6 @@ static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist); static GSList * imap_get_lep_set_from_msglist(MsgInfoList *msglist); static GSList * imap_uid_list_from_lep(clist * list); static GSList * imap_uid_list_from_lep_tab(carray * list); -static GSList * imap_uid_list_from_lep_uid_flags_tab(carray * list); static void imap_flags_hash_from_lep_uid_flags_tab(carray * list, GHashTable * hash); static MsgInfo *imap_envelope_from_lep(struct imap_fetch_env_info * info, @@ -3982,7 +3981,6 @@ static /*gint*/ void *imap_get_flags_thread(void *data) MsgInfoList *msginfo_list = stuff->msginfo_list; GRelation *msgflags = stuff->msgflags; GSList *elem; - GSList * fetchuid_list; carray * lep_uidtab; IMAPSession *session; gint ok; @@ -4099,9 +4097,6 @@ static /*gint*/ void *imap_get_flags_thread(void *data) } else { r = imap_threaded_fetch_uid_flags(folder, 1, &lep_uidtab); if (r == MAILIMAP_NO_ERROR) { - fetchuid_list = - imap_uid_list_from_lep_uid_flags_tab(lep_uidtab); - flags_hash = g_hash_table_new_full(g_int_hash, g_int_equal, free, NULL); imap_flags_hash_from_lep_uid_flags_tab(lep_uidtab, flags_hash); imap_fetch_uid_flags_list_free(lep_uidtab); @@ -4544,23 +4539,6 @@ static GSList * imap_uid_list_from_lep_tab(carray * list) return result; } -static GSList * imap_uid_list_from_lep_uid_flags_tab(carray * list) -{ - unsigned int i; - GSList * result; - - result = NULL; - - for(i = 0 ; i < carray_count(list) ; i += 2) { - uint32_t * puid; - - puid = carray_get(list, i); - result = g_slist_prepend(result, GINT_TO_POINTER(* puid)); - } - result = g_slist_reverse(result); - return result; -} - static void imap_flags_hash_from_lep_uid_flags_tab(carray * list, GHashTable * hash) { diff --git a/src/imap_gtk.c b/src/imap_gtk.c index 42df6a8cc..77a3d1305 100644 --- a/src/imap_gtk.c +++ b/src/imap_gtk.c @@ -479,7 +479,9 @@ static void subscribe_cb(FolderView *folderview, guint action, folderview_fast_rescan_tree(item->folder); } else { alertpanel_notice(_("This folder is already subscribed and " - "has no unsubscribed subfolders.")); + "has no unsubscribed subfolders.\n\nIf there are new folders, " + "created and subscribed to from another client, use \"Check " + "for new folders\" at the mailbox's root folder.")); } g_list_free(child_list); return; -- 2.25.1