From 36211f08ae7e3935d8665f6966dda660dd0fe224 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 20 Feb 2004 20:03:19 +0000 Subject: Delete key should always delete, never undelete (bug #53215). Also fixes a 2004-02-20 Jeffrey Stedfast * em-folder-view.c (emfv_list_key_press): Delete key should always delete, never undelete (bug #53215). Also fixes a bug where uids->len was being accessed after uids had been free'd. svn path=/trunk/; revision=24822 --- mail/ChangeLog | 4 ++++ mail/em-folder-view.c | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 5d9709bef8..284e5a6e95 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2004-02-20 Jeffrey Stedfast + * em-folder-view.c (emfv_list_key_press): Delete key should always + delete, never undelete (bug #53215). Also fixes a bug where + uids->len was being accessed after uids had been free'd. + Fix for bug #53997 * em-folder-view.c (emfv_list_message_selected): Ref the emfv diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index fe37964206..9ba2172470 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1830,19 +1830,14 @@ emfv_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, break; case GDK_Delete: case GDK_KP_Delete: - /* If any messages are undeleted, run delete, if all are deleted, run undelete */ - flags = 0; uids = message_list_get_selected(emfv->list); for (i = 0; i < uids->len; i++) { if ((camel_folder_get_message_flags(emfv->folder, uids->pdata[i]) & CAMEL_MESSAGE_DELETED) == 0) break; } message_list_free_uids(emfv->list, uids); - if (i == uids->len) - emfv_popup_undelete(NULL, emfv); - else - emfv_popup_delete(NULL, emfv); - + emfv_popup_delete (NULL, emfv); + if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE) && emfv->hide_deleted) message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0, FALSE); break; -- cgit > FreeBSD Ports (https://github.com/freebsd/freebsd-ports)
aboutsummaryrefslogblamecommitdiffstats
blob: 0e61c537dc7caf9982c9e9db292c2ec98570c1d4 (plain) (tree)
1
2
3
4


                    
                      










                                                             

                                                                                                   
                                                                
 



                                           



                              
                                      


                                                                                                       
                                      










                                                                            
                                                                     


                                    
 
                                                              
 



                                            
                                  





                                                                  


                                                             

                                       

                                            
 
                              
 
                                                                       


                                

                          
                                  





















                                                                               
# $FreeBSD$

PORTNAME=   node
PORTVERSION=    8.15.1
DISTVERSIONPREFIX=  v
CATEGORIES= www
MASTER_SITES=   http://nodejs.org/dist/v${PORTVERSION}/
PKGNAMESUFFIX=  8

MAINTAINER= bhughes@FreeBSD.org
COMMENT=    V8 JavaScript for client and server (8.x LTS)

LICENSE=    MIT
LICENSE_FILE=   ${WRKSRC}/LICENSE

BROKEN_SSL=     libressl libressl-devel
BROKEN_SSL_REASON=  Node.js 8.x LTS requires OpenSSL >= 1.0.2 or the BUNDLED_SSL option enabled
ONLY_FOR_ARCHS=     aarch64 amd64 armv6 armv7 i386 powerpc64

OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE
OPTIONS_DEFAULT=DTRACE
OPTIONS_SUB=    yes

.if !exists(/usr/sbin/dtrace)
OPTIONS_EXCLUDE+=   DTRACE
.endif

OPTIONS_EXCLUDE_aarch64=    DTRACE
# dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented
OPTIONS_EXCLUDE_armv6=      DTRACE
OPTIONS_EXCLUDE_armv7=      DTRACE
OPTIONS_EXCLUDE_powerpc64=  DTRACE

BUNDLED_SSL_DESC=       Use node.js's bundled OpenSSL implementation
BUNDLED_SSL_USES_OFF=       ssl
BUNDLED_SSL_CONFIGURE_OFF=  --shared-openssl --openssl-use-def-ca-store
BUNDLED_SSL_RUN_DEPENDS_OFF=    ca_root_nss>=0:security/ca_root_nss

NLS_CONFIGURE_ON=   --with-intl=system-icu
NLS_LIB_DEPENDS=    libicui18n.so:devel/icu

DTRACE_CONFIGURE_ON=    --with-dtrace

USES=       compiler:c++11-lib gmake python:2.7,build pkgconfig \
        localbase shebangfix

HAS_CONFIGURE=  yes

CONFLICTS_INSTALL=  node6-[0-9]* node10-[0-9]* node-[0-9]*

CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
        --without-npm \
        --shared-cares \
        --shared-libuv \
        --shared-nghttp2 \
        --shared-zlib

SHEBANG_FILES=  tools/specialize_node_d.py tools/genv8constants.py

PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
REINPLACE_ARGS= -i ''
MAKE_ENV+=  CC.host=${CC} CFLAGS.host="${CFLAGS}" \
        CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \
        LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}"

LIB_DEPENDS+=   libcares.so:dns/c-ares\
        libuv.so:devel/libuv \
        libnghttp2.so:www/libnghttp2

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386
CONFIGURE_ARGS+=--openssl-no-asm
.endif

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == gcc
# GCC does not expose std::snprintf() without this define
CXXFLAGS+=  -D_GLIBCXX_USE_C99
.endif

post-patch:
    @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
        ${WRKSRC}/deps/v8/src/v8.gyp

post-configure:
    # Post-process Makefile and *.mk files created by node-gyp and remove
    # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
    # before all -I../deps/* for bundled code. This can cause build
    # breakages if the dependency is installed in ${LOCALBASE}. The
    # USES+=localbase # above will ensure that we pick up includes for real
    # external dependencies.
    ${FIND} ${WRKSRC}/out -type f -print0 \
        | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"

post-install:
    ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node

.include <bsd.port.post.mk>