Changeset 2053
- Timestamp:
- 02/21/10 05:29:24 (5 months ago)
- Location:
- trunk
- Files:
-
- 12 modified
-
plugins/e2p_crypt.c (modified) (1 diff)
-
plugins/e2p_dircmp.c (modified) (1 diff)
-
plugins/e2p_find.c (modified) (1 diff)
-
plugins/e2p_selmatch.c (modified) (1 diff)
-
plugins/e2p_upgrade.c (modified) (1 diff)
-
plugins/optional/e2p_thumbs.c (modified) (8 diffs)
-
src/actions/e2_action.h (modified) (1 diff)
-
src/config/e2_option.h (modified) (1 diff)
-
src/e2_context_menu.c (modified) (1 diff)
-
src/e2_pane.h (modified) (1 diff)
-
src/e2_toolbar.h (modified) (2 diffs)
-
src/utils/e2_menu.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/plugins/e2p_crypt.c
r2045 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2007-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2007-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/plugins/e2p_dircmp.c
r2039 r2053 1 1 /* $Id$ 2 2 3 Portions copyright (C) 2006-20 09tooar <tooar@emelfm2.net>3 Portions copyright (C) 2006-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/plugins/e2p_find.c
r2052 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2005-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2005-2010 tooar <tooar@emelfm2.net> 4 4 Portions copyright (C) 1999 Matthew Grossman <mattg@oz.net> 5 5 -
trunk/plugins/e2p_selmatch.c
r2047 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2009 tooar <tooar@emelfm2.net>3 Copyright (C) 2009-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/plugins/e2p_upgrade.c
r2042 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2005-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2005-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/plugins/optional/e2p_thumbs.c
r2045 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2007-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2007-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. … … 80 80 gint filtercount; //for matching whether parent filelist has been re-filtered 81 81 GtkSortType sort_order; 82 g boolean blocked; //flag to prevent recursive refreshed82 gint blocked; //0 when no refresh in progress, prevents recursive refreshing 83 83 #ifdef E2_VFSTMP 84 84 //FIXME path when dir not mounted local … … 213 213 static GtkListStore *_e2p_thumbs_replace_store (E2_ThumbDialogRuntime *rt) 214 214 { 215 rt->blocked = TRUE; //prevent re-entrance 215 if (!g_atomic_int_compare_and_exchange (&rt->blocked, 0, 1)) //prevent re-entrance 216 return NULL; 216 217 // printd (DEBUG, "start store fill"); 217 218 GtkListStore *store = _e2p_thumbs_make_store (); 218 219 if (store == NULL) 219 220 { 220 rt->blocked = FALSE;221 g_atomic_int_add (&rt->blocked, -1); 221 222 return NULL; 222 223 } … … 499 500 e2_filelist_enable_one_refresh (pane); 500 501 501 rt->blocked = FALSE;502 // printd (DEBUG, "finish icons store fill");502 g_atomic_int_set (&rt->blocked, 0); 503 // printd (DEBUG, "finish icons store fill"); 503 504 return store; 504 505 } … … 589 590 #endif 590 591 if ((rt->dir_mtime < rt->view->dir_mtime || rt->filtercount != rt->view->filtercount) 591 && !rt->blocked592 && !strcmp (rt->path, rt->view->dir))592 && g_atomic_int_get (&rt->blocked) == 0 593 && strcmp (rt->path, rt->view->dir) == 0) 593 594 { 594 595 busy = TRUE; … … 649 650 static gboolean _e2p_thumbs_wait_to_replace (E2_ThumbDialogRuntime *rt) 650 651 { 651 if (GTK_IS_WIDGET (rt->dialog) && !rt->blocked)652 if (GTK_IS_WIDGET (rt->dialog) && g_atomic_int_get (&rt->blocked) == 0) 652 653 { 653 654 LISTS_LOCK … … 703 704 static gboolean _e2p_thumbs_wait_to_refresh (E2_ThumbDialogRuntime *rt) 704 705 { 705 if (GTK_IS_WIDGET (rt->dialog) && !rt->blocked)706 if (GTK_IS_WIDGET (rt->dialog) && g_atomic_int_get (&rt->blocked) == 0) 706 707 { 707 708 LISTS_LOCK … … 1523 1524 rt->sort_order = view->sort_order; 1524 1525 rt->filtercount = view->filtercount; 1525 rt->blocked = FALSE;1526 rt->blocked = 0; 1526 1527 /* no need for this, before the store is initially filled 1527 1528 GtkTreeSortable *sortable = GTK_TREE_SORTABLE (rt->store); -
trunk/src/actions/e2_action.h
r2042 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2003-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2003-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/src/config/e2_option.h
r2044 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2003-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2003-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/src/e2_context_menu.c
r2042 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2003-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2003-2010 tooar <tooar@emelfm2.net> 4 4 Portions copyright (C) 1999 Michael Clark. 5 5 -
trunk/src/e2_pane.h
r2042 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2004-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2004-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. -
trunk/src/e2_toolbar.h
r1947 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2003-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2003-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2. … … 51 51 // & sometimes a separate commandline tool 52 52 #endif 53 gboolean blocked; //TRUEwhen bar's context menu is being created53 volatile gint blocked; //non-0 when bar's context menu is being created 54 54 gboolean hidden; 55 55 E2_OptionSet *set; -
trunk/src/utils/e2_menu.c
r2038 r2053 1 1 /* $Id$ 2 2 3 Copyright (C) 2004-20 09tooar <tooar@emelfm2.net>3 Copyright (C) 2004-2010 tooar <tooar@emelfm2.net> 4 4 5 5 This file is part of emelFM2.