Revision: 201003
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 02 Feb 2010 00:10:37 +0200
changeset 4 57d388cc48c1
parent 3 9a9c174934f5
child 5 f7f0874bfe7d
Revision: 201003 Kit: 201005
photos_plat/controllers_collection_api/tsrc/ui_metaDataDialog/group/ui_metaDataDialog_DoxyFile.py
photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group/ut_collectioninfo_DoxyFile.py
photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group/ut_collectionmanager_DoxyFile.py
photosgallery/controllers/imageviewer/bwins/glximageviewermanageru.def
photosgallery/controllers/imageviewer/eabi/glximageviewermanageru.def
photosgallery/controllers/imageviewer/group/bld.inf
photosgallery/controllers/imageviewer/group/glximageviewermanager.mmp
photosgallery/controllers/imageviewer/inc/glximageviewermanager.h
photosgallery/controllers/imageviewer/inc/glximageviewermanager.inl
photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp
photosgallery/imgvwr/inc/glxivwrappui.h
photosgallery/imgvwr/src/glxivwrappui.cpp
photosgallery/imgvwr/src/glxivwrdocument.cpp
photosgallery/viewframework/commandhandlers/commoncommandhandlers/bwins/glxcommoncommandhandlersu.def
photosgallery/viewframework/commandhandlers/commoncommandhandlers/eabi/glxcommoncommandhandlersu.def
photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwedit.h
photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwedit.cpp
photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersave.cpp
photosgallery/viewframework/commandhandlers/inc/glxcommandhandlers.hrh
photosgallery/viewframework/medialists/bwins/glxmedialistsu.def
photosgallery/viewframework/medialists/eabi/glxmedialistsu.def
photosgallery/viewframework/medialists/inc/glxcachemanager.h
photosgallery/viewframework/medialists/inc/glximagereader.h
photosgallery/viewframework/medialists/src/glxcachemanager.cpp
photosgallery/viewframework/medialists/src/glximagereader.cpp
photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxcacheu.def
photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxfetcherrorarrayu.def
photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxgarbagecollectoru.def
photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxmediau.def
photosgallery/viewframework/medialists/tsrc/BWINS/t_glxlistwindowu.def
photosgallery/viewframework/medialists/tsrc/BWINS/t_tglxexclusioniteratoru.def
photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxattributecontextu.def
photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxitemlistu.def
photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxnavigablelistu.def
photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxstaticitemlistu.def
photosgallery/viewframework/medialists/tsrc/BWINS/ut_glxerrormanageru.def
photosgallery/viewframework/medialists/tsrc/eabi/t_cglxcacheu.def
photosgallery/viewframework/medialists/tsrc/eabi/t_cglxfetcherrorarrayu.def
photosgallery/viewframework/medialists/tsrc/eabi/t_cglxgarbagecollectoru.def
photosgallery/viewframework/medialists/tsrc/eabi/ut_cglxattributecontextu.def
photosgallery/viewframework/medialists/tsrc/eabi/ut_glxerrormanageru.def
photosgallery/viewframework/plugins/fullscreenviewplugin/data/glxfullscreenviewdata.rss
photosgallery/viewframework/plugins/fullscreenviewpluginbase/bwins/glxfullscreenviewpluginbaseu.def
photosgallery/viewframework/plugins/fullscreenviewpluginbase/eabi/glxfullscreenviewpluginbaseu.def
photosgallery/viewframework/plugins/fullscreenviewpluginbase/src/glxfullscreenviewpluginbase.cpp
photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss
photosgallery/viewframework/plugins/gridviewpluginbase/src/glxgridviewpluginbase.cpp
photosgallery/viewframework/plugins/listviewplugin/data/glxlistviewplugin.rss
photosgallery/viewframework/tvout/bwins/glxtvoutu.def
photosgallery/viewframework/tvout/eabi/glxtvoutu.def
photosgallery/viewframework/tvout/inc/glxhdmicontroller.h
photosgallery/viewframework/tvout/inc/glxtv.h
photosgallery/viewframework/tvout/inc/glxtvconnectionmonitor.h
photosgallery/viewframework/tvout/src/glxhdmicontroller.cpp
photosgallery/viewframework/tvout/src/glxhdmisurfaceupdater.cpp
photosgallery/viewframework/tvout/src/glxtv.cpp
photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp
photosgallery/viewframework/uiutilities/data/glxuiutilities.rss
photosgallery/viewframework/views/cloudview/inc/glxcloudviewcontrol.h
photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp
photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp
photosgallery/viewframework/views/zoomview/inc/glxzoomcontrol.h
photosgallery/viewframework/views/zoomview/src/glxzoomcontrol.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/photos_plat/controllers_collection_api/tsrc/ui_metaDataDialog/group/ui_metaDataDialog_DoxyFile.py	Tue Feb 02 00:10:37 2010 +0200
@@ -0,0 +1,239 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description:
+#
+#
+
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = ui_metaDataDialog
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = \ui_metaDataDialog\
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = 
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = NO
+GENERATE_TESTLIST      = NO
+GENERATE_BUGLIST       = NO
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
+FILE_VERSION_FILTER    = 
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = \ui_metaDataDialog\
+FILE_PATTERNS          = *.h \
+                         *.rh \
+                         *.hrh
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = NO
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = YES
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = YES
+TOC_EXPAND             = YES
+DISABLE_INDEX          = YES
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = YES
+RTF_OUTPUT             = Doc
+COMPACT_RTF            = YES
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = NONSHARABLE_CLASS
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group/ut_collectioninfo_DoxyFile.py	Tue Feb 02 00:10:37 2010 +0200
@@ -0,0 +1,239 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description:
+#
+#
+
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = ut_collectioninfo
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = \ut_collectioninfo\
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = 
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = NO
+GENERATE_TESTLIST      = NO
+GENERATE_BUGLIST       = NO
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
+FILE_VERSION_FILTER    = 
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = \ut_collectioninfo\
+FILE_PATTERNS          = *.h \
+                         *.rh \
+                         *.hrh
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = NO
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = YES
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = YES
+TOC_EXPAND             = YES
+DISABLE_INDEX          = YES
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = YES
+RTF_OUTPUT             = Doc
+COMPACT_RTF            = YES
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = NONSHARABLE_CLASS
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group/ut_collectionmanager_DoxyFile.py	Tue Feb 02 00:10:37 2010 +0200
@@ -0,0 +1,239 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description:
+#
+#
+
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = ut_collectionmanager
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = M:\photos\photos_plat\controllers_collection_api\tsrc\ut_collectionmanager\
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = 
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = NO
+GENERATE_TESTLIST      = NO
+GENERATE_BUGLIST       = NO
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
+FILE_VERSION_FILTER    = 
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = M:\photos\photos_plat\controllers_collection_api\tsrc\ut_collectionmanager\
+FILE_PATTERNS          = *.h \
+                         *.rh \
+                         *.hrh
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = NO
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = YES
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = YES
+TOC_EXPAND             = YES
+DISABLE_INDEX          = YES
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = YES
+RTF_OUTPUT             = Doc
+COMPACT_RTF            = YES
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = NONSHARABLE_CLASS
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
--- a/photosgallery/controllers/imageviewer/bwins/glximageviewermanageru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/controllers/imageviewer/bwins/glximageviewermanageru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,11 +1,10 @@
 EXPORTS
-	?SetImageUriL@CGlxImageViewerManager@@QAEXABVTDesC16@@@Z @ 1 NONAME ; void CGlxImageViewerManager::SetImageUriL(class TDesC16 const &)
-	?Reset@CGlxImageViewerManager@@QAEXXZ @ 2 NONAME ; void CGlxImageViewerManager::Reset(void)
-	?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 3 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
-	?ImageFileHandle@CGlxImageViewerManager@@QBEAAVRFile64@@XZ @ 4 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void) const
-	?InstanceL@CGlxImageViewerManager@@SAPAV1@XZ @ 5 NONAME ; class CGlxImageViewerManager * CGlxImageViewerManager::InstanceL(void)
-	?IncrementRefCount@CGlxImageViewerManager@@QAEXXZ @ 6 NONAME ; void CGlxImageViewerManager::IncrementRefCount(void)
-	?SetImageFileHandleL@CGlxImageViewerManager@@QAEXABVRFile@@@Z @ 7 NONAME ; void CGlxImageViewerManager::SetImageFileHandleL(class RFile const &)
-	?DeleteInstance@CGlxImageViewerManager@@QAEXXZ @ 8 NONAME ; void CGlxImageViewerManager::DeleteInstance(void)
-	?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 9 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
+	?SetImageFileHandleL@CGlxImageViewerManager@@QAEXABVRFile@@@Z @ 1 NONAME ; void CGlxImageViewerManager::SetImageFileHandleL(class RFile const &)
+	?SetImageUriL@CGlxImageViewerManager@@QAEXABVTDesC16@@@Z @ 2 NONAME ; void CGlxImageViewerManager::SetImageUriL(class TDesC16 const &)
+	?DeleteInstance@CGlxImageViewerManager@@QAEXXZ @ 3 NONAME ; void CGlxImageViewerManager::DeleteInstance(void)
+	?Reset@CGlxImageViewerManager@@QAEXXZ @ 4 NONAME ; void CGlxImageViewerManager::Reset(void)
+	?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 5 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
+	?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 6 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
+	?ImageFileHandle@CGlxImageViewerManager@@QAEAAVRFile64@@XZ @ 7 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void)
+	?InstanceL@CGlxImageViewerManager@@SAPAV1@XZ @ 8 NONAME ; class CGlxImageViewerManager * CGlxImageViewerManager::InstanceL(void)
 
--- a/photosgallery/controllers/imageviewer/eabi/glximageviewermanageru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/controllers/imageviewer/eabi/glximageviewermanageru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,13 +1,12 @@
 EXPORTS
 	_ZN22CGlxImageViewerManager12SetImageUriLERK7TDesC16 @ 1 NONAME
 	_ZN22CGlxImageViewerManager14DeleteInstanceEv @ 2 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 3 NONAME
+	_ZN22CGlxImageViewerManager15ImageFileHandleEv @ 3 NONAME
 	_ZN22CGlxImageViewerManager19SetImageFileHandleLERK5RFile @ 4 NONAME
 	_ZN22CGlxImageViewerManager5ResetEv @ 5 NONAME
 	_ZN22CGlxImageViewerManager8ImageUriEv @ 6 NONAME
 	_ZN22CGlxImageViewerManager9InstanceLEv @ 7 NONAME
 	_ZN22CGlxImageViewerManager9IsPrivateEv @ 8 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 9 NONAME
-	_ZTI22CGlxImageViewerManager @ 10 NONAME
-	_ZTV22CGlxImageViewerManager @ 11 NONAME
+	_ZTI22CGlxImageViewerManager @ 9 NONAME
+	_ZTV22CGlxImageViewerManager @ 10 NONAME
 
--- a/photosgallery/controllers/imageviewer/group/bld.inf	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/controllers/imageviewer/group/bld.inf	Tue Feb 02 00:10:37 2010 +0200
@@ -23,7 +23,6 @@
 
 PRJ_EXPORTS
 ../inc/glximageviewermanager.h           APP_LAYER_PLATFORM_EXPORT_PATH(glximageviewermanager.h)
-../inc/glximageviewermanager.inl           APP_LAYER_PLATFORM_EXPORT_PATH(glximageviewermanager.inl)
 
 PRJ_MMPFILES
 glximageviewermanager.mmp
--- a/photosgallery/controllers/imageviewer/group/glximageviewermanager.mmp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/controllers/imageviewer/group/glximageviewermanager.mmp	Tue Feb 02 00:10:37 2010 +0200
@@ -34,11 +34,13 @@
 
 APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE             ../../../inc
+SYSTEMINCLUDE           ../../../common/inc
 
 USERINCLUDE             ../inc
 
 LIBRARY 				efsrv.lib
 LIBRARY					euser.lib
 LIBRARY                 flogger.lib         // For Logging Tracer
+LIBRARY                 glxcommon.lib       // CGlxSingetonStore
 
 //EXPORTUNFROZEN
\ No newline at end of file
--- a/photosgallery/controllers/imageviewer/inc/glximageviewermanager.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/controllers/imageviewer/inc/glximageviewermanager.h	Tue Feb 02 00:10:37 2010 +0200
@@ -46,10 +46,9 @@
     static CGlxImageViewerManager* InstanceL();
     
 public:
-    IMPORT_C inline HBufC* ImageUri( void );
-    IMPORT_C inline RFile64& ImageFileHandle() const;
-    IMPORT_C inline TBool IsPrivate();
-    IMPORT_C inline void IncrementRefCount();
+    IMPORT_C HBufC* ImageUri();
+    IMPORT_C RFile64& ImageFileHandle();
+    IMPORT_C TBool IsPrivate();
     IMPORT_C void DeleteInstance( void );
     IMPORT_C void SetImageUriL(const TDesC& aFileName);
     IMPORT_C void SetImageFileHandleL(const RFile& aFileHandle);
@@ -76,17 +75,17 @@
      * EPOC default constructor for performing 2nd stage construction
      */
     void ConstructL();
-    
 
 private:
-	//need to declare as it is initialised
-    TInt iRefCount; /// Reference count
-    HBufC* iImageUri; /// image file uri in case of Photos starting as Image viewer 
-    RFile64* iFile;  /// Handle to image file which will be shown in Image viewer
-    TBool iIsPrivate; /// Flag that stores if the image file is in a private folder. ETrue means the image is private, else EFalse 
-    
+    /// image file uri in case of Photos starting as Image viewer 
+    HBufC* iImageUri;
+
+    /// Handle to image file which will be shown in Image viewer
+    RFile64* iFile;
+
+    /// Flag that stores if the image file is in a private folder. 
+    /// ETrue means the image is private, else EFalse 
+    TBool iIsPrivate;
     };
 
-#include "glximageviewermanager.inl"
-
 #endif // GLXIMAGEVIEWERMANAGER_H
--- a/photosgallery/controllers/imageviewer/inc/glximageviewermanager.inl	Tue Jan 26 11:58:28 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image Viewer Manager
-*
-*/
-
-
-
-// INCLUDES
-
-EXPORT_C HBufC* CGlxImageViewerManager::ImageUri( void )
-    {
-    return iImageUri;
-    }
-
-EXPORT_C RFile64& CGlxImageViewerManager::ImageFileHandle() const
-    {
-    return *iFile;
-    }
-
-EXPORT_C TBool CGlxImageViewerManager::IsPrivate()
-    {
-    return iIsPrivate;
-    }
-
-EXPORT_C void CGlxImageViewerManager::IncrementRefCount()
-    {
-    iRefCount++;
-    }
--- a/photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -17,42 +17,43 @@
 
 
 #include "glximageviewermanager.h"
-
+#include <glxsingletonstore.h>
 #include <glxtracer.h>
 
 #include <f32file.h>
 
-CGlxImageViewerManager* singleInstance = NULL; /// The singleton instance
-
 EXPORT_C CGlxImageViewerManager* CGlxImageViewerManager::InstanceL()
     {
     TRACER("CGlxImageViewerManager::InstanceL()");
-    if ( NULL != singleInstance )
-        {
-        singleInstance->IncrementRefCount();
-        }
-    else
-        {
-        singleInstance = CGlxImageViewerManager::NewLC();
-        CleanupStack::Pop( singleInstance );
-        }
-
-    return singleInstance;
+    return CGlxSingletonStore::InstanceL(&NewL);
     }
 
 EXPORT_C void CGlxImageViewerManager::DeleteInstance()
     {
     TRACER("CGlxImageViewerManager::DeleteInstance()");
-    iRefCount--;
-    
-    if (0 == iRefCount)
-        {
-        delete this;
-        }
+    CGlxSingletonStore::Close(this);
+    }
+
+EXPORT_C HBufC* CGlxImageViewerManager::ImageUri()
+    {
+    TRACER("CGlxImageViewerManager::ImageUri()");    
+    return iImageUri;
+    }
+
+EXPORT_C RFile64& CGlxImageViewerManager::ImageFileHandle()
+    {
+    TRACER("CGlxImageViewerManager::ImageFileHandle()");    
+    return *iFile;
+    }
+
+EXPORT_C TBool CGlxImageViewerManager::IsPrivate()
+    {
+    TRACER("CGlxImageViewerManager::IsPrivate()");    
+    return iIsPrivate;
     }
 
 CGlxImageViewerManager::CGlxImageViewerManager()
-    : iRefCount(0), iImageUri(NULL), iFile(NULL), iIsPrivate(EFalse)
+    : iImageUri(NULL), iFile(NULL), iIsPrivate(EFalse)
     {
     TRACER("CGlxImageViewerManager::CGlxImageViewerManager()");
     // No implementation required
@@ -61,8 +62,7 @@
 CGlxImageViewerManager::~CGlxImageViewerManager()
     {
     TRACER("CGlxImageViewerManager::~CGlxImageViewerManager()");
-    delete iImageUri;
-
+    Reset();
     }
 
 CGlxImageViewerManager* CGlxImageViewerManager::NewLC()
@@ -76,7 +76,7 @@
 
 CGlxImageViewerManager* CGlxImageViewerManager::NewL()
     {
-    TRACER("CGlxImageViewerManager::NewLC()");
+    TRACER("CGlxImageViewerManager::NewL()");
     CGlxImageViewerManager* self = CGlxImageViewerManager::NewLC();
     CleanupStack::Pop(self);
     return self;
@@ -85,7 +85,6 @@
 void CGlxImageViewerManager::ConstructL()
     {
     TRACER("CGlxImageViewerManager::ConstructL()");
-    IncrementRefCount();
     }
 
 // ---------------------------------------------------------------------------
@@ -104,10 +103,8 @@
         {
         User::Leave(KErrNotSupported);    
         }
-    else
-        {
-    	iImageUri = aFileName.AllocL();    
-		}
+   	
+    iImageUri = aFileName.AllocL();    
     }
 
 // ---------------------------------------------------------------------------
@@ -122,6 +119,7 @@
         iFile->Close();
         }
     delete iFile;
+    iFile = NULL;
 
     if ( iImageUri )
         {
--- a/photosgallery/imgvwr/inc/glxivwrappui.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/imgvwr/inc/glxivwrappui.h	Tue Feb 02 00:10:37 2010 +0200
@@ -61,6 +61,11 @@
     //OOM Method
     void HandleApplicationSpecificEventL(TInt aEventType, const TWsEvent& aWsEvent);
 
+    /**
+     * Open the viewer on receving OpenFileL() callback in CViewerDocument
+     */
+    void HandleOpenFileL();
+    
 private:    // From CEikAppUi
 
     TBool ProcessCommandParametersL(TApaCommand aCommand,
@@ -71,28 +76,6 @@
     void HandleForegroundEventL( TBool aForeground );
 
 private:
-    enum TEntryType
-        {
-        EEntryTypeStartUp = 0,
-        EEntryTypeFocusGained
-        };
-
-
-    /**
-     * Handle an activation message.
-     * @param aCommand command data sent from the activating application.
-     * @param aDocumentName image file name data sent from the activating application.
-     * @param aData Message data from activating application.
-     */
-    void HandleActivationMessageL(const TApaCommand& aCommand, const TFileName& aDocumentName, const TDesC8& aData);
-
-    /**
-     * Set activation parameter for startup view, converting to 16-bit
-     * descriptor used by MPX.
-     * @param aParam Activation parameter.
-     */
-    void SetActivationParamL(const TDesC8& aParam);
-
     /**
      * Get view scoring ids based on current navigational state
      * (using Get in the name since the function does not return anything)
@@ -114,7 +97,6 @@
      */
     TUid ViewScoringIdForNaviStateDepth( const CMPXCollectionPath& aNaviState ) const;
 
-
     /**
      * close photos app.
      */
@@ -129,12 +111,6 @@
     /** Optional view plugin UID to activate when the collection is opened */
     TUid iStartupViewUid;
 
-    /** Optional activation parameter for the next view */
-    HBufC* iActivationParam;
-
-
-    TBool iStartUpSequence;
-
     ///Ui utility
     CGlxUiUtility* iUiUtility;
 
--- a/photosgallery/imgvwr/src/glxivwrappui.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/imgvwr/src/glxivwrappui.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -112,8 +112,6 @@
         iViewUtility->Close();
         }
 
-    delete iActivationParam;
-
     if ( iUiUtility )
         {
         iUiUtility->Close();
@@ -161,31 +159,19 @@
 // ProcessCommandParametersL
 // ---------------------------------------------------------------------------
 //
-TBool CGlxIVwrAppUi::ProcessCommandParametersL(TApaCommand aCommand,
-        TFileName& aDocumentName, const TDesC8& aTail)
+TBool CGlxIVwrAppUi::ProcessCommandParametersL(TApaCommand /*aCommand*/,
+        TFileName& /*aDocumentName*/, const TDesC8& /*aTail*/)
     {
     TRACER("TBool CGlxIVwrAppUi::ProcessCommandParametersL(TApaCommand /*aCommand*/,TFileName& /*aDocumentName*/, const TDesC8& aTail)");
 
-    TRAPD(err, HandleActivationMessageL(aCommand, aDocumentName, aTail));
-    if ( KErrNone != err )
+    // Bring the application to foreground, if not already
+    if (0 != iEikonEnv->RootWin().OrdinalPosition())
         {
-        // Open collection for main view
-        iStartupViewUid = TUid::Null();
-        // Open navigational state at root level
-        CMPXCollectionPath* newState = CMPXCollectionPath::NewL();
-        CleanupStack::PushL( newState );
-        iNavigationalState->NavigateToL( *newState );
-        CleanupStack::PopAndDestroy( newState );
-        }
-    if(0 == aTail.CompareC(KNullDesC8))
-        {
-        return ETrue;
-        }
-    else
-        {
-        return EFalse;
+        iEikonEnv->RootWin().SetOrdinalPosition(0);
         }
 
+	//To call OpenFileL in document class it must retun ETrue
+    return ETrue;
     }
 
 // ---------------------------------------------------------------------------
@@ -218,15 +204,11 @@
 
     CleanupStack::PopAndDestroy( naviState );
 
-    HBufC* activationParam = iActivationParam;
-    iActivationParam = NULL; // release ownership
-    CleanupStack::PushL( activationParam );
-
     if ( TUid::Null() != iStartupViewUid )
         {
         GLX_LOG_INFO("CGlxAppUi::HandleNavigationalStateChanged: Activating startup view");
         // Activate startup view
-        iViewUtility->ActivateViewL( iStartupViewUid, activationParam );
+        iViewUtility->ActivateViewL( iStartupViewUid, NULL );
         iStartupViewUid = TUid::Null();
         }
     else
@@ -240,12 +222,10 @@
 
         GLX_LOG_INFO1( "CGlxIVwrAppUi::HandleNavigationalStateChanged: Uid count %d", scoringIds.Count());
         // let view utility to select the best view based on scoring ids
-        iViewUtility->ActivateViewL( scoringIds, activationParam );
+        iViewUtility->ActivateViewL( scoringIds, NULL );
 
         CleanupStack::PopAndDestroy( &scoringIds );
         }
-
-    CleanupStack::PopAndDestroy( activationParam );
     }
 
 // ---------------------------------------------------------------------------
@@ -365,42 +345,17 @@
 }
 
 // ---------------------------------------------------------------------------
-// HandleActivationMessageL
+// HandleOpenFileL
 // ---------------------------------------------------------------------------
 //
-void CGlxIVwrAppUi::HandleActivationMessageL(const TApaCommand& aCommand, 
-        const TFileName& aDocumentName, const TDesC8& aData)
+void CGlxIVwrAppUi::HandleOpenFileL()
     {
-    TRACER("void CGlxIVwrAppUi::HandleActivationMessageL(const TApaCommand& aCommand, const TFileName& aDocumentName, const TDesC8& aData)");
-
-    delete iActivationParam;
-    iActivationParam = NULL;
-
-    if ( 0 == aData.CompareC(KNullDesC8) )
-        {
-        CMPXCollectionPath* path = CMPXCollectionPath::NewL();
-        CleanupStack::PushL(path);
-        path->AppendL( KGlxCollectionPluginImageViewerImplementationUid );
-        iNavigationalState->NavigateToL( *path );
-        CleanupStack::PopAndDestroy( path );
-        }
-
-    // Introduced to fix bug EMJN-78GH6N. Rowland Cook 10/12/2007
-    if (0 != iEikonEnv->RootWin().OrdinalPosition())
-        {
-        iEikonEnv->RootWin().SetOrdinalPosition(0);
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// SetActivationParamL
-// ---------------------------------------------------------------------------
-//
-void CGlxIVwrAppUi::SetActivationParamL(const TDesC8& aParam)
-    {
-    TRACER("void CGlxIVwrAppUi::SetActivationParamL(const TDesC8& aParam)");
-    iActivationParam = HBufC::NewL(aParam.Length());
-    iActivationParam->Des().Copy(aParam);
+    TRACER("void CGlxIVwrAppUi::HandleOpenFileL()");
+    CMPXCollectionPath* path = CMPXCollectionPath::NewL();
+    CleanupStack::PushL(path);
+    path->AppendL( KGlxCollectionPluginImageViewerImplementationUid );
+    iNavigationalState->NavigateToL( *path );
+    CleanupStack::PopAndDestroy( path );    
     }
 
 // ---------------------------------------------------------------------------
--- a/photosgallery/imgvwr/src/glxivwrdocument.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/imgvwr/src/glxivwrdocument.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -93,7 +93,12 @@
     TRACER("CFileStore* CGlxIVwrDocument::OpenFileL");
     // Reset old data
     ResetDocument();
+    
     iImageViewerInstance->SetImageUriL(aFilename);
+    
+    // Open the viewer
+    static_cast<CGlxIVwrAppUi*>(iAppUi)->HandleOpenFileL();
+    
     return NULL;
     }
 
@@ -104,13 +109,16 @@
 void CGlxIVwrDocument::OpenFileL( CFileStore*& /*aFileStore*/, RFile& aFile )
     {	
     TRACER("CGlxIVwrDocument::OpenFileL()");
+    // Reset old data
+    ResetDocument();    
+    
     // Make sure that aFile is closed in leave situation
     CleanupClosePushL( aFile );
-
-    // Reset old data
-    ResetDocument();    
     iImageViewerInstance->SetImageFileHandleL(aFile);	
     CleanupStack::PopAndDestroy(); // Close aFile
+    
+    // Open the viewer
+    static_cast<CGlxIVwrAppUi*>(iAppUi)->HandleOpenFileL();
     }
 
 // ----------------------------------------------------------------------------
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/bwins/glxcommoncommandhandlersu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/bwins/glxcommoncommandhandlersu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,69 +1,66 @@
 EXPORTS
-	??1CGlxCommandHandlerFilterImagesOrVideos@@UAE@XZ @ 1 NONAME ; CGlxCommandHandlerFilterImagesOrVideos::~CGlxCommandHandlerFilterImagesOrVideos(void)
-	?OfferKeyEventL@CGlxSingleGraphicPopupMenuStyleListBox@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 2 NONAME ; enum TKeyResponse CGlxSingleGraphicPopupMenuStyleListBox::OfferKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	??0CGlxMediaListAdaptor@@QAE@PBVMGlxMediaList@@H@Z @ 3 NONAME ; CGlxMediaListAdaptor::CGlxMediaListAdaptor(class MGlxMediaList const *, int)
-	?NewL@CGlxCommandHandlerRename@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 4 NONAME ; class CGlxCommandHandlerRename * CGlxCommandHandlerRename::NewL(class MGlxMediaListProvider *, int)
-	?NewL@CGlxCommandHandlerSend@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 5 NONAME ; class CGlxCommandHandlerSend * CGlxCommandHandlerSend::NewL(class MGlxMediaListProvider *, int)
-	??1CGlxCommandHandlerNewMedia@@UAE@XZ @ 6 NONAME ; CGlxCommandHandlerNewMedia::~CGlxCommandHandlerNewMedia(void)
-	??1CGlxCommandHandlerSave@@UAE@XZ @ 7 NONAME ; CGlxCommandHandlerSave::~CGlxCommandHandlerSave(void)
-	?NewL@CGlxCommandHandlerDelete@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 8 NONAME ; class CGlxCommandHandlerDelete * CGlxCommandHandlerDelete::NewL(class MGlxMediaListProvider *, int, int)
-	?NewL@CGlxCommandHandlerRotate@@SAPAV1@PAVMGlxMediaListProvider@@PAVMGlxLayoutOwner@@H@Z @ 9 NONAME ; class CGlxCommandHandlerRotate * CGlxCommandHandlerRotate::NewL(class MGlxMediaListProvider *, class MGlxLayoutOwner *, int)
-	?ExecuteLD@CGlxMediaSelectionPopup@@QAEPAVCMPXCollectionPath@@AAV2@AAHHHPAVCMPXMedia@@@Z @ 10 NONAME ; class CMPXCollectionPath * CGlxMediaSelectionPopup::ExecuteLD(class CMPXCollectionPath &, int &, int, int, class CMPXMedia *)
-	?OkToExit@CGlxCommandHandlerNewMedia@@UBEHXZ @ 11 NONAME ; int CGlxCommandHandlerNewMedia::OkToExit(void) const
-	??1CGlxCommandHandlerBack@@UAE@XZ @ 12 NONAME ; CGlxCommandHandlerBack::~CGlxCommandHandlerBack(void)
-	?NewPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 13 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewPreviousViewCommandHandlerL(class MGlxMediaListProvider *)
-	?NewL@CGlxCommandHandlerVideoPlayback@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 14 NONAME ; class CGlxCommandHandlerVideoPlayback * CGlxCommandHandlerVideoPlayback::NewL(class MGlxMediaListProvider *)
-	??0TGlxHelpContext@@QAE@XZ @ 15 NONAME ; TGlxHelpContext::TGlxHelpContext(void)
-	??1CGlxCommandHandlerSortOrder@@UAE@XZ @ 16 NONAME ; CGlxCommandHandlerSortOrder::~CGlxCommandHandlerSortOrder(void)
-	??1CGlxCommandHandlerRemoveFrom@@UAE@XZ @ 17 NONAME ; CGlxCommandHandlerRemoveFrom::~CGlxCommandHandlerRemoveFrom(void)
-	?NewAddToAlbumSingleClickCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 18 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumSingleClickCommandHandlerL(class MGlxMediaListProvider *, int)
-	?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 19 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
-	?NewL@CGlxCommandHandlerOpen@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 20 NONAME ; class CGlxCommandHandlerOpen * CGlxCommandHandlerOpen::NewL(class MGlxMediaListProvider *)
-	??1CGlxCommandHandlerDelete@@UAE@XZ @ 21 NONAME ; CGlxCommandHandlerDelete::~CGlxCommandHandlerDelete(void)
-	??1CGlxCommandHandlerDownload@@UAE@XZ @ 22 NONAME ; CGlxCommandHandlerDownload::~CGlxCommandHandlerDownload(void)
-	?NewL@CGlxCommandHandlerSave@@SAPAV1@XZ @ 23 NONAME ; class CGlxCommandHandlerSave * CGlxCommandHandlerSave::NewL(void)
-	??1CGlxCommandHandlerOpen@@UAE@XZ @ 24 NONAME ; CGlxCommandHandlerOpen::~CGlxCommandHandlerOpen(void)
-	?NewL@CGlxCommandHandlerSlideshow@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 25 NONAME ; class CGlxCommandHandlerSlideshow * CGlxCommandHandlerSlideshow::NewL(class MGlxMediaListProvider *, int, int)
-	?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 26 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
-	?NewL@CGlxCommandHandlerAiwShareOnOvi@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 27 NONAME ; class CGlxCommandHandlerAiwShareOnOvi * CGlxCommandHandlerAiwShareOnOvi::NewL(class MGlxMediaListProvider *, int)
-	?NewAddToAlbumCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 28 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumCommandHandlerL(class MGlxMediaListProvider *, int)
-	?MdcaPoint@CGlxMediaListAdaptor@@UBE?AVTPtrC16@@H@Z @ 29 NONAME ; class TPtrC16 CGlxMediaListAdaptor::MdcaPoint(int) const
-	?NewL@CGlxCommandHandlerDownload@@SAPAV1@XZ @ 30 NONAME ; class CGlxCommandHandlerDownload * CGlxCommandHandlerDownload::NewL(void)
-	??1CGlxCommandHandlerHelp@@UAE@XZ @ 31 NONAME ; CGlxCommandHandlerHelp::~CGlxCommandHandlerHelp(void)
-	?BypassFiltersForExecute@CGlxCommandHandlerNewMedia@@UBEHXZ @ 32 NONAME ; int CGlxCommandHandlerNewMedia::BypassFiltersForExecute(void) const
-	?NewL@CGlxCommandHandlerRemoveFrom@@SAPAV1@PAVMGlxMediaListProvider@@W4TMPXGeneralCategory@@@Z @ 33 NONAME ; class CGlxCommandHandlerRemoveFrom * CGlxCommandHandlerRemoveFrom::NewL(class MGlxMediaListProvider *, enum TMPXGeneralCategory)
-	?NewL@CGlxCommandHandlerDetails@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 34 NONAME ; class CGlxCommandHandlerDetails * CGlxCommandHandlerDetails::NewL(class MGlxMediaListProvider *)
-	?NewL@CGlxCommandHandlerHelp@@SAPAV1@VTGlxHelpContext@@@Z @ 35 NONAME ; class CGlxCommandHandlerHelp * CGlxCommandHandlerHelp::NewL(class TGlxHelpContext)
-	?ExecuteLD@CGlxCommandHandlerNewMedia@@QAEHAAVTGlxMediaId@@@Z @ 36 NONAME ; int CGlxCommandHandlerNewMedia::ExecuteLD(class TGlxMediaId &)
-	?HandleItemAddedL@CGlxCommandHandlerNewMedia@@MAEXHHPAVMGlxMediaList@@@Z @ 37 NONAME ; void CGlxCommandHandlerNewMedia::HandleItemAddedL(int, int, class MGlxMediaList *)
-	?IncrementRefCount@CGlxImageViewerManager@@QAEXXZ @ 38 NONAME ; void CGlxImageViewerManager::IncrementRefCount(void)
-	?NewL@CGlxCommandHandlerUpload@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 39 NONAME ; class CGlxCommandHandlerUpload * CGlxCommandHandlerUpload::NewL(class MGlxMediaListProvider *, int)
-	??1CGlxCommandHandlerUpload@@UAE@XZ @ 40 NONAME ; CGlxCommandHandlerUpload::~CGlxCommandHandlerUpload(void)
-	??1CGlxCommandHandlerSlideshow@@UAE@XZ @ 41 NONAME ; CGlxCommandHandlerSlideshow::~CGlxCommandHandlerSlideshow(void)
-	?NewL@CGlxCommandHandlerAiwShowMap@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 42 NONAME ; class CGlxCommandHandlerAiwShowMap * CGlxCommandHandlerAiwShowMap::NewL(class MGlxMediaListProvider *, int)
-	??1CGlxCommandHandlerAddToContainer@@UAE@XZ @ 43 NONAME ; CGlxCommandHandlerAddToContainer::~CGlxCommandHandlerAddToContainer(void)
-	??0CGlxMediaSelectionPopup@@QAE@XZ @ 44 NONAME ; CGlxMediaSelectionPopup::CGlxMediaSelectionPopup(void)
-	?NewL@CGlxCommandHandlerNewMedia@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 45 NONAME ; class CGlxCommandHandlerNewMedia * CGlxCommandHandlerNewMedia::NewL(class MGlxMediaListProvider *)
-	?NewL@CGlxCommandHandlerCopyAndMove@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 46 NONAME ; class CGlxCommandHandlerCopyAndMove * CGlxCommandHandlerCopyAndMove::NewL(class MGlxMediaListProvider *, int)
-	??1CGlxCommandHandlerCopyAndMove@@UAE@XZ @ 47 NONAME ; CGlxCommandHandlerCopyAndMove::~CGlxCommandHandlerCopyAndMove(void)
-	?SetContainerId@CGlxCommandHandlerRemoveFrom@@QAEXVTGlxMediaId@@@Z @ 48 NONAME ; void CGlxCommandHandlerRemoveFrom::SetContainerId(class TGlxMediaId)
-	?MdcaCount@CGlxMediaListAdaptor@@UBEHXZ @ 49 NONAME ; int CGlxMediaListAdaptor::MdcaCount(void) const
-	?NewL@CGlxCommandHandlerFilterImagesOrVideos@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 50 NONAME ; class CGlxCommandHandlerFilterImagesOrVideos * CGlxCommandHandlerFilterImagesOrVideos::NewL(class MGlxMediaListProvider *)
-	?NewL@CGlxCommandHandlerAiwShowMapHardKey@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 51 NONAME ; class CGlxCommandHandlerAiwShowMapHardKey * CGlxCommandHandlerAiwShowMapHardKey::NewL(class MGlxMediaListProvider *, int)
-	?NewL@CGlxCommandHandlerHideUi@@SAPAV1@XZ @ 52 NONAME ; class CGlxCommandHandlerHideUi * CGlxCommandHandlerHideUi::NewL(void)
-	??1CGlxCommandHandlerSend@@UAE@XZ @ 53 NONAME ; CGlxCommandHandlerSend::~CGlxCommandHandlerSend(void)
-	?NewL@CGlxCommandHandlerAiwAssign@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 54 NONAME ; class CGlxCommandHandlerAiwAssign * CGlxCommandHandlerAiwAssign::NewL(class MGlxMediaListProvider *, int)
-	?NewAddToTagCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 55 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagCommandHandlerL(class MGlxMediaListProvider *, int)
-	??1CGlxCommandHandlerDetails@@UAE@XZ @ 56 NONAME ; CGlxCommandHandlerDetails::~CGlxCommandHandlerDetails(void)
-	?NewAddToTagSingleClickCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 57 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagSingleClickCommandHandlerL(class MGlxMediaListProvider *, int)
-	??1CGlxCommandHandlerVideoPlayback@@UAE@XZ @ 58 NONAME ; CGlxCommandHandlerVideoPlayback::~CGlxCommandHandlerVideoPlayback(void)
-	??1CGlxCommandHandlerRename@@UAE@XZ @ 59 NONAME ; CGlxCommandHandlerRename::~CGlxCommandHandlerRename(void)
-	?NewL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 60 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewL(class MGlxMediaListProvider *, int, int)
-	?ImageFileHandle@CGlxImageViewerManager@@QBEAAVRFile64@@XZ @ 61 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void) const
-	?NewL@CGlxCommandHandlerAiwPrintPreview@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 62 NONAME ; class CGlxCommandHandlerAiwPrintPreview * CGlxCommandHandlerAiwPrintPreview::NewL(class MGlxMediaListProvider *, int)
-	?NewL@CGlxCommandHandlerAiwEdit@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 63 NONAME ; class CGlxCommandHandlerAiwEdit * CGlxCommandHandlerAiwEdit::NewL(class MGlxMediaListProvider *, int, int)
-	?NewL@CGlxCommandHandlerSortOrder@@SAPAV1@PAVMGlxMediaListProvider@@K@Z @ 64 NONAME ; class CGlxCommandHandlerSortOrder * CGlxCommandHandlerSortOrder::NewL(class MGlxMediaListProvider *, unsigned long)
-	?NewBackCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@XZ @ 65 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewBackCommandHandlerL(void)
-	?NewAddToFavCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 66 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToFavCommandHandlerL(class MGlxMediaListProvider *, int)
-	?NewContainerPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 67 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewContainerPreviousViewCommandHandlerL(class MGlxMediaListProvider *, int)
+	?NewL@CGlxCommandHandlerHelp@@SAPAV1@VTGlxHelpContext@@@Z @ 1 NONAME ; class CGlxCommandHandlerHelp * CGlxCommandHandlerHelp::NewL(class TGlxHelpContext)
+	?HandleItemAddedL@CGlxCommandHandlerNewMedia@@MAEXHHPAVMGlxMediaList@@@Z @ 2 NONAME ; void CGlxCommandHandlerNewMedia::HandleItemAddedL(int, int, class MGlxMediaList *)
+	?ExecuteLD@CGlxCommandHandlerNewMedia@@QAEHAAVTGlxMediaId@@@Z @ 3 NONAME ; int CGlxCommandHandlerNewMedia::ExecuteLD(class TGlxMediaId &)
+	??1CGlxCommandHandlerFilterImagesOrVideos@@UAE@XZ @ 4 NONAME ; CGlxCommandHandlerFilterImagesOrVideos::~CGlxCommandHandlerFilterImagesOrVideos(void)
+	?OfferKeyEventL@CGlxSingleGraphicPopupMenuStyleListBox@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 5 NONAME ; enum TKeyResponse CGlxSingleGraphicPopupMenuStyleListBox::OfferKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	??0CGlxMediaListAdaptor@@QAE@PBVMGlxMediaList@@H@Z @ 6 NONAME ; CGlxMediaListAdaptor::CGlxMediaListAdaptor(class MGlxMediaList const *, int)
+	?NewL@CGlxCommandHandlerUpload@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 7 NONAME ; class CGlxCommandHandlerUpload * CGlxCommandHandlerUpload::NewL(class MGlxMediaListProvider *, int)
+	?NewL@CGlxCommandHandlerRename@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 8 NONAME ; class CGlxCommandHandlerRename * CGlxCommandHandlerRename::NewL(class MGlxMediaListProvider *, int)
+	?NewL@CGlxCommandHandlerSend@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 9 NONAME ; class CGlxCommandHandlerSend * CGlxCommandHandlerSend::NewL(class MGlxMediaListProvider *, int)
+	??1CGlxCommandHandlerUpload@@UAE@XZ @ 10 NONAME ; CGlxCommandHandlerUpload::~CGlxCommandHandlerUpload(void)
+	??1CGlxCommandHandlerNewMedia@@UAE@XZ @ 11 NONAME ; CGlxCommandHandlerNewMedia::~CGlxCommandHandlerNewMedia(void)
+	??1CGlxCommandHandlerSlideshow@@UAE@XZ @ 12 NONAME ; CGlxCommandHandlerSlideshow::~CGlxCommandHandlerSlideshow(void)
+	?NewL@CGlxCommandHandlerAiwShowMap@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 13 NONAME ; class CGlxCommandHandlerAiwShowMap * CGlxCommandHandlerAiwShowMap::NewL(class MGlxMediaListProvider *, int)
+	??1CGlxCommandHandlerSave@@UAE@XZ @ 14 NONAME ; CGlxCommandHandlerSave::~CGlxCommandHandlerSave(void)
+	?NewL@CGlxCommandHandlerDelete@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 15 NONAME ; class CGlxCommandHandlerDelete * CGlxCommandHandlerDelete::NewL(class MGlxMediaListProvider *, int, int)
+	??1CGlxCommandHandlerAddToContainer@@UAE@XZ @ 16 NONAME ; CGlxCommandHandlerAddToContainer::~CGlxCommandHandlerAddToContainer(void)
+	??0CGlxMediaSelectionPopup@@QAE@XZ @ 17 NONAME ; CGlxMediaSelectionPopup::CGlxMediaSelectionPopup(void)
+	?NewL@CGlxCommandHandlerRotate@@SAPAV1@PAVMGlxMediaListProvider@@PAVMGlxLayoutOwner@@H@Z @ 18 NONAME ; class CGlxCommandHandlerRotate * CGlxCommandHandlerRotate::NewL(class MGlxMediaListProvider *, class MGlxLayoutOwner *, int)
+	?NewL@CGlxCommandHandlerNewMedia@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 19 NONAME ; class CGlxCommandHandlerNewMedia * CGlxCommandHandlerNewMedia::NewL(class MGlxMediaListProvider *)
+	?ExecuteLD@CGlxMediaSelectionPopup@@QAEPAVCMPXCollectionPath@@AAV2@AAHHHPAVCMPXMedia@@@Z @ 20 NONAME ; class CMPXCollectionPath * CGlxMediaSelectionPopup::ExecuteLD(class CMPXCollectionPath &, int &, int, int, class CMPXMedia *)
+	?NewL@CGlxCommandHandlerCopyAndMove@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 21 NONAME ; class CGlxCommandHandlerCopyAndMove * CGlxCommandHandlerCopyAndMove::NewL(class MGlxMediaListProvider *, int)
+	?OkToExit@CGlxCommandHandlerNewMedia@@UBEHXZ @ 22 NONAME ; int CGlxCommandHandlerNewMedia::OkToExit(void) const
+	??1CGlxCommandHandlerBack@@UAE@XZ @ 23 NONAME ; CGlxCommandHandlerBack::~CGlxCommandHandlerBack(void)
+	?NewPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 24 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewPreviousViewCommandHandlerL(class MGlxMediaListProvider *)
+	??1CGlxCommandHandlerCopyAndMove@@UAE@XZ @ 25 NONAME ; CGlxCommandHandlerCopyAndMove::~CGlxCommandHandlerCopyAndMove(void)
+	??1CGlxCommandHandlerAiwEdit@@UAE@XZ @ 26 NONAME ; CGlxCommandHandlerAiwEdit::~CGlxCommandHandlerAiwEdit(void)
+	?SetContainerId@CGlxCommandHandlerRemoveFrom@@QAEXVTGlxMediaId@@@Z @ 27 NONAME ; void CGlxCommandHandlerRemoveFrom::SetContainerId(class TGlxMediaId)
+	?NewL@CGlxCommandHandlerVideoPlayback@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 28 NONAME ; class CGlxCommandHandlerVideoPlayback * CGlxCommandHandlerVideoPlayback::NewL(class MGlxMediaListProvider *)
+	?MdcaCount@CGlxMediaListAdaptor@@UBEHXZ @ 29 NONAME ; int CGlxMediaListAdaptor::MdcaCount(void) const
+	??0TGlxHelpContext@@QAE@XZ @ 30 NONAME ; TGlxHelpContext::TGlxHelpContext(void)
+	??1CGlxCommandHandlerSortOrder@@UAE@XZ @ 31 NONAME ; CGlxCommandHandlerSortOrder::~CGlxCommandHandlerSortOrder(void)
+	?NewL@CGlxCommandHandlerFilterImagesOrVideos@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 32 NONAME ; class CGlxCommandHandlerFilterImagesOrVideos * CGlxCommandHandlerFilterImagesOrVideos::NewL(class MGlxMediaListProvider *)
+	??1CGlxCommandHandlerRemoveFrom@@UAE@XZ @ 33 NONAME ; CGlxCommandHandlerRemoveFrom::~CGlxCommandHandlerRemoveFrom(void)
+	?NewL@CGlxCommandHandlerAiwShowMapHardKey@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 34 NONAME ; class CGlxCommandHandlerAiwShowMapHardKey * CGlxCommandHandlerAiwShowMapHardKey::NewL(class MGlxMediaListProvider *, int)
+	?NewL@CGlxCommandHandlerHideUi@@SAPAV1@XZ @ 35 NONAME ; class CGlxCommandHandlerHideUi * CGlxCommandHandlerHideUi::NewL(void)
+	?NewL@CGlxCommandHandlerAiwAssign@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 36 NONAME ; class CGlxCommandHandlerAiwAssign * CGlxCommandHandlerAiwAssign::NewL(class MGlxMediaListProvider *, int)
+	??1CGlxCommandHandlerSend@@UAE@XZ @ 37 NONAME ; CGlxCommandHandlerSend::~CGlxCommandHandlerSend(void)
+	?NewAddToAlbumSingleClickCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 38 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumSingleClickCommandHandlerL(class MGlxMediaListProvider *, int)
+	?NewAddToTagCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 39 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagCommandHandlerL(class MGlxMediaListProvider *, int)
+	?NewL@CGlxCommandHandlerOpen@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 40 NONAME ; class CGlxCommandHandlerOpen * CGlxCommandHandlerOpen::NewL(class MGlxMediaListProvider *)
+	??1CGlxCommandHandlerDelete@@UAE@XZ @ 41 NONAME ; CGlxCommandHandlerDelete::~CGlxCommandHandlerDelete(void)
+	??1CGlxCommandHandlerDetails@@UAE@XZ @ 42 NONAME ; CGlxCommandHandlerDetails::~CGlxCommandHandlerDetails(void)
+	??1CGlxCommandHandlerDownload@@UAE@XZ @ 43 NONAME ; CGlxCommandHandlerDownload::~CGlxCommandHandlerDownload(void)
+	?NewL@CGlxCommandHandlerSave@@SAPAV1@XZ @ 44 NONAME ; class CGlxCommandHandlerSave * CGlxCommandHandlerSave::NewL(void)
+	??1CGlxCommandHandlerOpen@@UAE@XZ @ 45 NONAME ; CGlxCommandHandlerOpen::~CGlxCommandHandlerOpen(void)
+	?NewL@CGlxCommandHandlerSlideshow@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 46 NONAME ; class CGlxCommandHandlerSlideshow * CGlxCommandHandlerSlideshow::NewL(class MGlxMediaListProvider *, int, int)
+	?NewL@CGlxCommandHandlerAiwShareOnOvi@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 47 NONAME ; class CGlxCommandHandlerAiwShareOnOvi * CGlxCommandHandlerAiwShareOnOvi::NewL(class MGlxMediaListProvider *, int)
+	?NewAddToTagSingleClickCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 48 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagSingleClickCommandHandlerL(class MGlxMediaListProvider *, int)
+	?NewAddToAlbumCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 49 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumCommandHandlerL(class MGlxMediaListProvider *, int)
+	??1CGlxCommandHandlerRename@@UAE@XZ @ 50 NONAME ; CGlxCommandHandlerRename::~CGlxCommandHandlerRename(void)
+	??1CGlxCommandHandlerVideoPlayback@@UAE@XZ @ 51 NONAME ; CGlxCommandHandlerVideoPlayback::~CGlxCommandHandlerVideoPlayback(void)
+	?MdcaPoint@CGlxMediaListAdaptor@@UBE?AVTPtrC16@@H@Z @ 52 NONAME ; class TPtrC16 CGlxMediaListAdaptor::MdcaPoint(int) const
+	?NewL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 53 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewL(class MGlxMediaListProvider *, int, int)
+	?NewL@CGlxCommandHandlerDownload@@SAPAV1@XZ @ 54 NONAME ; class CGlxCommandHandlerDownload * CGlxCommandHandlerDownload::NewL(void)
+	??1CGlxCommandHandlerHelp@@UAE@XZ @ 55 NONAME ; CGlxCommandHandlerHelp::~CGlxCommandHandlerHelp(void)
+	?BypassFiltersForExecute@CGlxCommandHandlerNewMedia@@UBEHXZ @ 56 NONAME ; int CGlxCommandHandlerNewMedia::BypassFiltersForExecute(void) const
+	?NewL@CGlxCommandHandlerRemoveFrom@@SAPAV1@PAVMGlxMediaListProvider@@W4TMPXGeneralCategory@@@Z @ 57 NONAME ; class CGlxCommandHandlerRemoveFrom * CGlxCommandHandlerRemoveFrom::NewL(class MGlxMediaListProvider *, enum TMPXGeneralCategory)
+	?NewL@CGlxCommandHandlerDetails@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 58 NONAME ; class CGlxCommandHandlerDetails * CGlxCommandHandlerDetails::NewL(class MGlxMediaListProvider *)
+	?NewL@CGlxCommandHandlerAiwPrintPreview@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 59 NONAME ; class CGlxCommandHandlerAiwPrintPreview * CGlxCommandHandlerAiwPrintPreview::NewL(class MGlxMediaListProvider *, int)
+	?NewL@CGlxCommandHandlerSortOrder@@SAPAV1@PAVMGlxMediaListProvider@@K@Z @ 60 NONAME ; class CGlxCommandHandlerSortOrder * CGlxCommandHandlerSortOrder::NewL(class MGlxMediaListProvider *, unsigned long)
+	?NewBackCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@XZ @ 61 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewBackCommandHandlerL(void)
+	?NewL@CGlxCommandHandlerAiwEdit@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 62 NONAME ; class CGlxCommandHandlerAiwEdit * CGlxCommandHandlerAiwEdit::NewL(class MGlxMediaListProvider *, int)
+	?NewContainerPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 63 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewContainerPreviousViewCommandHandlerL(class MGlxMediaListProvider *, int)
+	?NewAddToFavCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 64 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToFavCommandHandlerL(class MGlxMediaListProvider *, int)
 
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/eabi/glxcommoncommandhandlersu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/eabi/glxcommoncommandhandlersu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -25,27 +25,27 @@
 	_ZN22CGlxCommandHandlerSendD0Ev @ 24 NONAME
 	_ZN22CGlxCommandHandlerSendD1Ev @ 25 NONAME
 	_ZN22CGlxCommandHandlerSendD2Ev @ 26 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 27 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 28 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 29 NONAME
-	_ZN23CGlxMediaSelectionPopup9ExecuteLDER18CMPXCollectionPathRiiiP9CMPXMedia @ 30 NONAME
-	_ZN23CGlxMediaSelectionPopupC1Ev @ 31 NONAME
-	_ZN23CGlxMediaSelectionPopupC2Ev @ 32 NONAME
-	_ZN24CGlxCommandHandlerDelete4NewLEP21MGlxMediaListProviderii @ 33 NONAME
-	_ZN24CGlxCommandHandlerDeleteD0Ev @ 34 NONAME
-	_ZN24CGlxCommandHandlerDeleteD1Ev @ 35 NONAME
-	_ZN24CGlxCommandHandlerDeleteD2Ev @ 36 NONAME
-	_ZN24CGlxCommandHandlerHideUi4NewLEv @ 37 NONAME
-	_ZN24CGlxCommandHandlerRename4NewLEP21MGlxMediaListProvideri @ 38 NONAME
-	_ZN24CGlxCommandHandlerRenameD0Ev @ 39 NONAME
-	_ZN24CGlxCommandHandlerRenameD1Ev @ 40 NONAME
-	_ZN24CGlxCommandHandlerRenameD2Ev @ 41 NONAME
-	_ZN24CGlxCommandHandlerRotate4NewLEP21MGlxMediaListProviderP15MGlxLayoutOwneri @ 42 NONAME
-	_ZN24CGlxCommandHandlerUpload4NewLEP21MGlxMediaListProvideri @ 43 NONAME
-	_ZN24CGlxCommandHandlerUploadD0Ev @ 44 NONAME
-	_ZN24CGlxCommandHandlerUploadD1Ev @ 45 NONAME
-	_ZN24CGlxCommandHandlerUploadD2Ev @ 46 NONAME
-	_ZN25CGlxCommandHandlerAiwEdit4NewLEP21MGlxMediaListProviderii @ 47 NONAME
+	_ZN23CGlxMediaSelectionPopup9ExecuteLDER18CMPXCollectionPathRiiiP9CMPXMedia @ 27 NONAME
+	_ZN23CGlxMediaSelectionPopupC1Ev @ 28 NONAME
+	_ZN23CGlxMediaSelectionPopupC2Ev @ 29 NONAME
+	_ZN24CGlxCommandHandlerDelete4NewLEP21MGlxMediaListProviderii @ 30 NONAME
+	_ZN24CGlxCommandHandlerDeleteD0Ev @ 31 NONAME
+	_ZN24CGlxCommandHandlerDeleteD1Ev @ 32 NONAME
+	_ZN24CGlxCommandHandlerDeleteD2Ev @ 33 NONAME
+	_ZN24CGlxCommandHandlerHideUi4NewLEv @ 34 NONAME
+	_ZN24CGlxCommandHandlerRename4NewLEP21MGlxMediaListProvideri @ 35 NONAME
+	_ZN24CGlxCommandHandlerRenameD0Ev @ 36 NONAME
+	_ZN24CGlxCommandHandlerRenameD1Ev @ 37 NONAME
+	_ZN24CGlxCommandHandlerRenameD2Ev @ 38 NONAME
+	_ZN24CGlxCommandHandlerRotate4NewLEP21MGlxMediaListProviderP15MGlxLayoutOwneri @ 39 NONAME
+	_ZN24CGlxCommandHandlerUpload4NewLEP21MGlxMediaListProvideri @ 40 NONAME
+	_ZN24CGlxCommandHandlerUploadD0Ev @ 41 NONAME
+	_ZN24CGlxCommandHandlerUploadD1Ev @ 42 NONAME
+	_ZN24CGlxCommandHandlerUploadD2Ev @ 43 NONAME
+	_ZN25CGlxCommandHandlerAiwEdit4NewLEP21MGlxMediaListProvideri @ 44 NONAME
+	_ZN25CGlxCommandHandlerAiwEditD0Ev @ 45 NONAME
+	_ZN25CGlxCommandHandlerAiwEditD1Ev @ 46 NONAME
+	_ZN25CGlxCommandHandlerAiwEditD2Ev @ 47 NONAME
 	_ZN25CGlxCommandHandlerDetails4NewLEP21MGlxMediaListProvider @ 48 NONAME
 	_ZN25CGlxCommandHandlerDetailsD0Ev @ 49 NONAME
 	_ZN25CGlxCommandHandlerDetailsD1Ev @ 50 NONAME
@@ -102,10 +102,9 @@
 	_ZN38CGlxSingleGraphicPopupMenuStyleListBox14OfferKeyEventLERK9TKeyEvent10TEventCode @ 101 NONAME
 	_ZNK20CGlxMediaListAdaptor9MdcaCountEv @ 102 NONAME
 	_ZNK20CGlxMediaListAdaptor9MdcaPointEi @ 103 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 104 NONAME
-	_ZNK26CGlxCommandHandlerNewMedia23BypassFiltersForExecuteEv @ 105 NONAME
-	_ZNK26CGlxCommandHandlerNewMedia8OkToExitEv @ 106 NONAME
-	_ZThn48_N26CGlxCommandHandlerNewMedia16HandleItemAddedLEiiP13MGlxMediaList @ 107 NONAME
-	_ZThn4_NK20CGlxMediaListAdaptor9MdcaCountEv @ 108 NONAME
-	_ZThn4_NK20CGlxMediaListAdaptor9MdcaPointEi @ 109 NONAME
+	_ZNK26CGlxCommandHandlerNewMedia23BypassFiltersForExecuteEv @ 104 NONAME
+	_ZNK26CGlxCommandHandlerNewMedia8OkToExitEv @ 105 NONAME
+	_ZThn48_N26CGlxCommandHandlerNewMedia16HandleItemAddedLEiiP13MGlxMediaList @ 106 NONAME
+	_ZThn4_NK20CGlxMediaListAdaptor9MdcaCountEv @ 107 NONAME
+	_ZThn4_NK20CGlxMediaListAdaptor9MdcaPointEi @ 108 NONAME
 
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwedit.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwedit.h	Tue Feb 02 00:10:37 2010 +0200
@@ -27,7 +27,7 @@
 class CAiwGenericParamList;
 class CGlxMedia;
 class MGlxMediaListProvider;
-
+class CAiwServiceHandler;
 
 /**
  *  CGlxCommandHandlerAiwEdit
@@ -36,54 +36,59 @@
  *
  *  @lib glxcommoncommandhandlers.lib
  */
+
 NONSHARABLE_CLASS (CGlxCommandHandlerAiwEdit)
-    : public CGlxCommandHandlerAiwBase
+    : public CGlxMediaListCommandHandler
     {
-public:
+public:     
     /**
      * Two-phase constructor
      * @param aMediaListProvider object that provides the media list
-     * @param aMenuResource The menu resource that the AIW command will be 
-     *          implented in
      * @param aCommandSingleClick Flag to identify single click command
      * @return Fully constructed command handler
      * @warning ConstructL of base class is called. If ConstructL is 
      *          implemented in this class, then care must be taken to call 
      *          CGlxCommandHandlerAiwBase::ConstructL
      */
-	IMPORT_C static CGlxCommandHandlerAiwEdit* NewL(
-	    MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource,
-	    TBool aCommandSingleClick=EFalse);
-	    
-protected: // From CGlxMediaListCommandHandler
-	/**
-	 * See @ref CGlxMediaListCommandHandler::DoGetRequiredAttributesL
-	 */
-    virtual void DoGetRequiredAttributesL(RArray<TMPXAttribute>& aAttributes, TBool aFilterUsingSelection) const;
+    IMPORT_C static CGlxCommandHandlerAiwEdit* NewL(MGlxMediaListProvider* aMediaListProvider, TBool aCommandSingleClick=EFalse);        
 
-protected: // From CGlxCommandHandlerAiwBase
-    virtual TBool AppendAiwParameterL(const TGlxMedia& aItem, 
-                                     CGlxAiwServiceHandler& aAiwServiceHandler);
-    virtual TInt CommandId() const;
-    virtual TInt AiwCommandId() const ;
-    virtual TInt AiwInterestResource() const ;
-    virtual TInt CommandSpace() const ;
-	//single clk chng-hide edit for 0 or >1 items
-    void AiwDoDynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
+    /**
+     * Destructor
+     */
+    IMPORT_C ~CGlxCommandHandlerAiwEdit();
+    
 private:
+    /** 
+     * Second phase constructor
+     */
+    void ConstructL();
+    
     /**
      * Constructor
-     */
-    CGlxCommandHandlerAiwEdit(MGlxMediaListProvider* aMediaListProvider, 
-            TInt aMenuResource);
-    
-    /** 
-     * Second phase constructor
+     * @param aMediaListProvider object that provides the media list
      * @param aCommandSingleClick Flag to identify single click command
      */
-    void ConstructL(TBool aCommandSingleClick);
+    CGlxCommandHandlerAiwEdit( MGlxMediaListProvider* aMediaListProvider, TBool aCommandSingleClick);
+    
+    /*
+     * return if the viewing mode is fullscreen or grid
+     */
+    TBool IsInFullScreenViewingModeL();    
     
-private:
+private: // From CGlxMediaListCommandHandler
+
+    void DoActivateL(TInt aViewId);
+    TBool DoExecuteL( TInt aCommandId , MGlxMediaList& aList);
+    void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
+    
+private: // Data Members
+    
+     // Owned - AIW Service Handler
+    CAiwServiceHandler* iServiceHandler;    
+    
+     //Edit Supported
+    TBool iEditSupported;
+    
     TBool iCommandSingleClick;
     };
 
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwedit.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwedit.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -26,145 +26,169 @@
 #include <glxmedia.h>
 #include <glxuiutilities.rsg>
 
+#include <glxnavigationalstate.h>
+#include <mpxcollectionpath.h>
+#include <glxcollectionpluginimageviewer.hrh>
+
 #include "glxaiwservicehandler.h"
 #include <StringLoader.h>
 #include <glxmedialist.h> 
 #include <glxtracer.h>
 #include <glxlog.h>
+#include <AiwGenericParam.h>                // for passing data between applications
+#include "AiwServiceHandler.h"                  // AIW service handler
+#include "glxmedia.h"
+
 const TInt KGlxAiwEditCommandSpace = 0x00000200;
 
 // -----------------------------------------------------------------------------
 // NewL
 // -----------------------------------------------------------------------------
 //	
-EXPORT_C CGlxCommandHandlerAiwEdit* CGlxCommandHandlerAiwEdit::NewL(
-        MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource,
-        TBool aCommandSingleClick)
+EXPORT_C CGlxCommandHandlerAiwEdit* CGlxCommandHandlerAiwEdit::NewL(MGlxMediaListProvider* aMediaListProvider, TBool aCommandSingleClick)
     {
-    CGlxCommandHandlerAiwEdit* self = new ( ELeave ) 
-        CGlxCommandHandlerAiwEdit(aMediaListProvider, aMenuResource);
-    CleanupStack::PushL( self );
-    self->ConstructL(aCommandSingleClick);
-    CleanupStack::Pop( self );
+    CGlxCommandHandlerAiwEdit* self = new (ELeave) CGlxCommandHandlerAiwEdit(aMediaListProvider, aCommandSingleClick);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
     return self;
     }
 
-// ---------------------------------------------------------------------------
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// ~CGlxCommandHandlerAiwEdit
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CGlxCommandHandlerAiwEdit::~CGlxCommandHandlerAiwEdit()
+    {
+    delete iServiceHandler;
+    }
+
+// -----------------------------------------------------------------------------
+// ConstructL
+// -----------------------------------------------------------------------------
 //
-void CGlxCommandHandlerAiwEdit::ConstructL(TBool aCommandSingleClick)
+void CGlxCommandHandlerAiwEdit::ConstructL()
     {
-    TRACER("CGlxCommandHandlerAiwEdit::ConstructL");
-    CGlxCommandHandlerAiwBase::ConstructL();
-    iCommandSingleClick = aCommandSingleClick;
+    TRAP_IGNORE(
+            {
+            iServiceHandler = CAiwServiceHandler::NewL();
+            iServiceHandler->AttachL( R_GLX_AIW_EDIT_INTEREST );
+            iEditSupported = ETrue;
+            }  );
+    
+    if(iCommandSingleClick)
+        {
+        TCommandInfo info(EGlxCmdAiwSingleClickEdit);
+        AddCommandL(info);
+        }
+    else
+        {
+        TCommandInfo info(EGlxCmdAiwEdit);
+        AddCommandL(info);
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CGlxCommandHandlerAiwEdit
+// -----------------------------------------------------------------------------
+//
+CGlxCommandHandlerAiwEdit::CGlxCommandHandlerAiwEdit( MGlxMediaListProvider* aMediaListProvider, TBool aCommandSingleClick )
+                                :CGlxMediaListCommandHandler(aMediaListProvider),
+                                 iCommandSingleClick(aCommandSingleClick)
+    {
+    // Do Nothing
+    }
+
+// -----------------------------------------------------------------------------
+// DoActivateL
+// -----------------------------------------------------------------------------
+//
+void CGlxCommandHandlerAiwEdit::DoActivateL(TInt /*aViewId*/)
+    {
+    // DO Nothing
     }
 
 // -----------------------------------------------------------------------------
-// CGlxCommandHandlerAiwEdit::DoGetRequiredAttributesL
-// -----------------------------------------------------------------------------
-//	
-void CGlxCommandHandlerAiwEdit::DoGetRequiredAttributesL
-									(RArray<TMPXAttribute>& aAttributes, TBool aFilterUsingSelection) const
-	{
-	if (!aFilterUsingSelection || SelectionLength() <= MaxSelectedItems())
-		{
-	    // Add MIME type and fileaname attributes
-	    aAttributes.AppendL(KMPXMediaGeneralMimeType);
-		aAttributes.AppendL(KMPXMediaGeneralUri);		
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// Constructor
+// DynInitMenuPaneL
 // -----------------------------------------------------------------------------
-//	
-CGlxCommandHandlerAiwEdit::CGlxCommandHandlerAiwEdit(
-        MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource)
-:   CGlxCommandHandlerAiwBase(aMediaListProvider, aMenuResource)
+//
+void CGlxCommandHandlerAiwEdit::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane)
     {
-    }
+    MGlxMediaList& mediaList = MediaList();
+    TInt pos;
     
-// -----------------------------------------------------------------------------
-// CommandId
-// -----------------------------------------------------------------------------
-//	
-TInt CGlxCommandHandlerAiwEdit::CommandId() const
-    {
-    if (iCommandSingleClick)
+    if (aMenuPane && iCommandSingleClick && aMenuPane->MenuItemExists(EGlxCmdAiwSingleClickEdit, pos)
+            && (mediaList.SelectionCount() > 1))
         {
-        return EGlxCmdAiwSingleClickEdit;
+        aMenuPane->SetItemDimmed(EGlxCmdAiwSingleClickEdit, ETrue);
         }
-    return EGlxCmdAiwEdit;
-    }
-    
-// -----------------------------------------------------------------------------
-// AiwCommandId
-// -----------------------------------------------------------------------------
-//	
-TInt CGlxCommandHandlerAiwEdit::AiwCommandId() const
-    {
-    return KAiwCmdEdit;
-    }
-    
-// -----------------------------------------------------------------------------
-// AiwInterestResource
-// -----------------------------------------------------------------------------
-//	
-TInt CGlxCommandHandlerAiwEdit::AiwInterestResource() const
-    {
-    if (iCommandSingleClick)
+    else if (aMenuPane && aMenuPane->MenuItemExists(EGlxCmdAiwEdit, pos) 
+            && (mediaList.SelectionCount() != 1) && !IsInFullScreenViewingModeL())
         {
-        return R_GLX_AIW_SINGLE_CLICK_EDIT_INTEREST;
-        }    
-    return R_GLX_AIW_EDIT_INTEREST;
-    }
-        
-// -----------------------------------------------------------------------------
-// AppendAiwParameterL
-// -----------------------------------------------------------------------------
-//	
-TBool CGlxCommandHandlerAiwEdit::AppendAiwParameterL(const TGlxMedia& aItem, 
-                                     CGlxAiwServiceHandler& aAiwServiceHandler)
-    {
-    return AppendDefaultAiwParameterL(  aItem, 
-                                        aAiwServiceHandler, 
-                                        ETrue,                  // Add the Uri
-                                        ETrue);                // Add the Mime Type
-		                                       
+        aMenuPane->SetItemDimmed(EGlxCmdAiwEdit, ETrue);
+        }
+
     }
 
 // -----------------------------------------------------------------------------
-// CommandSpace
+// DoExecuteL
 // -----------------------------------------------------------------------------
-//	
-TInt CGlxCommandHandlerAiwEdit::CommandSpace() const
-    {
-    return KGlxAiwEditCommandSpace;
-    }
-	
-// -----------------------------------------------------------------------------
-// AiwDoDynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//	
-void CGlxCommandHandlerAiwEdit::AiwDoDynInitMenuPaneL(TInt /*aResourceId*/, 
-        CEikMenuPane* aMenuPane)
+//
+TBool CGlxCommandHandlerAiwEdit::DoExecuteL( TInt aCommandId , MGlxMediaList& aList)
     {
-    TRACER("CGlxCommandHandlerAiwEdit::AiwDoDynInitMenuPaneL()");
-    HBufC* currentTitle = StringLoader::LoadLC( R_QTN_LGAL_OPTIONS_EDIT );
-    TInt cmdId = AiwMenuCmdIdL( *currentTitle,aMenuPane ) ;
-    CleanupStack::PopAndDestroy(currentTitle);
+    TBool handled = EFalse;
+    if (iEditSupported && (EGlxCmdAiwEdit == aCommandId || EGlxCmdAiwSingleClickEdit == aCommandId))
+        { 
+        CAiwGenericParamList& inputParams = iServiceHandler->InParamListL();
+        
+        TGlxSelectionIterator iterator;
+        iterator.SetToFirst(&aList);
+        TInt index = iterator++;
+        const TGlxMedia& mediaItem = aList.Item(index);
+        
+        TAiwGenericParam param( EGenericParamFile, TAiwVariant(mediaItem.Uri()));
+        inputParams.AppendL( param );
+        
+        TAiwGenericParam param2( EGenericParamMIMEType, TAiwVariant(mediaItem.MimeType()));
+        inputParams.AppendL( param2 );
+
+        // Execute the KAiwCmdUpload command  EGlxCmdAiwEdit
+        iServiceHandler->ExecuteServiceCmdL(KAiwCmdEdit, inputParams, iServiceHandler->OutParamListL());       
 
-    if (KErrNotFound != cmdId)
+        handled = ETrue;
+        }   
+    return handled;
+    }
+
+// -----------------------------------------------------------------------------
+// IsInFullScreenViewingModeL
+// -----------------------------------------------------------------------------
+//
+TBool CGlxCommandHandlerAiwEdit::IsInFullScreenViewingModeL()
+    {
+    TRACER("CGlxCommandHandlerAiwEdit::IsInFullScreenViewingModeL()");
+    TBool fullscreenViewingMode = EFalse;
+    CGlxNavigationalState* aNavigationalState = CGlxNavigationalState::InstanceL();
+    CMPXCollectionPath* naviState = aNavigationalState->StateLC();
+    
+    if ( naviState->Levels() >= 1)
         {
-        if (iCommandSingleClick && (MediaList().SelectionCount() > 1))
+        if (aNavigationalState->ViewingMode() == NGlxNavigationalState::EBrowse) 
             {
-            aMenuPane->SetItemDimmed(cmdId,ETrue);    
-            }
-        else if ( MediaList().SelectionCount() != 1) 
+            // For image viewer collection, goto view mode
+            if (naviState->Id() == TMPXItemId(KGlxCollectionPluginImageViewerImplementationUid))
+                {
+                //it means we are in img viewer
+                fullscreenViewingMode = ETrue;
+                }
+            } 
+        else 
             {
-            // Enable ONLY when a single item marked
-            aMenuPane->SetItemDimmed(cmdId,ETrue);    
-            }    
+            //it means we are in Fullscreen
+            fullscreenViewingMode = ETrue;
+            }                
         }
+    CleanupStack::PopAndDestroy( naviState );
+    aNavigationalState->Close();
+    return fullscreenViewingMode;
     }
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersave.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersave.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -77,17 +77,20 @@
 //
 TBool CGlxCommandHandlerSave::ExecuteL(TInt aCommandId)
     {
-    TRACER("CGlxCommandHandlerSave::CreateCommandL");
+    TRACER("CGlxCommandHandlerSave::ExecuteL");
     if(aCommandId == EGlxCmdSave)
     	{
-    	TDataType nullType;
-    	RFile64& imageHandle = iImageViewerInstance->ImageFileHandle();
-    	if ( imageHandle.SubSessionHandle() != KNullHandle )
-    		{
-    		CDocumentHandler* handler = CDocumentHandler::NewLC(NULL);
-    		__ASSERT_ALWAYS(handler, Panic(EGlxPanicNullPointer));        
-    		TRAP_IGNORE(handler->CopyL(imageHandle, KNullDesC, nullType, NULL));
-    		CleanupStack::PopAndDestroy(handler);
+        RFile64& imageHandle = iImageViewerInstance->ImageFileHandle();
+    	if ( &imageHandle != NULL )
+    	    {
+            if ( imageHandle.SubSessionHandle() != KNullHandle )
+                {
+                TDataType nullType;
+                CDocumentHandler* handler = CDocumentHandler::NewLC(NULL); 
+                __ASSERT_ALWAYS(handler, Panic(EGlxPanicNullPointer));
+                TRAP_IGNORE(handler->CopyL(imageHandle, KNullDesC, nullType, NULL));
+                CleanupStack::PopAndDestroy(handler);
+                }            
     		}
     	return ETrue;
     	}
--- a/photosgallery/viewframework/commandhandlers/inc/glxcommandhandlers.hrh	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/inc/glxcommandhandlers.hrh	Tue Feb 02 00:10:37 2010 +0200
@@ -30,8 +30,7 @@
 
 enum TGlxCommandId
     {
-    EGlxCmdAddToAlbum = 0x5500,
-    EGlxCmdOptions,
+    EGlxCmdAddToAlbum = 0x5500,   
     EGlxCmdDelete,
     EGlxCmdAddTag,
     EGlxCmdStateView,
--- a/photosgallery/viewframework/medialists/bwins/glxmedialistsu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/bwins/glxmedialistsu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,127 +1,123 @@
 EXPORTS
-	??ETGlxSelectionIterator@@UAEHH@Z @ 1 NONAME ; int TGlxSelectionIterator::operator++(int)
-	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 2 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
-	?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 3 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &)
-	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 4 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 5 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
-	?InstanceL@MGlxCache@@SAPAV1@XZ @ 6 NONAME ; class MGlxCache * MGlxCache::InstanceL(void)
-	??ETGlxWindowIterator@@QAEHH@Z @ 7 NONAME ; int TGlxWindowIterator::operator++(int)
-	?ImageFileHandle@CGlxImageViewerManager@@QBEAAVRFile64@@XZ @ 8 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void) const
-	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 9 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
-	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 10 NONAME ; class CBase * CGlxListWindow::At(int)
-	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 11 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
-	?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 12 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 13 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 14 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 15 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 16 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 17 NONAME ; int TGlxMedia::GetSize(int &) const
-	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 18 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
-	?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 19 NONAME ; int CGlxAttributeContext::AttributeCount(void)
-	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 20 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
-	??1TGlxExclusionIterator@@QAE@XZ @ 21 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
-	?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 22 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &)
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	??0TGlxSequentialIterator@@QAE@XZ @ 24 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
-	?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 25 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int)
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 26 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 27 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
+	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 1 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
+	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 2 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
+	?SetHighQualityOnly@CGlxThumbnailContext@@QAEXH@Z @ 3 NONAME ; void CGlxThumbnailContext::SetHighQualityOnly(int)
+	??0TGlxFetchContextRemover@@QAE@PAVMGlxFetchContext@@AAVMGlxMediaList@@@Z @ 4 NONAME ; TGlxFetchContextRemover::TGlxFetchContextRemover(class MGlxFetchContext *, class MGlxMediaList &)
+	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 5 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
+	?NewL@CGlxThumbnailContext@@SAPAV1@PAVMGlxMediaListIterator@@@Z @ 6 NONAME ; class CGlxThumbnailContext * CGlxThumbnailContext::NewL(class MGlxMediaListIterator *)
+	??1CGlxListWindow@@UAE@XZ @ 7 NONAME ; CGlxListWindow::~CGlxListWindow(void)
+	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 8 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
+	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 9 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
+	?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 10 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void)
+	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 11 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 12 NONAME ; int TGlxMedia::GetSize(int &) const
+	??ETGlxWindowIterator@@QAEHH@Z @ 13 NONAME ; int TGlxWindowIterator::operator++(int)
+	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 14 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	?NewL@CGlxUStringConverter@@SAPAV1@XZ @ 15 NONAME ; class CGlxUStringConverter * CGlxUStringConverter::NewL(void)
+	?InstanceL@MGlxCache@@SAPAV1@XZ @ 16 NONAME ; class MGlxCache * MGlxCache::InstanceL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 17 NONAME ; void CGlxMedia::Reset(void)
+	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 18 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
+	??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 19 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 20 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
+	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 21 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
+	?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 22 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 23 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	??1TGlxSelectionIterator@@QAE@XZ @ 24 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
+	?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 25 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int)
+	??0TGlxSelectionIterator@@QAE@XZ @ 26 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
+	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 27 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
 	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 28 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 29 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	??1TGlxFetchContextRemover@@QAE@XZ @ 30 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void)
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 31 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 32 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 33 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 34 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 35 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	??0TGlxSelectionIterator@@QAE@XZ @ 36 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
-	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 37 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
-	??1TGlxSelectionIterator@@QAE@XZ @ 38 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 39 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 40 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 41 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
-	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 42 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
-	??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 43 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *)
-	??1CGlxDefaultAttributeContext@@UAE@XZ @ 44 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void)
-	?ConstructL@CGlxListWindow@@QAEXXZ @ 45 NONAME ; void CGlxListWindow::ConstructL(void)
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 46 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 47 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 48 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 49 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 50 NONAME ; int TGlxMedia::GetDuration(float &) const
-	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 51 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
-	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 52 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
-	?SetRangeOffsets@CGlxDefaultAttributeContext@@QAEXHH@Z @ 53 NONAME ; void CGlxDefaultAttributeContext::SetRangeOffsets(int, int)
-	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 54 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 55 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 56 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
+	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 29 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 30 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 31 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
+	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 32 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
+	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 33 NONAME ; void CGlxListWindow::SetFocusIndex(int)
+	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 34 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
+	??1CGlxDefaultThumbnailContext@@UAE@XZ @ 35 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void)
+	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 36 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
+	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 37 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
+	?ConstructL@CGlxListWindow@@QAEXXZ @ 38 NONAME ; void CGlxListWindow::ConstructL(void)
+	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 39 NONAME ; void TGlxSequentialIterator::SetRange(int)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 40 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 41 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
+	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 42 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 43 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 44 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 45 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 46 NONAME ; void TGlxSelectionIterator::SetRange(int)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 47 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 48 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 49 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 50 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?SetDefaultSpec@CGlxAttributeContext@@QAEXHH@Z @ 51 NONAME ; void CGlxAttributeContext::SetDefaultSpec(int, int)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 52 NONAME ; int TGlxMedia::IsStatic(void) const
+	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 53 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
+	?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 54 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int)
+	??1CGlxDefaultAttributeContext@@UAE@XZ @ 55 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void)
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 56 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
 	??1TGlxFirstThenLastIterator@@QAE@XZ @ 57 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 58 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 59 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
-	?IncrementRefCount@CGlxImageViewerManager@@QAEXXZ @ 60 NONAME ; void CGlxImageViewerManager::IncrementRefCount(void)
-	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 61 NONAME ; class CBase const * CGlxListWindow::At(int) const
-	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 62 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
-	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 63 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
-	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 64 NONAME ; int TGlxSelectionIterator::InRange(int) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 65 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 66 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId<class TGlxIdHierarchyBase> const &, class CMPXMedia *)
-	?Reset@CGlxMedia@@QAEXXZ @ 67 NONAME ; void CGlxMedia::Reset(void)
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 68 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?SetDefaultSpec@CGlxAttributeContext@@QAEXHH@Z @ 69 NONAME ; void CGlxAttributeContext::SetDefaultSpec(int, int)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 70 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 71 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 72 NONAME ; void CGlxListWindow::AddObjects(int, int)
-	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 73 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
-	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 74 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
-	?AsStringL@CGlxUStringConverter@@QBEXABVTGlxMedia@@ABVTMPXAttribute@@HAAPAVHBufC16@@@Z @ 75 NONAME ; void CGlxUStringConverter::AsStringL(class TGlxMedia const &, class TMPXAttribute const &, int, class HBufC16 * &) const
-	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 76 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
-	?NewL@CGlxThumbnailContext@@SAPAV1@PAVMGlxMediaListIterator@@@Z @ 77 NONAME ; class CGlxThumbnailContext * CGlxThumbnailContext::NewL(class MGlxMediaListIterator *)
-	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 78 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 79 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 80 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
-	?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 81 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 82 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	??1CGlxMedia@@UAE@XZ @ 83 NONAME ; CGlxMedia::~CGlxMedia(void)
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 84 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 85 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 86 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
-	?NewL@CGlxDefaultThumbnailContext@@SAPAV1@XZ @ 87 NONAME ; class CGlxDefaultThumbnailContext * CGlxDefaultThumbnailContext::NewL(void)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 88 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 89 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	??1CGlxThumbnailContext@@UAE@XZ @ 90 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 91 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 92 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
-	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 93 NONAME ; void TGlxSequentialIterator::SetRange(int)
-	??1CGlxAttributeContext@@UAE@XZ @ 94 NONAME ; CGlxAttributeContext::~CGlxAttributeContext(void)
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 95 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?SetHighQualityOnly@CGlxThumbnailContext@@QAEXH@Z @ 96 NONAME ; void CGlxThumbnailContext::SetHighQualityOnly(int)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 97 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 98 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 99 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 100 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 101 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
-	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 102 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 103 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	??0TGlxFetchContextRemover@@QAE@PAVMGlxFetchContext@@AAVMGlxMediaList@@@Z @ 104 NONAME ; TGlxFetchContextRemover::TGlxFetchContextRemover(class MGlxFetchContext *, class MGlxMediaList &)
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 105 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 106 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 107 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 108 NONAME ; void TGlxSelectionIterator::SetRange(int)
-	??0TGlxFirstThenLastIterator@@QAE@XZ @ 109 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
-	?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 110 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void)
-	??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 111 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *)
-	?Close@TGlxFetchContextRemover@@QAEXXZ @ 112 NONAME ; void TGlxFetchContextRemover::Close(void)
-	?NewL@CGlxUStringConverter@@SAPAV1@XZ @ 113 NONAME ; class CGlxUStringConverter * CGlxUStringConverter::NewL(void)
-	?IsStatic@TGlxMedia@@QBEHXZ @ 114 NONAME ; int TGlxMedia::IsStatic(void) const
-	??1CGlxDefaultThumbnailContext@@UAE@XZ @ 115 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void)
-	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 116 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 117 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	??1CGlxListWindow@@UAE@XZ @ 118 NONAME ; CGlxListWindow::~CGlxListWindow(void)
-	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 119 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
-	?Cleanup@CGlxListWindow@@QAEXXZ @ 120 NONAME ; void CGlxListWindow::Cleanup(void)
-	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 121 NONAME ; void CGlxListWindow::SetFocusIndex(int)
-	?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 122 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 123 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 124 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 125 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int)
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 58 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	??ETGlxSelectionIterator@@UAEHH@Z @ 59 NONAME ; int TGlxSelectionIterator::operator++(int)
+	?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 60 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &)
+	?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 61 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int)
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 62 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 63 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 64 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 65 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId<class TGlxIdHierarchyBase> const &, class CMPXMedia *)
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 66 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 67 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
+	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 68 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 69 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 70 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *)
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 71 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 72 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 73 NONAME ; void CGlxListWindow::AddObjects(int, int)
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 74 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 75 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
+	??0TGlxSequentialIterator@@QAE@XZ @ 76 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
+	?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 77 NONAME ; int CGlxAttributeContext::AttributeCount(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 78 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 79 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
+	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 80 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 81 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 82 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 83 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 84 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 85 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	??1CGlxMedia@@UAE@XZ @ 86 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 87 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 88 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	??1CGlxThumbnailContext@@UAE@XZ @ 89 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void)
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 90 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 91 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 92 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
+	?Close@TGlxFetchContextRemover@@QAEXXZ @ 93 NONAME ; void TGlxFetchContextRemover::Close(void)
+	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 94 NONAME ; class CBase const * CGlxListWindow::At(int) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 95 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
+	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 96 NONAME ; class CBase * CGlxListWindow::At(int)
+	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 97 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
+	?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 98 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &)
+	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 99 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
+	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 100 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
+	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 101 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
+	?Cleanup@CGlxListWindow@@QAEXXZ @ 102 NONAME ; void CGlxListWindow::Cleanup(void)
+	??1TGlxExclusionIterator@@QAE@XZ @ 103 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
+	??1TGlxFetchContextRemover@@QAE@XZ @ 104 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void)
+	?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 105 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int)
+	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 106 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 107 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 108 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 109 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 110 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 111 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	??0TGlxFirstThenLastIterator@@QAE@XZ @ 112 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
+	??1CGlxAttributeContext@@UAE@XZ @ 113 NONAME ; CGlxAttributeContext::~CGlxAttributeContext(void)
+	?SetRangeOffsets@CGlxDefaultAttributeContext@@QAEXHH@Z @ 114 NONAME ; void CGlxDefaultAttributeContext::SetRangeOffsets(int, int)
+	?AsStringL@CGlxUStringConverter@@QBEXABVTGlxMedia@@ABVTMPXAttribute@@HAAPAVHBufC16@@@Z @ 115 NONAME ; void CGlxUStringConverter::AsStringL(class TGlxMedia const &, class TMPXAttribute const &, int, class HBufC16 * &) const
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 116 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 117 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?NewL@CGlxDefaultThumbnailContext@@SAPAV1@XZ @ 118 NONAME ; class CGlxDefaultThumbnailContext * CGlxDefaultThumbnailContext::NewL(void)
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 119 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
+	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 120 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
+	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 121 NONAME ; int TGlxSelectionIterator::InRange(int) const
 
--- a/photosgallery/viewframework/medialists/eabi/glxmedialistsu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/eabi/glxmedialistsu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -57,141 +57,137 @@
 	_ZN21TGlxSelectionIteratorD1Ev @ 56 NONAME
 	_ZN21TGlxSelectionIteratorD2Ev @ 57 NONAME
 	_ZN21TGlxSelectionIteratorppEi @ 58 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 59 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 60 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 61 NONAME
-	_ZN22TGlxSequentialIterator8SetRangeEi @ 62 NONAME
-	_ZN22TGlxSequentialIteratorC1Ev @ 63 NONAME
-	_ZN22TGlxSequentialIteratorC2Ev @ 64 NONAME
-	_ZN22TGlxSpecificIdIteratorC1ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 65 NONAME
-	_ZN22TGlxSpecificIdIteratorC2ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 66 NONAME
-	_ZN23TGlxFetchContextRemover5CloseEv @ 67 NONAME
-	_ZN23TGlxFetchContextRemoverC1EP16MGlxFetchContextR13MGlxMediaList @ 68 NONAME
-	_ZN23TGlxFetchContextRemoverC2EP16MGlxFetchContextR13MGlxMediaList @ 69 NONAME
-	_ZN23TGlxFetchContextRemoverD1Ev @ 70 NONAME
-	_ZN23TGlxFetchContextRemoverD2Ev @ 71 NONAME
-	_ZN25TGlxFirstThenLastIteratorC1Ev @ 72 NONAME
-	_ZN25TGlxFirstThenLastIteratorC2Ev @ 73 NONAME
-	_ZN25TGlxFirstThenLastIteratorD1Ev @ 74 NONAME
-	_ZN25TGlxFirstThenLastIteratorD2Ev @ 75 NONAME
-	_ZN27CGlxDefaultAttributeContext15SetRangeOffsetsEii @ 76 NONAME
-	_ZN27CGlxDefaultAttributeContext4NewLEv @ 77 NONAME
-	_ZN27CGlxDefaultAttributeContextD0Ev @ 78 NONAME
-	_ZN27CGlxDefaultAttributeContextD1Ev @ 79 NONAME
-	_ZN27CGlxDefaultAttributeContextD2Ev @ 80 NONAME
-	_ZN27CGlxDefaultThumbnailContext15SetRangeOffsetsEii @ 81 NONAME
-	_ZN27CGlxDefaultThumbnailContext4NewLEv @ 82 NONAME
-	_ZN27CGlxDefaultThumbnailContextD0Ev @ 83 NONAME
-	_ZN27CGlxDefaultThumbnailContextD1Ev @ 84 NONAME
-	_ZN27CGlxDefaultThumbnailContextD2Ev @ 85 NONAME
-	_ZN28TGlxFromFocusOutwardIterator15SetRangeOffsetsEii @ 86 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorC1Ev @ 87 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorC2Ev @ 88 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorD1Ev @ 89 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorD2Ev @ 90 NONAME
-	_ZN33TGlxFromManualIndexBlockyIterator15SetRangeOffsetsEii @ 91 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorC1Ev @ 92 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorC2Ev @ 93 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorD1Ev @ 94 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorD2Ev @ 95 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorC1Ev @ 96 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorC2Ev @ 97 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorD1Ev @ 98 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorD2Ev @ 99 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIterator15SetRangeOffsetsEii @ 100 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorC1ERKNS_9MGlxIndexE @ 101 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorC2ERKNS_9MGlxIndexE @ 102 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorD1Ev @ 103 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorD2Ev @ 104 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIterator8SetIndexEi @ 105 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC1Ev @ 106 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC2Ev @ 107 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD1Ev @ 108 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD2Ev @ 109 NONAME
-	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 110 NONAME
-	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 111 NONAME
-	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 112 NONAME
-	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 113 NONAME
-	_ZN9CGlxMedia5ResetEv @ 114 NONAME
-	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 115 NONAME
-	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 116 NONAME
-	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 117 NONAME
-	_ZN9CGlxMediaD0Ev @ 118 NONAME
-	_ZN9CGlxMediaD1Ev @ 119 NONAME
-	_ZN9CGlxMediaD2Ev @ 120 NONAME
-	_ZN9MGlxCache9InstanceLEv @ 121 NONAME
-	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 122 NONAME
-	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 123 NONAME
-	_ZNK14CGlxListWindow2AtEi @ 124 NONAME
-	_ZNK14CGlxListWindow8IteratorEv @ 125 NONAME
-	_ZNK20CGlxUStringConverter9AsStringLERK9TGlxMediaRK13TMPXAttributeiRP7HBufC16 @ 126 NONAME
-	_ZNK21TGlxSelectionIterator7InRangeEi @ 127 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 128 NONAME
-	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 129 NONAME
-	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 130 NONAME
-	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 131 NONAME
-	_ZNK9TGlxMedia11GetDurationERf @ 132 NONAME
-	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 133 NONAME
-	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 134 NONAME
-	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 135 NONAME
-	_ZNK9TGlxMedia13GetFrameCountERi @ 136 NONAME
-	_ZNK9TGlxMedia13GetSystemItemERi @ 137 NONAME
-	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 138 NONAME
-	_ZNK9TGlxMedia14IsDrmProtectedEv @ 139 NONAME
-	_ZNK9TGlxMedia15GetDrmProtectedERi @ 140 NONAME
-	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 141 NONAME
-	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 142 NONAME
-	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 143 NONAME
-	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 144 NONAME
-	_ZNK9TGlxMedia21GetContainedItemCountERi @ 145 NONAME
-	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 146 NONAME
-	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 147 NONAME
-	_ZNK9TGlxMedia3UriEv @ 148 NONAME
-	_ZNK9TGlxMedia5TitleEv @ 149 NONAME
-	_ZNK9TGlxMedia7CommentEv @ 150 NONAME
-	_ZNK9TGlxMedia7GetDateER5TTime @ 151 NONAME
-	_ZNK9TGlxMedia7GetSizeERi @ 152 NONAME
-	_ZNK9TGlxMedia8CategoryEv @ 153 NONAME
-	_ZNK9TGlxMedia8IsStaticEv @ 154 NONAME
-	_ZNK9TGlxMedia8MimeTypeEv @ 155 NONAME
-	_ZNK9TGlxMedia8SubTitleEv @ 156 NONAME
-	_ZNK9TGlxMedia9IdSpaceIdEv @ 157 NONAME
-	_ZTI13CGlxMediaList @ 158 NONAME
-	_ZTI14CGlxListWindow @ 159 NONAME
-	_ZTI15CGlxImageReader @ 160 NONAME
-	_ZTI16CGlxCacheManager @ 161 NONAME
-	_ZTI20CGlxAttributeContext @ 162 NONAME
-	_ZTI20CGlxGarbageCollector @ 163 NONAME
-	_ZTI20CGlxThumbnailContext @ 164 NONAME
-	_ZTI21TGlxExclusionIterator @ 165 NONAME
-	_ZTI21TGlxSelectionIterator @ 166 NONAME
-	_ZTI22TGlxSequentialIterator @ 167 NONAME
-	_ZTI22TGlxSpecificIdIterator @ 168 NONAME
-	_ZTI25TGlxFirstThenLastIterator @ 169 NONAME
-	_ZTI27CGlxDefaultAttributeContext @ 170 NONAME
-	_ZTI27CGlxDefaultThumbnailContext @ 171 NONAME
-	_ZTI28TGlxFromFocusOutwardIterator @ 172 NONAME
-	_ZTI33TGlxFromManualIndexBlockyIterator @ 173 NONAME
-	_ZTI34TGlxFromFocusOutwardBlockyIterator @ 174 NONAME
-	_ZTI34TGlxFromIndexOutwardBlockyIterator @ 175 NONAME
-	_ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 176 NONAME
-	_ZTV13CGlxMediaList @ 177 NONAME
-	_ZTV14CGlxListWindow @ 178 NONAME
-	_ZTV15CGlxImageReader @ 179 NONAME
-	_ZTV16CGlxCacheManager @ 180 NONAME
-	_ZTV20CGlxAttributeContext @ 181 NONAME
-	_ZTV20CGlxGarbageCollector @ 182 NONAME
-	_ZTV20CGlxThumbnailContext @ 183 NONAME
-	_ZTV21TGlxExclusionIterator @ 184 NONAME
-	_ZTV21TGlxSelectionIterator @ 185 NONAME
-	_ZTV22TGlxSequentialIterator @ 186 NONAME
-	_ZTV22TGlxSpecificIdIterator @ 187 NONAME
-	_ZTV25TGlxFirstThenLastIterator @ 188 NONAME
-	_ZTV27CGlxDefaultAttributeContext @ 189 NONAME
-	_ZTV27CGlxDefaultThumbnailContext @ 190 NONAME
-	_ZTV28TGlxFromFocusOutwardIterator @ 191 NONAME
-	_ZTV33TGlxFromManualIndexBlockyIterator @ 192 NONAME
-	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 193 NONAME
-	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 194 NONAME
-	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 195 NONAME
+	_ZN22TGlxSequentialIterator8SetRangeEi @ 59 NONAME
+	_ZN22TGlxSequentialIteratorC1Ev @ 60 NONAME
+	_ZN22TGlxSequentialIteratorC2Ev @ 61 NONAME
+	_ZN22TGlxSpecificIdIteratorC1ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 62 NONAME
+	_ZN22TGlxSpecificIdIteratorC2ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 63 NONAME
+	_ZN23TGlxFetchContextRemover5CloseEv @ 64 NONAME
+	_ZN23TGlxFetchContextRemoverC1EP16MGlxFetchContextR13MGlxMediaList @ 65 NONAME
+	_ZN23TGlxFetchContextRemoverC2EP16MGlxFetchContextR13MGlxMediaList @ 66 NONAME
+	_ZN23TGlxFetchContextRemoverD1Ev @ 67 NONAME
+	_ZN23TGlxFetchContextRemoverD2Ev @ 68 NONAME
+	_ZN25TGlxFirstThenLastIteratorC1Ev @ 69 NONAME
+	_ZN25TGlxFirstThenLastIteratorC2Ev @ 70 NONAME
+	_ZN25TGlxFirstThenLastIteratorD1Ev @ 71 NONAME
+	_ZN25TGlxFirstThenLastIteratorD2Ev @ 72 NONAME
+	_ZN27CGlxDefaultAttributeContext15SetRangeOffsetsEii @ 73 NONAME
+	_ZN27CGlxDefaultAttributeContext4NewLEv @ 74 NONAME
+	_ZN27CGlxDefaultAttributeContextD0Ev @ 75 NONAME
+	_ZN27CGlxDefaultAttributeContextD1Ev @ 76 NONAME
+	_ZN27CGlxDefaultAttributeContextD2Ev @ 77 NONAME
+	_ZN27CGlxDefaultThumbnailContext15SetRangeOffsetsEii @ 78 NONAME
+	_ZN27CGlxDefaultThumbnailContext4NewLEv @ 79 NONAME
+	_ZN27CGlxDefaultThumbnailContextD0Ev @ 80 NONAME
+	_ZN27CGlxDefaultThumbnailContextD1Ev @ 81 NONAME
+	_ZN27CGlxDefaultThumbnailContextD2Ev @ 82 NONAME
+	_ZN28TGlxFromFocusOutwardIterator15SetRangeOffsetsEii @ 83 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorC1Ev @ 84 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorC2Ev @ 85 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorD1Ev @ 86 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorD2Ev @ 87 NONAME
+	_ZN33TGlxFromManualIndexBlockyIterator15SetRangeOffsetsEii @ 88 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorC1Ev @ 89 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorC2Ev @ 90 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorD1Ev @ 91 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorD2Ev @ 92 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorC1Ev @ 93 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorC2Ev @ 94 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorD1Ev @ 95 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorD2Ev @ 96 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIterator15SetRangeOffsetsEii @ 97 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorC1ERKNS_9MGlxIndexE @ 98 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorC2ERKNS_9MGlxIndexE @ 99 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorD1Ev @ 100 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorD2Ev @ 101 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIterator8SetIndexEi @ 102 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC1Ev @ 103 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC2Ev @ 104 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD1Ev @ 105 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD2Ev @ 106 NONAME
+	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 107 NONAME
+	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 108 NONAME
+	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 109 NONAME
+	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 110 NONAME
+	_ZN9CGlxMedia5ResetEv @ 111 NONAME
+	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 112 NONAME
+	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 113 NONAME
+	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 114 NONAME
+	_ZN9CGlxMediaD0Ev @ 115 NONAME
+	_ZN9CGlxMediaD1Ev @ 116 NONAME
+	_ZN9CGlxMediaD2Ev @ 117 NONAME
+	_ZN9MGlxCache9InstanceLEv @ 118 NONAME
+	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 119 NONAME
+	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 120 NONAME
+	_ZNK14CGlxListWindow2AtEi @ 121 NONAME
+	_ZNK14CGlxListWindow8IteratorEv @ 122 NONAME
+	_ZNK20CGlxUStringConverter9AsStringLERK9TGlxMediaRK13TMPXAttributeiRP7HBufC16 @ 123 NONAME
+	_ZNK21TGlxSelectionIterator7InRangeEi @ 124 NONAME
+	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 125 NONAME
+	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 126 NONAME
+	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 127 NONAME
+	_ZNK9TGlxMedia11GetDurationERf @ 128 NONAME
+	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 129 NONAME
+	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 130 NONAME
+	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 131 NONAME
+	_ZNK9TGlxMedia13GetFrameCountERi @ 132 NONAME
+	_ZNK9TGlxMedia13GetSystemItemERi @ 133 NONAME
+	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 134 NONAME
+	_ZNK9TGlxMedia14IsDrmProtectedEv @ 135 NONAME
+	_ZNK9TGlxMedia15GetDrmProtectedERi @ 136 NONAME
+	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 137 NONAME
+	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 138 NONAME
+	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 139 NONAME
+	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 140 NONAME
+	_ZNK9TGlxMedia21GetContainedItemCountERi @ 141 NONAME
+	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 142 NONAME
+	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 143 NONAME
+	_ZNK9TGlxMedia3UriEv @ 144 NONAME
+	_ZNK9TGlxMedia5TitleEv @ 145 NONAME
+	_ZNK9TGlxMedia7CommentEv @ 146 NONAME
+	_ZNK9TGlxMedia7GetDateER5TTime @ 147 NONAME
+	_ZNK9TGlxMedia7GetSizeERi @ 148 NONAME
+	_ZNK9TGlxMedia8CategoryEv @ 149 NONAME
+	_ZNK9TGlxMedia8IsStaticEv @ 150 NONAME
+	_ZNK9TGlxMedia8MimeTypeEv @ 151 NONAME
+	_ZNK9TGlxMedia8SubTitleEv @ 152 NONAME
+	_ZNK9TGlxMedia9IdSpaceIdEv @ 153 NONAME
+	_ZTI13CGlxMediaList @ 154 NONAME
+	_ZTI14CGlxListWindow @ 155 NONAME
+	_ZTI15CGlxImageReader @ 156 NONAME
+	_ZTI16CGlxCacheManager @ 157 NONAME
+	_ZTI20CGlxAttributeContext @ 158 NONAME
+	_ZTI20CGlxGarbageCollector @ 159 NONAME
+	_ZTI20CGlxThumbnailContext @ 160 NONAME
+	_ZTI21TGlxExclusionIterator @ 161 NONAME
+	_ZTI21TGlxSelectionIterator @ 162 NONAME
+	_ZTI22TGlxSequentialIterator @ 163 NONAME
+	_ZTI22TGlxSpecificIdIterator @ 164 NONAME
+	_ZTI25TGlxFirstThenLastIterator @ 165 NONAME
+	_ZTI27CGlxDefaultAttributeContext @ 166 NONAME
+	_ZTI27CGlxDefaultThumbnailContext @ 167 NONAME
+	_ZTI28TGlxFromFocusOutwardIterator @ 168 NONAME
+	_ZTI33TGlxFromManualIndexBlockyIterator @ 169 NONAME
+	_ZTI34TGlxFromFocusOutwardBlockyIterator @ 170 NONAME
+	_ZTI34TGlxFromIndexOutwardBlockyIterator @ 171 NONAME
+	_ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 172 NONAME
+	_ZTV13CGlxMediaList @ 173 NONAME
+	_ZTV14CGlxListWindow @ 174 NONAME
+	_ZTV15CGlxImageReader @ 175 NONAME
+	_ZTV16CGlxCacheManager @ 176 NONAME
+	_ZTV20CGlxAttributeContext @ 177 NONAME
+	_ZTV20CGlxGarbageCollector @ 178 NONAME
+	_ZTV20CGlxThumbnailContext @ 179 NONAME
+	_ZTV21TGlxExclusionIterator @ 180 NONAME
+	_ZTV21TGlxSelectionIterator @ 181 NONAME
+	_ZTV22TGlxSequentialIterator @ 182 NONAME
+	_ZTV22TGlxSpecificIdIterator @ 183 NONAME
+	_ZTV25TGlxFirstThenLastIterator @ 184 NONAME
+	_ZTV27CGlxDefaultAttributeContext @ 185 NONAME
+	_ZTV27CGlxDefaultThumbnailContext @ 186 NONAME
+	_ZTV28TGlxFromFocusOutwardIterator @ 187 NONAME
+	_ZTV33TGlxFromManualIndexBlockyIterator @ 188 NONAME
+	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 189 NONAME
+	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 190 NONAME
+	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 191 NONAME
 
--- a/photosgallery/viewframework/medialists/inc/glxcachemanager.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/inc/glxcachemanager.h	Tue Feb 02 00:10:37 2010 +0200
@@ -53,9 +53,12 @@
  *
  *  @lib glxmedialists.lib
  */
-class CGlxCacheManager : public CBase, public MGlxCache, public MGlxMediaPool
+class CGlxCacheManager : public CBase, 
+                         public MGlxCache, 
+                         public MGlxMediaPool,
+                         public MImageReadyCallBack
 #ifdef USE_S60_TNM
-, public MThumbnailManagerObserver,public MImageReadyCallBack
+, public MThumbnailManagerObserver
 #endif
 	{
 public:
@@ -182,7 +185,8 @@
     void ForceCleanupMedia(TGlxIdSpaceId aSpaceId,TGlxMediaId aId); 
 
 public:
-    void ImageReadyL(const TInt& aError, const TSize aSz);
+    void ImageSizeReady(TInt aError, const TSize aSz);
+
 private:
     /**
      * Constructor
@@ -287,7 +291,22 @@
      */
     CMPXCollectionPath* RequestAsPathLC(const CGlxMediaList& aList);
     
+    /**
+     * Gets the mime type of a given file.
+     * @param aFileName The file name for which a MIME type to be determined
+     * @aMimeType The MIME type associated with the given file will be returned
+     */
     void GetMimeTypeL(TFileName& aFileName, TDataType& aMimeType );
+
+    /**
+     * Creates the image viewer instance, if not created already.
+     */    
+    void CreateImageViewerInstanceL();
+    
+    /**
+     * Deletes the image viewer instance, if created already.
+     */    
+    void DeleteImageViewerInstance();
     
 #ifdef USE_S60_TNM
     /*
--- a/photosgallery/viewframework/medialists/inc/glximagereader.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/inc/glximagereader.h	Tue Feb 02 00:10:37 2010 +0200
@@ -23,22 +23,36 @@
 #include "glximageviewermanager.h"
 class CFbsBitmap;
 
-
+/**
+ *  Image Size observer.
+ *
+ *  Callback interface for getting size information of a given image.
+ */
 class MImageReadyCallBack
     {
 public:
-    virtual void ImageReadyL(const TInt& aError, const TSize aSz) = 0;
+    /**
+     * Getting image size information is complete.
+     *
+     * @param aError         Error code.
+     * @param aSz            Size of the image.
+     */    
+    virtual void ImageSizeReady(TInt aError, const TSize aSz) = 0;
     };
 
-
+/**
+ *  CGlxImageReader
+ *
+ *  Image Attributes Reader
+ *
+ *  @lib glxmedialists.lib
+ */
 class CGlxImageReader : public CActive
     {
-
 private:
     static CGlxImageReader* NewLC(MImageReadyCallBack& aNotify);
     CGlxImageReader(MImageReadyCallBack& aNotify);
     void ConstructL();
-
     void GetFileTypeL(TDataType aMimeType);
 
 protected:
@@ -54,7 +68,6 @@
     MImageReadyCallBack&                iNotify;
     CImageDecoder*                      iImageDecoder;
     CFbsBitmap*                         iFrame;
-    TBool                               iIsLaunchedFromFMngr;
     CGlxImageViewerManager*             iImgViewerMgr;
     };
 
--- a/photosgallery/viewframework/medialists/src/glxcachemanager.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/src/glxcachemanager.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -123,7 +123,6 @@
     iTnEngine = CThumbnailManager::NewL( *this);
     iTnEngine->SetDisplayModeL( EColor64K );
 #endif
-    iImageViewerInstance = CGlxImageViewerManager::InstanceL();
     }
         
 // -----------------------------------------------------------------------------
@@ -167,10 +166,6 @@
 #endif
     
     delete iMaintainCacheCallback;
-    if ( NULL != iImageViewerInstance)
-        {
-        iImageViewerInstance->DeleteInstance();
-        }
 	}
 
 // -----------------------------------------------------------------------------
@@ -638,10 +633,15 @@
                                     parse.Path().Length() > KPrivateFolder().Length() &&
                                     parse.Path().Left( KPrivateFolder().Length() ).CompareF( KPrivateFolder ) == 0 )
                                     {
+                                    CreateImageViewerInstanceL();
                                     GLX_DEBUG1("KGlxCollectionPluginImageViewerImplementationUid - Fetch (Private) TN!");
-                                    CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(iImageViewerInstance->ImageFileHandle());
-                                    iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
-                                    CleanupStack::PopAndDestroy(source);
+                                    if ( &(iImageViewerInstance->ImageFileHandle()) != NULL )
+                                        {
+                                        CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(iImageViewerInstance->ImageFileHandle());
+                                        iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
+                                        CleanupStack::PopAndDestroy(source);
+                                        }
+                                    DeleteImageViewerInstance();
                                     }
                                 else
                                     {
@@ -695,36 +695,88 @@
 						}
                     }
                 else
-                	{
-	                GLX_DEBUG3("MGallery - CGlxCacheManager::MaintainCacheL() requesting attribute for list %x and item %d", list, itemId.Value());
+                    {
+                    GLX_DEBUG3("MGallery - CGlxCacheManager::MaintainCacheL() requesting attribute for list %x and item %d", list, itemId.Value());
 
-	                // Use list's isolated collection
-	                MMPXCollection& collection = list->Collection();
+                    // Use list's isolated collection
+                    MMPXCollection& collection = list->Collection();
                     if (collection.UidL().iUid == KGlxCollectionPluginImageViewerImplementationUid)
                         {
+                        CreateImageViewerInstanceL();
                         TInt mediaCnt = list->Count();
                         TInt errInImage = KErrNone;
- 
-                        
+
                         GLX_DEBUG3("Image Viewer Collection - Attrib population! mediaCnt=%d, Media Id=%d",
                                 mediaCnt, itemId.Value());
-                        
+
                         delete iMPXMedia;
                         iMPXMedia = NULL;
 
-                        TFileName fileName;
+                        TFileName fileName(KNullDesC);
                         //retrieve the filename as per the caller app.
-						if(!iImageViewerInstance->IsPrivate())
+                        if(iImageViewerInstance->IsPrivate())
                             {
-							//filemngr
-                            fileName.Append(iImageViewerInstance->ImageUri()->Des());
+                            const TGlxMedia& item = list->Item( iRequestedItemIndexes[0] );
+                            // If there is an URI available, then the request is due to EPathChanged message 
+                            // due to a file save from Image Viewer, and attribs needs to be re-populated. 
+                            // So, use the same URI; Oherwise getting fullname from handle might result in a crash.
+                            if (item.Uri().Length())
+                                {
+                                fileName.Append(item.Uri());
+                                }
+                            else
+                                {
+                                // private path
+                                RFile64& imageHandle = iImageViewerInstance->ImageFileHandle();
+                                if ( &imageHandle != NULL )
+                                    {
+                                    fileName.Append(imageHandle.FullName(fileName));
+                                    }
+                                else
+                                    {
+                                    errInImage = KErrArgument;
+                                    }   
+                                }
                             }
                         else
                             {
-							//msging
-                            fileName.Append(iImageViewerInstance->ImageFileHandle().FullName(fileName));
+                            // user data path
+                            if(  iImageViewerInstance->ImageUri() != NULL  )
+                                {
+                                fileName.Append(iImageViewerInstance->ImageUri()->Des());
+                                RFs fs;
+                                CleanupClosePushL(fs);
+                                TInt err = fs.Connect();   
+                                errInImage = KErrArgument;
+                                if(err == KErrNone)
+                                    {
+                                    if (fs.IsValidName(fileName))
+                                        {
+                                        errInImage = KErrNone;
+                                        }
+                                    }
+                                CleanupStack::PopAndDestroy(&fs);
+                                }
+                            else
+                                {
+                                errInImage = KErrArgument;
+                                }
                             }
+
                         iMPXMedia = CMPXMedia::NewL();
+
+                        if (errInImage != KErrNone)
+                            {
+                            HandleGarbageCollectionL(EFalse);
+                            CleanupStack::PopAndDestroy(path);
+                            iRequestOwner = list;
+                            CleanupStack::PopAndDestroy(attrSpecs); 
+                            TGlxIdSpaceId spaceId = list->IdSpaceId(iRequestedItemIndexes[0]);
+                            HandleCollectionMediaL(spaceId, *iMPXMedia, KErrArgument);
+                            DeleteImageViewerInstance();
+                            return;
+                            }
+
                         if(!iReader)
                             {
                             TRAP(errInImage,iReader = CGlxImageReader::NewL(*this));
@@ -733,7 +785,7 @@
                                 iSchedulerWait->Start();
                                 }
                             }
-                    
+
                         for ( TInt i = 0; i < iRequestedAttrs.Count(); i++ )
                             {
                             if ( iRequestedAttrs[i] == KMPXMediaGeneralId )
@@ -768,13 +820,27 @@
                                 {
                                 if(errInImage == KErrNone)
                                     {
-                                    RFs fs; 
-                                    fs.Connect();   
-                                    TEntry entry;   
-                                    fs.Entry(fileName,entry);    
-                                    TTime time = entry.iModified;   
-                                    fs.Close();
-                                    iMPXMedia->SetTObjectValueL(KGlxMediaGeneralLastModifiedDate, time.Int64());
+                                    RFs fs;
+                                    CleanupClosePushL(fs);
+                                    TInt err = fs.Connect();   
+                                    if(err == KErrNone)
+                                        {                                    
+                                        TEntry entry;   
+                                        fs.Entry(fileName,entry);    
+                                        TTime time = entry.iModified;   
+                                        iMPXMedia->SetTObjectValueL(
+                                                KGlxMediaGeneralLastModifiedDate, 
+                                                time.Int64());
+                                        }
+                                    else
+                                        {
+                                        TTime time;
+                                        time.HomeTime();
+                                        iMPXMedia->SetTObjectValueL(
+                                                KGlxMediaGeneralLastModifiedDate, 
+                                                time.Int64());
+                                        }
+                                    CleanupStack::PopAndDestroy(&fs);                                    
                                     }
                                 else
                                     {
@@ -785,24 +851,45 @@
                                 }
                             else if ( iRequestedAttrs[i] == KMPXMediaGeneralSize )
                                 {
-				if(errInImage == KErrNone)
-					{
-					RFs fs; 
-					TInt err = fs.Connect();   
-					if(err == KErrNone)
-				    	{
-						TEntry entry;   
-                    	fs.Entry(fileName,entry);    
-						TInt sz;
-						sz = entry.iSize;   
-						fs.Close();                                    
-						iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, sz);
-						}
-					else
-				    	{
-						iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, 0);
-						}
-					}
+                                if(errInImage == KErrNone)
+                                    {
+                                    if(iImageViewerInstance->IsPrivate())
+                                        {
+                                        TInt64 sz = 0;
+                                        TInt err = KErrNotFound;                                      
+                                        RFile64& imageHandle = iImageViewerInstance->ImageFileHandle();
+                                        if ( imageHandle.SubSessionHandle() != KNullHandle )
+                                            {
+                                            err = imageHandle.Size(sz);
+                                            }
+                                        if(err == KErrNone)
+                                            {
+                                            iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, sz);
+                                            }
+                                        else
+                                            {
+                                            iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, 0);                                            
+                                            }
+                                        }
+                                    else
+                                        {
+                                        RFs fs;
+                                        CleanupClosePushL(fs);
+                                        TInt err = fs.Connect();   
+                                        if(err == KErrNone)
+                                            {
+                                            TEntry entry;   
+                                            fs.Entry(fileName,entry);    
+                                            TInt sz = (TUint)entry.iSize;                                      
+                                            iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, sz);
+                                            }
+                                        else
+                                            {
+                                            iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, 0);
+                                            }
+                                        CleanupStack::PopAndDestroy(&fs);
+                                        }
+                                    }
                                 // If any error while image is being decoded by image decorder, Need to set
                                 // default vaule for that image. Typical case is corrupted image.
                                 else
@@ -861,17 +948,25 @@
                                 }
                             else if (iRequestedAttrs[i] == KMPXMediaDrmProtected )
                                 {
-                                TBool protection = iReader->GetDRMRightsL
-                                		(ContentAccess::EIsProtected);
-                                iMPXMedia->SetTObjectValueL(KMPXMediaDrmProtected, protection); 
+                                TBool protection = EFalse;
+                                if(errInImage == KErrNone)
+                                    {
+                                    protection = iReader->GetDRMRightsL
+                                    (ContentAccess::EIsProtected);
+                                    }
+                                iMPXMedia->SetTObjectValueL(KMPXMediaDrmProtected, protection);
                                 }
                             else if ( iRequestedAttrs[i] == KGlxMediaGeneralDRMRightsValid )
-                                { 
-                                TBool canView = iReader->GetDRMRightsL(ContentAccess::ECanView);
-                                TInt rightsValid = canView ? 
-                                		EGlxDrmRightsValid : EGlxDrmRightsInvalid;
+                                {
+                                TInt rightsValid = EGlxDrmRightsValidityUnknown;
+                                if(errInImage == KErrNone)
+                                    {
+                                    TBool canView = iReader->GetDRMRightsL(ContentAccess::ECanView);
+                                    rightsValid = canView ? 
+                                        EGlxDrmRightsValid : EGlxDrmRightsInvalid;
+                                    }
                                 iMPXMedia->SetTObjectValueL(KGlxMediaGeneralDRMRightsValid,
-                                                             rightsValid); 
+                                        rightsValid); 
                                 }
                             else if ( iRequestedAttrs[i] == KMPXMediaGeneralCount )
                                 {
@@ -881,7 +976,7 @@
                                 {
                                 TGlxIdSpaceId spaceId = list->IdSpaceId(iRequestedItemIndexes[0]);
                                 iMPXMedia->SetTObjectValueL(KMPXMediaColDetailSpaceId,
-                                		 spaceId.Value());
+                                        spaceId.Value());
                                 }
                             else if ( iRequestedAttrs[i] == KGlxMediaGeneralSlideshowableContent )
                                 {
@@ -894,22 +989,24 @@
                                 }
                             else
                                 {
+                                DeleteImageViewerInstance();
                                 User::Leave(KErrNotSupported);
                                 }
                             }
-                        
+
                         HandleGarbageCollectionL(EFalse);
                         CleanupStack::PopAndDestroy(path);
                         iRequestOwner = list;
                         CleanupStack::PopAndDestroy(attrSpecs); 
                         TGlxIdSpaceId spaceId = list->IdSpaceId(iRequestedItemIndexes[0]);
                         HandleCollectionMediaL(spaceId, *iMPXMedia, KErrNone);
+                        DeleteImageViewerInstance();
                         return;
                         }
                     else
                         {
-                    // Issue the request
-                    collection.MediaL(*path, iRequestedAttrs.Array(), attrSpecs);
+                        // Issue the request
+                        collection.MediaL(*path, iRequestedAttrs.Array(), attrSpecs);
                         }
                     }
 #else // USE_S60_TNM
@@ -1427,10 +1524,13 @@
     }
 #endif
 
+// -----------------------------------------------------------------------------
+// GetMimeTypeL()
+// -----------------------------------------------------------------------------
+//
 void CGlxCacheManager::GetMimeTypeL(TFileName& aFileName, TDataType& aMimeType)
     {
     TRACER("CGlxCacheManager::GetMimeTypeL");
-    
     RApaLsSession session;
     User::LeaveIfError( session.Connect() );
     CleanupClosePushL( session );
@@ -1438,17 +1538,52 @@
     TUid uid;
     User::LeaveIfError( session.AppForDocument( aFileName, uid, aMimeType ) );
     CleanupStack::PopAndDestroy(&session);
+    }
 
-    }
-void CGlxCacheManager::ImageReadyL(const TInt& aError, const TSize aSz)
+// -----------------------------------------------------------------------------
+// ImageSizeReady()
+// -----------------------------------------------------------------------------
+//
+void CGlxCacheManager::ImageSizeReady(TInt aError, const TSize aSz)
     {
-    TRACER("CGlxCacheManager::ImageReadyL");              
-    GLX_DEBUG2("CGlxCacheManager::ImageReadyL aError=%d", aError);             
+    TRACER("CGlxCacheManager::ImageSizeReady");
+    GLX_DEBUG2("CGlxCacheManager::ImageSizeReady aError=%d", aError);
     iImgSz = TSize();
     if(iSchedulerWait)
         {
         iSchedulerWait->AsyncStop();    
         }    
-    User::LeaveIfError( aError );                    
+
     iImgSz = aSz;
+    GLX_DEBUG3("CGlxCacheManager::ImageSizeReady() iImgSz w(%d) h(%d)", 
+            iImgSz.iWidth, iImgSz.iHeight);    
     }
+
+// -----------------------------------------------------------------------------
+// CreateImageViewerInstanceL
+// -----------------------------------------------------------------------------
+//
+void CGlxCacheManager::CreateImageViewerInstanceL()
+    {
+    TRACER("CGlxCacheManager::CreateImageViewerInstanceL");
+    if ( iImageViewerInstance == NULL )
+        {
+        iImageViewerInstance = CGlxImageViewerManager::InstanceL();
+        }
+    __ASSERT_ALWAYS(iImageViewerInstance, Panic(EGlxPanicNullPointer));
+    }
+
+// -----------------------------------------------------------------------------
+// DeleteImageViewerInstance
+// -----------------------------------------------------------------------------
+//
+void CGlxCacheManager::DeleteImageViewerInstance()
+    {
+    TRACER("CGlxCacheManager::DeleteImageViewerInstance");
+    if ( iImageViewerInstance != NULL )
+        {
+        iImageViewerInstance->DeleteInstance();
+        }
+    }
+
+//End of file
--- a/photosgallery/viewframework/medialists/src/glximagereader.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/src/glximagereader.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -98,7 +98,6 @@
     TRACER("CGlxImageReader::ConstructL");
 
     CActiveScheduler::Add(this);
-    iIsLaunchedFromFMngr = EFalse;
 
     iImgViewerMgr = CGlxImageViewerManager::InstanceL();
     if (!iImgViewerMgr)
@@ -106,32 +105,34 @@
         return;
         }
 
+    TInt errInImage = KErrNone;
     if (iImgViewerMgr->IsPrivate())
         {
-        iIsLaunchedFromFMngr = ETrue;
-        }
-
-    TInt errInImage = KErrNone;
-    if (iIsLaunchedFromFMngr)
-        {
-        // TODO type cast handle to RFile
-        TRAP(errInImage,iImageDecoder = CImageDecoder::FileNewL(iImgViewerMgr->ImageFileHandle(), ContentAccess::EPeek));
+        if ( &(iImgViewerMgr->ImageFileHandle()) != NULL )
+            {
+            TRAP(errInImage,iImageDecoder = CImageDecoder::FileNewL(iImgViewerMgr->ImageFileHandle(), ContentAccess::EPeek));
+            }
         }
     else
         {
-        TRAP(errInImage,iImageDecoder = CImageDecoder::FileNewL(CCoeEnv::Static()->FsSession(), iImgViewerMgr->ImageUri()->Des()));
+        if ( iImgViewerMgr->ImageUri() != NULL )
+            {
+            TRAP(errInImage,iImageDecoder = CImageDecoder::FileNewL(CCoeEnv::Static()->FsSession(), iImgViewerMgr->ImageUri()->Des()));
+            }
         }
-
     if (errInImage != KErrNone)
         {
         User::Leave(errInImage);
         }
-    iFrame = new (ELeave) CFbsBitmap();
-    iFrame->Create(iImageDecoder->FrameInfo(0).iOverallSizeInPixels,
-            iImageDecoder->FrameInfo(0).iFrameDisplayMode);
-    iImageDecoder->Convert(&iStatus, *iFrame, 0);
 
-    SetActive();
+    if ( iImageDecoder )
+        {
+        iFrame = new (ELeave) CFbsBitmap();
+        iFrame->Create(iImageDecoder->FrameInfo(0).iOverallSizeInPixels,
+                iImageDecoder->FrameInfo(0).iFrameDisplayMode);
+        iImageDecoder->Convert(&iStatus, *iFrame, 0);
+        SetActive();
+        }
     }
 
 
@@ -160,7 +161,7 @@
         size = iFrame->SizeInPixels();
         }
     GLX_DEBUG2("CGlxImageReader::RunL() reqStatus=%d", reqStatus);   
-    iNotify.ImageReadyL(reqStatus, size);
+    iNotify.ImageSizeReady(reqStatus, size);
     }
 // ---------------------------------------------------------
 // CGlxImageReader::GetDRMRightsL
@@ -173,15 +174,20 @@
     TInt value = KErrNone;
     TInt error = KErrNone;
     CContent* content = NULL;
-    if(iIsLaunchedFromFMngr)
+    if(iImgViewerMgr->IsPrivate())
         {
-        content = CContent::NewLC(iImgViewerMgr->ImageFileHandle());    
+        if ( &(iImgViewerMgr->ImageFileHandle()) != NULL )
+            {
+            content = CContent::NewLC(iImgViewerMgr->ImageFileHandle());
+            }
         }
     else
         {
-        content = CContent::NewLC(iImgViewerMgr->ImageUri()->Des());
+        if ( iImgViewerMgr->ImageUri() != NULL )
+            {
+            content = CContent::NewLC(iImgViewerMgr->ImageUri()->Des());
+            }
         }
-
     __ASSERT_ALWAYS(content, Panic(EGlxPanicNullPointer));
     error = content->GetAttribute(aAttribute, value);
     CleanupStack::PopAndDestroy( content );
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxcacheu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxcacheu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,48 +1,48 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 2 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??1CGlxMedia@@UAE@XZ @ 3 NONAME ; CGlxMedia::~CGlxMedia(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 4 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 5 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 6 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 7 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 8 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 9 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 10 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 11 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 12 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 13 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 14 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 15 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 16 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 17 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 18 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 19 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 20 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 21 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 23 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 24 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 25 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 26 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 27 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 28 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 29 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 30 NONAME ; int TGlxMedia::IsStatic(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 31 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 32 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?Reset@CGlxMedia@@QAEXXZ @ 33 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 34 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 35 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 36 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 37 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 38 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 41 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 42 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 43 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 44 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 45 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 46 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 1 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 2 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 3 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 4 NONAME ; int TGlxMedia::GetSize(int &) const
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 5 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 6 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 7 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 8 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 9 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 10 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 11 NONAME ; void CGlxMedia::Reset(void)
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 12 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 13 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 14 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 15 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 16 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 17 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 18 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 19 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 20 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	??1CGlxMedia@@UAE@XZ @ 21 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 22 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 23 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 24 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 25 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 26 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 27 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 28 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 29 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 30 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 31 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 32 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 33 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 34 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 35 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 36 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 37 NONAME ; int TGlxMedia::IsStatic(void) const
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 38 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 39 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 41 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 42 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 43 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 44 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 45 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 46 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxfetcherrorarrayu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxfetcherrorarrayu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,2 +1,3 @@
 EXPORTS
 	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxgarbagecollectoru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxgarbagecollectoru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,55 +1,55 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CIdle@@IAE@H@Z @ 2 NONAME ; CIdle::CIdle(int)
-	??1CGlxMedia@@UAE@XZ @ 3 NONAME ; CGlxMedia::~CGlxMedia(void)
-	??1CIdle@@UAE@XZ @ 4 NONAME ; CIdle::~CIdle(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 5 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 6 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 7 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 8 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 9 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?DoCancel@CIdle@@MAEXXZ @ 10 NONAME ; void CIdle::DoCancel(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 11 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 12 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 13 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 14 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 15 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 16 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 17 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 18 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 19 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 20 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 21 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 24 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 25 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 26 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 27 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 28 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 29 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 30 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 31 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 32 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 33 NONAME ; int TGlxMedia::IsStatic(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 34 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 35 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?New@CIdle@@SAPAV1@H@Z @ 36 NONAME ; class CIdle * CIdle::New(int)
-	?NewL@CIdle@@SAPAV1@H@Z @ 37 NONAME ; class CIdle * CIdle::NewL(int)
-	?Reset@CGlxMedia@@QAEXXZ @ 38 NONAME ; void CGlxMedia::Reset(void)
-	?RunL@CIdle@@MAEXXZ @ 39 NONAME ; void CIdle::RunL(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 40 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 41 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 42 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?Start@CIdle@@QAEXVTCallBack@@@Z @ 43 NONAME ; void CIdle::Start(class TCallBack)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 44 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 45 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 46 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 47 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 48 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 49 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 50 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 51 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 52 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 53 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 1 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 2 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 3 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 4 NONAME ; int TGlxMedia::GetSize(int &) const
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 5 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	??0CIdle@@IAE@H@Z @ 6 NONAME ; CIdle::CIdle(int)
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 7 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 8 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 9 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?NewL@CIdle@@SAPAV1@H@Z @ 10 NONAME ; class CIdle * CIdle::NewL(int)
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 11 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 12 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 13 NONAME ; void CGlxMedia::Reset(void)
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 14 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 15 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 16 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 17 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 18 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 19 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 20 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	?RunL@CIdle@@MAEXXZ @ 21 NONAME ; void CIdle::RunL(void)
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 22 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 23 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	??1CIdle@@UAE@XZ @ 24 NONAME ; CIdle::~CIdle(void)
+	??1CGlxMedia@@UAE@XZ @ 25 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 26 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	?Start@CIdle@@QAEXVTCallBack@@@Z @ 27 NONAME ; void CIdle::Start(class TCallBack)
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 28 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 29 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 30 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 31 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 32 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?New@CIdle@@SAPAV1@H@Z @ 33 NONAME ; class CIdle * CIdle::New(int)
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 34 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 35 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 36 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 37 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 38 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 39 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 40 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 41 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 42 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 43 NONAME ; int TGlxMedia::IsStatic(void) const
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 44 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 45 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 46 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?DoCancel@CIdle@@MAEXXZ @ 47 NONAME ; void CIdle::DoCancel(void)
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 48 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 49 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 50 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 51 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 52 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 53 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxmediau.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/t_cglxmediau.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,43 +1,43 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 2 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??1CGlxMedia@@UAE@XZ @ 3 NONAME ; CGlxMedia::~CGlxMedia(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 4 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 5 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 6 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 7 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 8 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 9 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 10 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 11 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 12 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 13 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 14 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 15 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 16 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 17 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 18 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 19 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 20 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 21 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 1 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 2 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 3 NONAME ; int TGlxMedia::GetSize(int &) const
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 4 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 5 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 6 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 7 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 8 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 9 NONAME ; void CGlxMedia::Reset(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 10 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 11 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 12 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 13 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 14 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 15 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 16 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	??1CGlxMedia@@UAE@XZ @ 17 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 18 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 19 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 20 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 21 NONAME ; int TGlxMedia::IsDrmProtected(void) const
 	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 23 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 24 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 25 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 26 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 27 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 28 NONAME ; int TGlxMedia::IsStatic(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 29 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 30 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?Reset@CGlxMedia@@QAEXXZ @ 31 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 32 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 33 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 34 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 35 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 36 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 37 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 38 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 39 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 40 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 41 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 24 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 25 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 26 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 27 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 28 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 29 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 30 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 31 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 32 NONAME ; int TGlxMedia::IsStatic(void) const
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 33 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 34 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 35 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 36 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 37 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 38 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 40 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 41 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/t_glxlistwindowu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/t_glxlistwindowu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,21 +1,21 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 2 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
-	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 3 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
-	??1CGlxListWindow@@UAE@XZ @ 4 NONAME ; CGlxListWindow::~CGlxListWindow(void)
-	??ETGlxWindowIterator@@QAEHH@Z @ 5 NONAME ; int TGlxWindowIterator::operator++(int)
-	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 6 NONAME ; void CGlxListWindow::AddObjects(int, int)
-	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 7 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
-	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 8 NONAME ; class CBase * CGlxListWindow::At(int)
-	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 9 NONAME ; class CBase const * CGlxListWindow::At(int) const
+	?ConstructL@CGlxListWindow@@QAEXXZ @ 1 NONAME ; void CGlxListWindow::ConstructL(void)
+	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 2 NONAME ; class CBase const * CGlxListWindow::At(int) const
+	??1CGlxListWindow@@UAE@XZ @ 3 NONAME ; CGlxListWindow::~CGlxListWindow(void)
+	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 4 NONAME ; class CBase * CGlxListWindow::At(int)
+	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 5 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
+	??ETGlxWindowIterator@@QAEHH@Z @ 6 NONAME ; int TGlxWindowIterator::operator++(int)
+	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 7 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 8 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
+	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 9 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
 	?Cleanup@CGlxListWindow@@QAEXXZ @ 10 NONAME ; void CGlxListWindow::Cleanup(void)
-	?ConstructL@CGlxListWindow@@QAEXXZ @ 11 NONAME ; void CGlxListWindow::ConstructL(void)
-	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 12 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
-	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 13 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
-	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 14 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
-	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 15 NONAME ; void CGlxListWindow::SetFocusIndex(int)
+	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 11 NONAME ; void CGlxListWindow::AddObjects(int, int)
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 12 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 13 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 14 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
+	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 15 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
 	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 16 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
 	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 17 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 18 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
-	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 19 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 18 NONAME ; void CGlxListWindow::SetFocusIndex(int)
+	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 19 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/t_tglxexclusioniteratoru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/t_tglxexclusioniteratoru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,50 +1,50 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 2 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
-	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 3 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
-	??0TGlxFirstThenLastIterator@@QAE@XZ @ 4 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
-	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 5 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
-	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 6 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
-	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 7 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
-	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 8 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
-	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 9 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
-	??0TGlxSelectionIterator@@QAE@XZ @ 10 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
-	??0TGlxSequentialIterator@@QAE@XZ @ 11 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
-	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 12 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
-	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 13 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
-	??1CGlxListWindow@@UAE@XZ @ 14 NONAME ; CGlxListWindow::~CGlxListWindow(void)
-	??1TGlxExclusionIterator@@QAE@XZ @ 15 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
-	??1TGlxFirstThenLastIterator@@QAE@XZ @ 16 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
-	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 17 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
-	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 18 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
-	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 19 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
-	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 20 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
-	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 21 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
-	??1TGlxSelectionIterator@@QAE@XZ @ 22 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
-	??ETGlxSelectionIterator@@UAEHH@Z @ 23 NONAME ; int TGlxSelectionIterator::operator++(int)
-	??ETGlxWindowIterator@@QAEHH@Z @ 24 NONAME ; int TGlxWindowIterator::operator++(int)
-	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 25 NONAME ; void CGlxListWindow::AddObjects(int, int)
-	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 26 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
-	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 27 NONAME ; class CBase * CGlxListWindow::At(int)
-	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 28 NONAME ; class CBase const * CGlxListWindow::At(int) const
-	?Cleanup@CGlxListWindow@@QAEXXZ @ 29 NONAME ; void CGlxListWindow::Cleanup(void)
+	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 1 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
+	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 2 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
+	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 3 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
+	??1CGlxListWindow@@UAE@XZ @ 4 NONAME ; CGlxListWindow::~CGlxListWindow(void)
+	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 5 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
+	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 6 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
+	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 7 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
+	??ETGlxWindowIterator@@QAEHH@Z @ 8 NONAME ; int TGlxWindowIterator::operator++(int)
+	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 9 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 10 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
+	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 11 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
+	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 12 NONAME ; void CGlxListWindow::AddObjects(int, int)
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 13 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 14 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
+	??0TGlxSequentialIterator@@QAE@XZ @ 15 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 16 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
+	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 17 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
+	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 18 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
+	??1TGlxSelectionIterator@@QAE@XZ @ 19 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
+	??0TGlxSelectionIterator@@QAE@XZ @ 20 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
+	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 21 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
+	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 22 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
+	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 23 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
+	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 24 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
+	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 25 NONAME ; void CGlxListWindow::SetFocusIndex(int)
+	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 26 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
+	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 27 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
+	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 28 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
+	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 29 NONAME ; class CBase const * CGlxListWindow::At(int) const
 	?ConstructL@CGlxListWindow@@QAEXXZ @ 30 NONAME ; void CGlxListWindow::ConstructL(void)
-	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 31 NONAME ; int TGlxSelectionIterator::InRange(int) const
-	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 32 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
-	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 33 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
-	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 34 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
-	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 35 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
-	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 36 NONAME ; void CGlxListWindow::SetFocusIndex(int)
-	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 37 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
-	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 38 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
+	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 31 NONAME ; void TGlxSequentialIterator::SetRange(int)
+	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 32 NONAME ; class CBase * CGlxListWindow::At(int)
+	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 33 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
+	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 34 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
+	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 35 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
+	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 36 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
+	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 37 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
+	?Cleanup@CGlxListWindow@@QAEXXZ @ 38 NONAME ; void CGlxListWindow::Cleanup(void)
 	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 39 NONAME ; void TGlxSelectionIterator::SetRange(int)
-	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 40 NONAME ; void TGlxSequentialIterator::SetRange(int)
-	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 41 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 42 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 43 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 44 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 45 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
-	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 46 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
-	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 47 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
-	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 48 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	??1TGlxExclusionIterator@@QAE@XZ @ 40 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
+	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 41 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
+	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 42 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 43 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
+	??0TGlxFirstThenLastIterator@@QAE@XZ @ 44 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
+	??1TGlxFirstThenLastIterator@@QAE@XZ @ 45 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
+	??ETGlxSelectionIterator@@UAEHH@Z @ 46 NONAME ; int TGlxSelectionIterator::operator++(int)
+	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 47 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
+	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 48 NONAME ; int TGlxSelectionIterator::InRange(int) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxattributecontextu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxattributecontextu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,125 +1,126 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 2 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *)
-	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 3 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 4 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 5 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *)
-	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 6 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
-	??0TGlxFetchContextRemover@@QAE@PAVMGlxFetchContext@@AAVMGlxMediaList@@@Z @ 7 NONAME ; TGlxFetchContextRemover::TGlxFetchContextRemover(class MGlxFetchContext *, class MGlxMediaList &)
-	??0TGlxFirstThenLastIterator@@QAE@XZ @ 8 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
-	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 9 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
-	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 10 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
-	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 11 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
-	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 12 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
-	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 13 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
-	??0TGlxSelectionIterator@@QAE@XZ @ 14 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
-	??0TGlxSequentialIterator@@QAE@XZ @ 15 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
-	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 16 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
-	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 17 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
-	??1CGlxAttributeContext@@UAE@XZ @ 18 NONAME ; CGlxAttributeContext::~CGlxAttributeContext(void)
-	??1CGlxDefaultAttributeContext@@UAE@XZ @ 19 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void)
-	??1CGlxDefaultThumbnailContext@@UAE@XZ @ 20 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void)
-	??1CGlxListWindow@@UAE@XZ @ 21 NONAME ; CGlxListWindow::~CGlxListWindow(void)
-	??1CGlxMedia@@UAE@XZ @ 22 NONAME ; CGlxMedia::~CGlxMedia(void)
-	??1CGlxThumbnailContext@@UAE@XZ @ 23 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void)
-	??1TGlxExclusionIterator@@QAE@XZ @ 24 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
-	??1TGlxFetchContextRemover@@QAE@XZ @ 25 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void)
-	??1TGlxFirstThenLastIterator@@QAE@XZ @ 26 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
-	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 27 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
-	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 28 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
-	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 29 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
-	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 30 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
-	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 31 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
-	??1TGlxSelectionIterator@@QAE@XZ @ 32 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
-	??ETGlxSelectionIterator@@UAEHH@Z @ 33 NONAME ; int TGlxSelectionIterator::operator++(int)
-	??ETGlxWindowIterator@@QAEHH@Z @ 34 NONAME ; int TGlxWindowIterator::operator++(int)
-	?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 35 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &)
-	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 36 NONAME ; void CGlxListWindow::AddObjects(int, int)
-	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 37 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
-	?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 38 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int)
-	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 39 NONAME ; class CBase * CGlxListWindow::At(int)
-	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 40 NONAME ; class CBase const * CGlxListWindow::At(int) const
-	?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 41 NONAME ; int CGlxAttributeContext::AttributeCount(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 42 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?CheckOpenRightsL@CGlxDRMUtility@@QAEHABVTDesC16@@H@Z @ 43 NONAME ; int CGlxDRMUtility::CheckOpenRightsL(class TDesC16 const &, int)
-	?Cleanup@CGlxListWindow@@QAEXXZ @ 44 NONAME ; void CGlxListWindow::Cleanup(void)
-	?Close@CGlxDRMUtility@@QAEXXZ @ 45 NONAME ; void CGlxDRMUtility::Close(void)
-	?Close@TGlxFetchContextRemover@@QAEXXZ @ 46 NONAME ; void TGlxFetchContextRemover::Close(void)
-	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 47 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 48 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?ConstructL@CGlxListWindow@@QAEXXZ @ 49 NONAME ; void CGlxListWindow::ConstructL(void)
-	?DRMThumbnailSize@CGlxDRMUtility@@QAE?AVTSize@@AAV2@@Z @ 50 NONAME ; class TSize CGlxDRMUtility::DRMThumbnailSize(class TSize &)
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 51 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 52 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 53 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 54 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 55 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 56 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 57 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 58 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 59 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 60 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 61 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 62 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 63 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 64 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 65 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 66 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 67 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 68 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 69 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 70 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 71 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 72 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 73 NONAME ; int TGlxSelectionIterator::InRange(int) const
-	?InstanceL@CGlxDRMUtility@@SAPAV1@XZ @ 74 NONAME ; class CGlxDRMUtility * CGlxDRMUtility::InstanceL(void)
-	?InstanceL@MGlxCache@@SAPAV1@XZ @ 75 NONAME ; class MGlxCache * MGlxCache::InstanceL(void)
-	?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 76 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId<class TGlxIdHierarchyBase> const &, class CMPXMedia *)
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 77 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 78 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 79 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 80 NONAME ; int TGlxMedia::IsStatic(void) const
-	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 81 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 82 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 83 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 84 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void)
-	?NewL@CGlxDefaultThumbnailContext@@SAPAV1@XZ @ 85 NONAME ; class CGlxDefaultThumbnailContext * CGlxDefaultThumbnailContext::NewL(void)
-	?NewL@CGlxThumbnailContext@@SAPAV1@PAVMGlxMediaListIterator@@@Z @ 86 NONAME ; class CGlxThumbnailContext * CGlxThumbnailContext::NewL(class MGlxMediaListIterator *)
-	?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 87 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &)
-	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 88 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
-	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 89 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
-	?Reset@CGlxMedia@@QAEXXZ @ 90 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 91 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 92 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int)
-	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 93 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
-	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 94 NONAME ; void CGlxListWindow::SetFocusIndex(int)
-	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 95 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
-	?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 96 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int)
-	?SetHighQualityOnly@CGlxThumbnailContext@@QAEXH@Z @ 97 NONAME ; void CGlxThumbnailContext::SetHighQualityOnly(int)
-	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 98 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
-	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 99 NONAME ; void TGlxSelectionIterator::SetRange(int)
-	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 100 NONAME ; void TGlxSequentialIterator::SetRange(int)
-	?SetRangeOffsets@CGlxDefaultAttributeContext@@QAEXHH@Z @ 101 NONAME ; void CGlxDefaultAttributeContext::SetRangeOffsets(int, int)
-	?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 102 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 103 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 104 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 105 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 106 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 107 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 108 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 109 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
-	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 110 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 111 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 112 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 113 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 114 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 115 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &)
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 116 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 117 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 118 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 119 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 120 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 121 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 122 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 123 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 1 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
+	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 2 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
+	?InstanceL@CGlxDRMUtility@@SAPAV1@XZ @ 3 NONAME ; class CGlxDRMUtility * CGlxDRMUtility::InstanceL(void)
+	?SetHighQualityOnly@CGlxThumbnailContext@@QAEXH@Z @ 4 NONAME ; void CGlxThumbnailContext::SetHighQualityOnly(int)
+	??0TGlxFetchContextRemover@@QAE@PAVMGlxFetchContext@@AAVMGlxMediaList@@@Z @ 5 NONAME ; TGlxFetchContextRemover::TGlxFetchContextRemover(class MGlxFetchContext *, class MGlxMediaList &)
+	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 6 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
+	?NewL@CGlxThumbnailContext@@SAPAV1@PAVMGlxMediaListIterator@@@Z @ 7 NONAME ; class CGlxThumbnailContext * CGlxThumbnailContext::NewL(class MGlxMediaListIterator *)
+	??1CGlxListWindow@@UAE@XZ @ 8 NONAME ; CGlxListWindow::~CGlxListWindow(void)
+	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 9 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
+	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 10 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
+	?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 11 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void)
+	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 12 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 13 NONAME ; int TGlxMedia::GetSize(int &) const
+	??ETGlxWindowIterator@@QAEHH@Z @ 14 NONAME ; int TGlxWindowIterator::operator++(int)
+	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 15 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	?InstanceL@MGlxCache@@SAPAV1@XZ @ 16 NONAME ; class MGlxCache * MGlxCache::InstanceL(void)
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 17 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 18 NONAME ; void CGlxMedia::Reset(void)
+	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 19 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
+	??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 20 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 21 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
+	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 22 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
+	?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 23 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 24 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	??1TGlxSelectionIterator@@QAE@XZ @ 25 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
+	?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 26 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int)
+	??0TGlxSelectionIterator@@QAE@XZ @ 27 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
+	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 28 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 29 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 30 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 31 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 32 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
+	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 33 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
+	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 34 NONAME ; void CGlxListWindow::SetFocusIndex(int)
+	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 35 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
+	??1CGlxDefaultThumbnailContext@@UAE@XZ @ 36 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void)
+	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 37 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
+	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 38 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
+	?ConstructL@CGlxListWindow@@QAEXXZ @ 39 NONAME ; void CGlxListWindow::ConstructL(void)
+	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 40 NONAME ; void TGlxSequentialIterator::SetRange(int)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 41 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 42 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
+	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 43 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 44 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 45 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 46 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 47 NONAME ; void TGlxSelectionIterator::SetRange(int)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 48 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 49 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 50 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 51 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?SetDefaultSpec@CGlxAttributeContext@@QAEXHH@Z @ 52 NONAME ; void CGlxAttributeContext::SetDefaultSpec(int, int)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 53 NONAME ; int TGlxMedia::IsStatic(void) const
+	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 54 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
+	?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 55 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int)
+	??1CGlxDefaultAttributeContext@@UAE@XZ @ 56 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void)
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 57 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	??1TGlxFirstThenLastIterator@@QAE@XZ @ 58 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 59 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	??ETGlxSelectionIterator@@UAEHH@Z @ 60 NONAME ; int TGlxSelectionIterator::operator++(int)
+	?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 61 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &)
+	?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 62 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int)
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 63 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 64 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DRMThumbnailSize@CGlxDRMUtility@@QAE?AVTSize@@AAV2@@Z @ 65 NONAME ; class TSize CGlxDRMUtility::DRMThumbnailSize(class TSize &)
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 66 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 67 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId<class TGlxIdHierarchyBase> const &, class CMPXMedia *)
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 68 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 69 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
+	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 70 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 71 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 72 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *)
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 73 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 74 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 75 NONAME ; void CGlxListWindow::AddObjects(int, int)
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 76 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 77 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
+	??0TGlxSequentialIterator@@QAE@XZ @ 78 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
+	?Close@CGlxDRMUtility@@QAEXXZ @ 79 NONAME ; void CGlxDRMUtility::Close(void)
+	?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 80 NONAME ; int CGlxAttributeContext::AttributeCount(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 81 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 82 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
+	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 83 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 84 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 85 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 86 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 87 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 88 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	??1CGlxMedia@@UAE@XZ @ 89 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 90 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 91 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	??1CGlxThumbnailContext@@UAE@XZ @ 92 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void)
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 93 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 94 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 95 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
+	?Close@TGlxFetchContextRemover@@QAEXXZ @ 96 NONAME ; void TGlxFetchContextRemover::Close(void)
+	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 97 NONAME ; class CBase const * CGlxListWindow::At(int) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 98 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
+	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 99 NONAME ; class CBase * CGlxListWindow::At(int)
+	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 100 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
+	?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 101 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &)
+	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 102 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
+	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 103 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
+	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 104 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
+	?Cleanup@CGlxListWindow@@QAEXXZ @ 105 NONAME ; void CGlxListWindow::Cleanup(void)
+	??1TGlxExclusionIterator@@QAE@XZ @ 106 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
+	??1TGlxFetchContextRemover@@QAE@XZ @ 107 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void)
+	?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 108 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int)
+	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 109 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 110 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 111 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 112 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 113 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 114 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	??0TGlxFirstThenLastIterator@@QAE@XZ @ 115 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
+	??1CGlxAttributeContext@@UAE@XZ @ 116 NONAME ; CGlxAttributeContext::~CGlxAttributeContext(void)
+	?SetRangeOffsets@CGlxDefaultAttributeContext@@QAEXHH@Z @ 117 NONAME ; void CGlxDefaultAttributeContext::SetRangeOffsets(int, int)
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 118 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?CheckOpenRightsL@CGlxDRMUtility@@QAEHABVTDesC16@@H@Z @ 119 NONAME ; int CGlxDRMUtility::CheckOpenRightsL(class TDesC16 const &, int)
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 120 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?NewL@CGlxDefaultThumbnailContext@@SAPAV1@XZ @ 121 NONAME ; class CGlxDefaultThumbnailContext * CGlxDefaultThumbnailContext::NewL(void)
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 122 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
+	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 123 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
+	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 124 NONAME ; int TGlxSelectionIterator::InRange(int) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxitemlistu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxitemlistu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,46 +1,46 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 2 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??1CGlxMedia@@UAE@XZ @ 3 NONAME ; CGlxMedia::~CGlxMedia(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 4 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 5 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 6 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 7 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 8 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 9 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 10 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 11 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 12 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 13 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 14 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 15 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 16 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 17 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 18 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 19 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 20 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 21 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 1 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 2 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 3 NONAME ; int TGlxMedia::GetSize(int &) const
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 4 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 5 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 6 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 7 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 8 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 9 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 10 NONAME ; void CGlxMedia::Reset(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 11 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 12 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 13 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 14 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 15 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 16 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 17 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	??1CGlxMedia@@UAE@XZ @ 18 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 19 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 20 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 21 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 22 NONAME ; int TGlxMedia::IsDrmProtected(void) const
 	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 24 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 25 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 26 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 27 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 28 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 29 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 30 NONAME ; int TGlxMedia::IsStatic(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 31 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 32 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?Reset@CGlxMedia@@QAEXXZ @ 33 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 34 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 35 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 36 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 37 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 38 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 24 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 25 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 26 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 27 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 28 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 29 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 30 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 31 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 32 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 33 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 34 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 35 NONAME ; int TGlxMedia::IsStatic(void) const
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 36 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 37 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 38 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 40 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
 	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 41 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 42 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 43 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 44 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 42 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 43 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 44 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxnavigablelistu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxnavigablelistu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,48 +1,48 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 2 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??1CGlxMedia@@UAE@XZ @ 3 NONAME ; CGlxMedia::~CGlxMedia(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 4 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 5 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 6 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 7 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 8 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 9 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 10 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 11 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 12 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 13 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 14 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 15 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 16 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 17 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 18 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 19 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 20 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 21 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 24 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 25 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 26 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 27 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 28 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 29 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 30 NONAME ; int TGlxMedia::IsStatic(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 31 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 32 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?Reset@CGlxMedia@@QAEXXZ @ 33 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 34 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 35 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 36 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 37 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 38 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 41 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 42 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 43 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 44 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 45 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 46 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 1 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 2 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 3 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 4 NONAME ; int TGlxMedia::GetSize(int &) const
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 5 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 6 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 7 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 8 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 9 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 10 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 11 NONAME ; void CGlxMedia::Reset(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 12 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 13 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 14 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 15 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 16 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 17 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 18 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 19 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	??1CGlxMedia@@UAE@XZ @ 20 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 21 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 22 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 24 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 25 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 26 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 27 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 28 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 29 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 30 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 31 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 32 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 33 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 34 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 35 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 36 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 37 NONAME ; int TGlxMedia::IsStatic(void) const
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 38 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 39 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 41 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 42 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 43 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 44 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 45 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 46 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxstaticitemlistu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/ut_cglxstaticitemlistu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,47 +1,47 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 2 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??1CGlxMedia@@UAE@XZ @ 3 NONAME ; CGlxMedia::~CGlxMedia(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 4 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 5 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 6 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 7 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 8 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 9 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 10 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 11 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 12 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 13 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 14 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 15 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 16 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 17 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 18 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 19 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 20 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 21 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 23 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 24 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 25 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 26 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 27 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 28 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 29 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 30 NONAME ; int TGlxMedia::IsStatic(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 31 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 32 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?Reset@CGlxMedia@@QAEXXZ @ 33 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 34 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 1 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 2 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 3 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 4 NONAME ; int TGlxMedia::GetSize(int &) const
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 5 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 6 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 7 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 8 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 9 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 10 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 11 NONAME ; void CGlxMedia::Reset(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 12 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 13 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 14 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 15 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 16 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 17 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 18 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	??1CGlxMedia@@UAE@XZ @ 19 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 20 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 21 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 22 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 23 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 24 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 25 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 26 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 27 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 28 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 29 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 30 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 31 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 32 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 33 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 34 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
 	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 35 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 36 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 37 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 38 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?IsStatic@TGlxMedia@@QBEHXZ @ 36 NONAME ; int TGlxMedia::IsStatic(void) const
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 37 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 38 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 39 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
 	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 41 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 42 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 43 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 44 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 45 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 41 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 42 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 43 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 44 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 45 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
 
--- a/photosgallery/viewframework/medialists/tsrc/BWINS/ut_glxerrormanageru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/BWINS/ut_glxerrormanageru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,125 +1,126 @@
 EXPORTS
-	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
-	??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 2 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *)
-	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 3 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
-	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 4 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
-	??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 5 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *)
-	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 6 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
-	??0TGlxFetchContextRemover@@QAE@PAVMGlxFetchContext@@AAVMGlxMediaList@@@Z @ 7 NONAME ; TGlxFetchContextRemover::TGlxFetchContextRemover(class MGlxFetchContext *, class MGlxMediaList &)
-	??0TGlxFirstThenLastIterator@@QAE@XZ @ 8 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
-	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 9 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
-	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 10 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
-	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 11 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
-	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 12 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
-	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 13 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
-	??0TGlxSelectionIterator@@QAE@XZ @ 14 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
-	??0TGlxSequentialIterator@@QAE@XZ @ 15 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
-	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 16 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
-	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 17 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
-	??1CGlxAttributeContext@@UAE@XZ @ 18 NONAME ; CGlxAttributeContext::~CGlxAttributeContext(void)
-	??1CGlxDefaultAttributeContext@@UAE@XZ @ 19 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void)
-	??1CGlxDefaultThumbnailContext@@UAE@XZ @ 20 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void)
-	??1CGlxListWindow@@UAE@XZ @ 21 NONAME ; CGlxListWindow::~CGlxListWindow(void)
-	??1CGlxMedia@@UAE@XZ @ 22 NONAME ; CGlxMedia::~CGlxMedia(void)
-	??1CGlxThumbnailContext@@UAE@XZ @ 23 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void)
-	??1TGlxExclusionIterator@@QAE@XZ @ 24 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
-	??1TGlxFetchContextRemover@@QAE@XZ @ 25 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void)
-	??1TGlxFirstThenLastIterator@@QAE@XZ @ 26 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
-	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 27 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
-	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 28 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
-	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 29 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
-	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 30 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
-	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 31 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
-	??1TGlxSelectionIterator@@QAE@XZ @ 32 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
-	??ETGlxSelectionIterator@@UAEHH@Z @ 33 NONAME ; int TGlxSelectionIterator::operator++(int)
-	??ETGlxWindowIterator@@QAEHH@Z @ 34 NONAME ; int TGlxWindowIterator::operator++(int)
-	?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 35 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &)
-	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 36 NONAME ; void CGlxListWindow::AddObjects(int, int)
-	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 37 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
-	?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 38 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int)
-	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 39 NONAME ; class CBase * CGlxListWindow::At(int)
-	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 40 NONAME ; class CBase const * CGlxListWindow::At(int) const
-	?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 41 NONAME ; int CGlxAttributeContext::AttributeCount(void)
-	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 42 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
-	?CheckOpenRightsL@CGlxDRMUtility@@QAEHABVTDesC16@@H@Z @ 43 NONAME ; int CGlxDRMUtility::CheckOpenRightsL(class TDesC16 const &, int)
-	?Cleanup@CGlxListWindow@@QAEXXZ @ 44 NONAME ; void CGlxListWindow::Cleanup(void)
-	?Close@CGlxDRMUtility@@QAEXXZ @ 45 NONAME ; void CGlxDRMUtility::Close(void)
-	?Close@TGlxFetchContextRemover@@QAEXXZ @ 46 NONAME ; void TGlxFetchContextRemover::Close(void)
-	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 47 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
-	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 48 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
-	?ConstructL@CGlxListWindow@@QAEXXZ @ 49 NONAME ; void CGlxListWindow::ConstructL(void)
-	?DRMThumbnailSize@CGlxDRMUtility@@QAE?AVTSize@@AAV2@@Z @ 50 NONAME ; class TSize CGlxDRMUtility::DRMThumbnailSize(class TSize &)
-	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 51 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
-	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 52 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
-	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 53 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
-	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 54 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
-	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 55 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
-	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 56 NONAME ; int TGlxMedia::GetDate(class TTime &) const
-	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 57 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
-	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 58 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
-	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 59 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
-	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 60 NONAME ; int TGlxMedia::GetDuration(float &) const
-	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 61 NONAME ; int TGlxMedia::GetFrameCount(int &) const
-	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 62 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
-	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 63 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
-	?GetSize@TGlxMedia@@QBEHAAH@Z @ 64 NONAME ; int TGlxMedia::GetSize(int &) const
-	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 65 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
-	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 66 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
-	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 67 NONAME ; int TGlxMedia::GetSystemItem(int &) const
-	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 68 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
-	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 69 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 70 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
-	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 71 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
-	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 72 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
-	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 73 NONAME ; int TGlxSelectionIterator::InRange(int) const
-	?InstanceL@CGlxDRMUtility@@SAPAV1@XZ @ 74 NONAME ; class CGlxDRMUtility * CGlxDRMUtility::InstanceL(void)
-	?InstanceL@MGlxCache@@SAPAV1@XZ @ 75 NONAME ; class MGlxCache * MGlxCache::InstanceL(void)
-	?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 76 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId<class TGlxIdHierarchyBase> const &, class CMPXMedia *)
-	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 77 NONAME ; int TGlxMedia::IsDrmProtected(void) const
-	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 78 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
-	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 79 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
-	?IsStatic@TGlxMedia@@QBEHXZ @ 80 NONAME ; int TGlxMedia::IsStatic(void) const
-	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 81 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
-	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 82 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
-	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 83 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
-	?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 84 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void)
-	?NewL@CGlxDefaultThumbnailContext@@SAPAV1@XZ @ 85 NONAME ; class CGlxDefaultThumbnailContext * CGlxDefaultThumbnailContext::NewL(void)
-	?NewL@CGlxThumbnailContext@@SAPAV1@PAVMGlxMediaListIterator@@@Z @ 86 NONAME ; class CGlxThumbnailContext * CGlxThumbnailContext::NewL(class MGlxMediaListIterator *)
-	?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 87 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &)
-	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 88 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
-	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 89 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
-	?Reset@CGlxMedia@@QAEXXZ @ 90 NONAME ; void CGlxMedia::Reset(void)
-	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 91 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
-	?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 92 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int)
-	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 93 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
-	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 94 NONAME ; void CGlxListWindow::SetFocusIndex(int)
-	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 95 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
-	?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 96 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int)
-	?SetHighQualityOnly@CGlxThumbnailContext@@QAEXH@Z @ 97 NONAME ; void CGlxThumbnailContext::SetHighQualityOnly(int)
-	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 98 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
-	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 99 NONAME ; void TGlxSelectionIterator::SetRange(int)
-	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 100 NONAME ; void TGlxSequentialIterator::SetRange(int)
-	?SetRangeOffsets@CGlxDefaultAttributeContext@@QAEXHH@Z @ 101 NONAME ; void CGlxDefaultAttributeContext::SetRangeOffsets(int, int)
-	?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 102 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 103 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 104 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 105 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 106 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
-	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 107 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
-	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 108 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
-	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 109 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
-	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 110 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
-	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 111 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
-	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 112 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
-	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 113 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
-	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 114 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
-	?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 115 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &)
-	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 116 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
-	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 117 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
-	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 118 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
-	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 119 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 120 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 121 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 122 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
-	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 123 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?SetToFirst@TGlxSelectionIterator@@UAEXPBVMGlxMediaList@@@Z @ 1 NONAME ; void TGlxSelectionIterator::SetToFirst(class MGlxMediaList const *)
+	??0TGlxExclusionIterator@@QAE@AAVMGlxMediaListIterator@@0@Z @ 2 NONAME ; TGlxExclusionIterator::TGlxExclusionIterator(class MGlxMediaListIterator &, class MGlxMediaListIterator &)
+	?InstanceL@CGlxDRMUtility@@SAPAV1@XZ @ 3 NONAME ; class CGlxDRMUtility * CGlxDRMUtility::InstanceL(void)
+	?SetHighQualityOnly@CGlxThumbnailContext@@QAEXH@Z @ 4 NONAME ; void CGlxThumbnailContext::SetHighQualityOnly(int)
+	??0TGlxFetchContextRemover@@QAE@PAVMGlxFetchContext@@AAVMGlxMediaList@@@Z @ 5 NONAME ; TGlxFetchContextRemover::TGlxFetchContextRemover(class MGlxFetchContext *, class MGlxMediaList &)
+	?SetToFirst@TGlxExclusionIterator@@UAEXPBVMGlxMediaList@@@Z @ 6 NONAME ; void TGlxExclusionIterator::SetToFirst(class MGlxMediaList const *)
+	?NewL@CGlxThumbnailContext@@SAPAV1@PAVMGlxMediaListIterator@@@Z @ 7 NONAME ; class CGlxThumbnailContext * CGlxThumbnailContext::NewL(class MGlxMediaListIterator *)
+	??1CGlxListWindow@@UAE@XZ @ 8 NONAME ; CGlxListWindow::~CGlxListWindow(void)
+	?SetDisabledIfMoreThanRangeSelected@TGlxSelectionIterator@@QAEXH@Z @ 9 NONAME ; void TGlxSelectionIterator::SetDisabledIfMoreThanRangeSelected(int)
+	??0TGlxWindowIterator@@QAE@ABV0@@Z @ 10 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &)
+	?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 11 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void)
+	?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 12 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int)
+	?GetSize@TGlxMedia@@QBEHAAH@Z @ 13 NONAME ; int TGlxMedia::GetSize(int &) const
+	??ETGlxWindowIterator@@QAEHH@Z @ 14 NONAME ; int TGlxWindowIterator::operator++(int)
+	?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 15 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const
+	?InstanceL@MGlxCache@@SAPAV1@XZ @ 16 NONAME ; class MGlxCache * MGlxCache::InstanceL(void)
+	?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 17 NONAME ; class MEUnitTest * CreateTestSuiteL(void)
+	?Reset@CGlxMedia@@QAEXXZ @ 18 NONAME ; void CGlxMedia::Reset(void)
+	?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 19 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int)
+	??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 20 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 21 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int)
+	??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 22 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void)
+	?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 23 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &)
+	?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 24 NONAME ; class TGlxId<class TGlxIdSpaceIdBase> TGlxMedia::IdSpaceId(void) const
+	??1TGlxSelectionIterator@@QAE@XZ @ 25 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void)
+	?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 26 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int)
+	??0TGlxSelectionIterator@@QAE@XZ @ 27 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void)
+	??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 28 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void)
+	?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 29 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const
+	??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 30 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void)
+	?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 31 NONAME ; int TGlxMedia::GetFrameCount(int &) const
+	??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 32 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void)
+	?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 33 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int)
+	?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 34 NONAME ; void CGlxListWindow::SetFocusIndex(int)
+	??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 35 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void)
+	??1CGlxDefaultThumbnailContext@@UAE@XZ @ 36 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void)
+	?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 37 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &)
+	??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 38 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &)
+	?ConstructL@CGlxListWindow@@QAEXXZ @ 39 NONAME ; void CGlxListWindow::ConstructL(void)
+	?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 40 NONAME ; void TGlxSequentialIterator::SetRange(int)
+	?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 41 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const
+	?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 42 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int)
+	?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 43 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int)
+	?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 44 NONAME ; void CGlxMedia::HandleModified(class RArray<class TMPXAttribute> const &)
+	?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 45 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const
+	?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 46 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const
+	?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 47 NONAME ; void TGlxSelectionIterator::SetRange(int)
+	?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 48 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const
+	?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 49 NONAME ; int TGlxMedia::GetDate(class TTime &) const
+	?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 50 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const
+	?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 51 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &)
+	?SetDefaultSpec@CGlxAttributeContext@@QAEXHH@Z @ 52 NONAME ; void CGlxAttributeContext::SetDefaultSpec(int, int)
+	?IsStatic@TGlxMedia@@QBEHXZ @ 53 NONAME ; int TGlxMedia::IsStatic(void) const
+	??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 54 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &)
+	?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 55 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int)
+	??1CGlxDefaultAttributeContext@@UAE@XZ @ 56 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void)
+	?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 57 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const
+	??1TGlxFirstThenLastIterator@@QAE@XZ @ 58 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void)
+	?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 59 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const
+	??ETGlxSelectionIterator@@UAEHH@Z @ 60 NONAME ; int TGlxSelectionIterator::operator++(int)
+	?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 61 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &)
+	?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 62 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int)
+	?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 63 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const
+	?GetDuration@TGlxMedia@@QBEHAAM@Z @ 64 NONAME ; int TGlxMedia::GetDuration(float &) const
+	?DRMThumbnailSize@CGlxDRMUtility@@QAE?AVTSize@@AAV2@@Z @ 65 NONAME ; class TSize CGlxDRMUtility::DRMThumbnailSize(class TSize &)
+	?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 66 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &)
+	?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 67 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId<class TGlxIdHierarchyBase> const &, class CMPXMedia *)
+	?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 68 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *)
+	?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 69 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int)
+	?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 70 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const
+	?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 71 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const
+	??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 72 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *)
+	?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 73 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const
+	?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 74 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const
+	?AddObjects@CGlxListWindow@@QAEXHH@Z @ 75 NONAME ; void CGlxListWindow::AddObjects(int, int)
+	?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 76 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 77 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &)
+	??0TGlxSequentialIterator@@QAE@XZ @ 78 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void)
+	?Close@CGlxDRMUtility@@QAEXXZ @ 79 NONAME ; void CGlxDRMUtility::Close(void)
+	?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 80 NONAME ; int CGlxAttributeContext::AttributeCount(void)
+	?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 81 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const
+	?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 82 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const
+	?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 83 NONAME ; void CGlxListWindow::SetFocusIndex(int, int)
+	?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 84 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType)
+	?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 85 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const
+	??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 86 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &)
+	?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 87 NONAME ; void TGlxMedia::DeleteLocationAttribute(void)
+	?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 88 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const
+	??1CGlxMedia@@UAE@XZ @ 89 NONAME ; CGlxMedia::~CGlxMedia(void)
+	?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 90 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const
+	?IsDrmProtected@TGlxMedia@@QBEHXZ @ 91 NONAME ; int TGlxMedia::IsDrmProtected(void) const
+	??1CGlxThumbnailContext@@UAE@XZ @ 92 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void)
+	?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 93 NONAME ; int TGlxMedia::GetDrmProtected(int &) const
+	?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 94 NONAME ; int TGlxMedia::GetSystemItem(int &) const
+	?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 95 NONAME ; void CGlxListWindow::RemoveObjects(int, int)
+	?Close@TGlxFetchContextRemover@@QAEXXZ @ 96 NONAME ; void TGlxFetchContextRemover::Close(void)
+	?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 97 NONAME ; class CBase const * CGlxListWindow::At(int) const
+	?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 98 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int)
+	?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 99 NONAME ; class CBase * CGlxListWindow::At(int)
+	??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 100 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void)
+	?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 101 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &)
+	??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 102 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void)
+	?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 103 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int)
+	??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 104 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void)
+	?Cleanup@CGlxListWindow@@QAEXXZ @ 105 NONAME ; void CGlxListWindow::Cleanup(void)
+	??1TGlxExclusionIterator@@QAE@XZ @ 106 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void)
+	??1TGlxFetchContextRemover@@QAE@XZ @ 107 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void)
+	?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 108 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int)
+	??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 109 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId<class TGlxIdSpaceIdBase> const &, class TGlxMediaId)
+	?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 110 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const
+	?MatchById@TGlxMedia@@SAHABV1@0@Z @ 111 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &)
+	?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 112 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int)
+	?MimeType@TGlxMedia@@QBEABVTDesC16@@XZ @ 113 NONAME ; class TDesC16 const & TGlxMedia::MimeType(void) const
+	?Uri@TGlxMedia@@QBEABVTDesC16@@XZ @ 114 NONAME ; class TDesC16 const & TGlxMedia::Uri(void) const
+	??0TGlxFirstThenLastIterator@@QAE@XZ @ 115 NONAME ; TGlxFirstThenLastIterator::TGlxFirstThenLastIterator(void)
+	??1CGlxAttributeContext@@UAE@XZ @ 116 NONAME ; CGlxAttributeContext::~CGlxAttributeContext(void)
+	?SetRangeOffsets@CGlxDefaultAttributeContext@@QAEXHH@Z @ 117 NONAME ; void CGlxDefaultAttributeContext::SetRangeOffsets(int, int)
+	?ValueCObject@CGlxMedia@@QBEPBVCBase@@ABVTMPXAttribute@@@Z @ 118 NONAME ; class CBase const * CGlxMedia::ValueCObject(class TMPXAttribute const &) const
+	?CheckOpenRightsL@CGlxDRMUtility@@QAEHABVTDesC16@@H@Z @ 119 NONAME ; int CGlxDRMUtility::CheckOpenRightsL(class TDesC16 const &, int)
+	?GetCoordinate@TGlxMedia@@QBEHAAVTCoordinate@@@Z @ 120 NONAME ; int TGlxMedia::GetCoordinate(class TCoordinate &) const
+	?NewL@CGlxDefaultThumbnailContext@@SAPAV1@XZ @ 121 NONAME ; class CGlxDefaultThumbnailContext * CGlxDefaultThumbnailContext::NewL(void)
+	?IsSlideShowPlayableContent@TGlxMedia@@QBEHXZ @ 122 NONAME ; int TGlxMedia::IsSlideShowPlayableContent(void) const
+	??1TGlxFromFocusOutwardIterator@@QAE@XZ @ 123 NONAME ; TGlxFromFocusOutwardIterator::~TGlxFromFocusOutwardIterator(void)
+	?InRange@TGlxSelectionIterator@@UBEHH@Z @ 124 NONAME ; int TGlxSelectionIterator::InRange(int) const
 
--- a/photosgallery/viewframework/medialists/tsrc/eabi/t_cglxcacheu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/eabi/t_cglxcacheu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -2,62 +2,58 @@
 	_Z16CreateTestSuiteLv @ 1 NONAME
 	_ZN15GlxErrorManager18HasAttributeErrorLEPK9CGlxMediaRK13TMPXAttribute @ 2 NONAME
 	_ZN15GlxErrorManager18HasAttributeErrorLEPK9CGlxMediai @ 3 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 4 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 5 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 6 NONAME
-	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 7 NONAME
-	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 8 NONAME
-	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 9 NONAME
-	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 10 NONAME
-	_ZN9CGlxMedia5ResetEv @ 11 NONAME
-	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 12 NONAME
-	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 13 NONAME
-	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 14 NONAME
-	_ZN9CGlxMediaD0Ev @ 15 NONAME
-	_ZN9CGlxMediaD1Ev @ 16 NONAME
-	_ZN9CGlxMediaD2Ev @ 17 NONAME
-	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 18 NONAME
-	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 19 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 20 NONAME
-	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 21 NONAME
-	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 22 NONAME
-	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 23 NONAME
-	_ZNK9TGlxMedia11GetDurationERf @ 24 NONAME
-	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 25 NONAME
-	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 26 NONAME
-	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 27 NONAME
-	_ZNK9TGlxMedia13GetFrameCountERi @ 28 NONAME
-	_ZNK9TGlxMedia13GetSystemItemERi @ 29 NONAME
-	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 30 NONAME
-	_ZNK9TGlxMedia14IsDrmProtectedEv @ 31 NONAME
-	_ZNK9TGlxMedia15GetDrmProtectedERi @ 32 NONAME
-	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 33 NONAME
-	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 34 NONAME
-	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 35 NONAME
-	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 36 NONAME
-	_ZNK9TGlxMedia21GetContainedItemCountERi @ 37 NONAME
-	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 38 NONAME
-	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 39 NONAME
-	_ZNK9TGlxMedia3UriEv @ 40 NONAME
-	_ZNK9TGlxMedia5TitleEv @ 41 NONAME
-	_ZNK9TGlxMedia7CommentEv @ 42 NONAME
-	_ZNK9TGlxMedia7GetDateER5TTime @ 43 NONAME
-	_ZNK9TGlxMedia7GetSizeERi @ 44 NONAME
-	_ZNK9TGlxMedia8CategoryEv @ 45 NONAME
-	_ZNK9TGlxMedia8IsStaticEv @ 46 NONAME
-	_ZNK9TGlxMedia8MimeTypeEv @ 47 NONAME
-	_ZNK9TGlxMedia8SubTitleEv @ 48 NONAME
-	_ZNK9TGlxMedia9IdSpaceIdEv @ 49 NONAME
-	_ZTI13CGlxMediaList @ 50 NONAME
-	_ZTI15CGlxImageReader @ 51 NONAME
-	_ZTI16CGlxCacheManager @ 52 NONAME
-	_ZTI20CGlxGarbageCollector @ 53 NONAME
-	_ZTIN11T_CGlxCache17CGlxMediaUserTestE @ 54 NONAME
-	_ZTIN11T_CGlxCache21CGlxCacheObserverTestE @ 55 NONAME
-	_ZTV13CGlxMediaList @ 56 NONAME
-	_ZTV15CGlxImageReader @ 57 NONAME
-	_ZTV16CGlxCacheManager @ 58 NONAME
-	_ZTV20CGlxGarbageCollector @ 59 NONAME
-	_ZTVN11T_CGlxCache17CGlxMediaUserTestE @ 60 NONAME
-	_ZTVN11T_CGlxCache21CGlxCacheObserverTestE @ 61 NONAME
+	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 4 NONAME
+	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 5 NONAME
+	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 6 NONAME
+	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 7 NONAME
+	_ZN9CGlxMedia5ResetEv @ 8 NONAME
+	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 9 NONAME
+	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 10 NONAME
+	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 11 NONAME
+	_ZN9CGlxMediaD0Ev @ 12 NONAME
+	_ZN9CGlxMediaD1Ev @ 13 NONAME
+	_ZN9CGlxMediaD2Ev @ 14 NONAME
+	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 15 NONAME
+	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 16 NONAME
+	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 17 NONAME
+	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 18 NONAME
+	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 19 NONAME
+	_ZNK9TGlxMedia11GetDurationERf @ 20 NONAME
+	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 21 NONAME
+	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 22 NONAME
+	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 23 NONAME
+	_ZNK9TGlxMedia13GetFrameCountERi @ 24 NONAME
+	_ZNK9TGlxMedia13GetSystemItemERi @ 25 NONAME
+	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 26 NONAME
+	_ZNK9TGlxMedia14IsDrmProtectedEv @ 27 NONAME
+	_ZNK9TGlxMedia15GetDrmProtectedERi @ 28 NONAME
+	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 29 NONAME
+	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 30 NONAME
+	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 31 NONAME
+	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 32 NONAME
+	_ZNK9TGlxMedia21GetContainedItemCountERi @ 33 NONAME
+	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 34 NONAME
+	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 35 NONAME
+	_ZNK9TGlxMedia3UriEv @ 36 NONAME
+	_ZNK9TGlxMedia5TitleEv @ 37 NONAME
+	_ZNK9TGlxMedia7CommentEv @ 38 NONAME
+	_ZNK9TGlxMedia7GetDateER5TTime @ 39 NONAME
+	_ZNK9TGlxMedia7GetSizeERi @ 40 NONAME
+	_ZNK9TGlxMedia8CategoryEv @ 41 NONAME
+	_ZNK9TGlxMedia8IsStaticEv @ 42 NONAME
+	_ZNK9TGlxMedia8MimeTypeEv @ 43 NONAME
+	_ZNK9TGlxMedia8SubTitleEv @ 44 NONAME
+	_ZNK9TGlxMedia9IdSpaceIdEv @ 45 NONAME
+	_ZTI13CGlxMediaList @ 46 NONAME
+	_ZTI15CGlxImageReader @ 47 NONAME
+	_ZTI16CGlxCacheManager @ 48 NONAME
+	_ZTI20CGlxGarbageCollector @ 49 NONAME
+	_ZTIN11T_CGlxCache17CGlxMediaUserTestE @ 50 NONAME
+	_ZTIN11T_CGlxCache21CGlxCacheObserverTestE @ 51 NONAME
+	_ZTV13CGlxMediaList @ 52 NONAME
+	_ZTV15CGlxImageReader @ 53 NONAME
+	_ZTV16CGlxCacheManager @ 54 NONAME
+	_ZTV20CGlxGarbageCollector @ 55 NONAME
+	_ZTVN11T_CGlxCache17CGlxMediaUserTestE @ 56 NONAME
+	_ZTVN11T_CGlxCache21CGlxCacheObserverTestE @ 57 NONAME
 
--- a/photosgallery/viewframework/medialists/tsrc/eabi/t_cglxfetcherrorarrayu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/eabi/t_cglxfetcherrorarrayu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,2 +1,3 @@
 EXPORTS
 	_Z16CreateTestSuiteLv @ 1 NONAME
+
--- a/photosgallery/viewframework/medialists/tsrc/eabi/t_cglxgarbagecollectoru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/eabi/t_cglxgarbagecollectoru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -2,74 +2,70 @@
 	_Z16CreateTestSuiteLv @ 1 NONAME
 	_ZN15GlxErrorManager18HasAttributeErrorLEPK9CGlxMediaRK13TMPXAttribute @ 2 NONAME
 	_ZN15GlxErrorManager18HasAttributeErrorLEPK9CGlxMediai @ 3 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 4 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 5 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 6 NONAME
-	_ZN5CIdle3NewEi @ 7 NONAME
-	_ZN5CIdle4NewLEi @ 8 NONAME
-	_ZN5CIdle4RunLEv @ 9 NONAME
-	_ZN5CIdle5StartE9TCallBack @ 10 NONAME
-	_ZN5CIdle8DoCancelEv @ 11 NONAME
-	_ZN5CIdleC1Ei @ 12 NONAME
-	_ZN5CIdleC2Ei @ 13 NONAME
-	_ZN5CIdleD0Ev @ 14 NONAME
-	_ZN5CIdleD1Ev @ 15 NONAME
-	_ZN5CIdleD2Ev @ 16 NONAME
-	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 17 NONAME
-	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 18 NONAME
-	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 19 NONAME
-	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 20 NONAME
-	_ZN9CGlxMedia5ResetEv @ 21 NONAME
-	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 22 NONAME
-	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 23 NONAME
-	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 24 NONAME
-	_ZN9CGlxMediaD0Ev @ 25 NONAME
-	_ZN9CGlxMediaD1Ev @ 26 NONAME
-	_ZN9CGlxMediaD2Ev @ 27 NONAME
-	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 28 NONAME
-	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 29 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 30 NONAME
-	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 31 NONAME
-	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 32 NONAME
-	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 33 NONAME
-	_ZNK9TGlxMedia11GetDurationERf @ 34 NONAME
-	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 35 NONAME
-	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 36 NONAME
-	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 37 NONAME
-	_ZNK9TGlxMedia13GetFrameCountERi @ 38 NONAME
-	_ZNK9TGlxMedia13GetSystemItemERi @ 39 NONAME
-	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 40 NONAME
-	_ZNK9TGlxMedia14IsDrmProtectedEv @ 41 NONAME
-	_ZNK9TGlxMedia15GetDrmProtectedERi @ 42 NONAME
-	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 43 NONAME
-	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 44 NONAME
-	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 45 NONAME
-	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 46 NONAME
-	_ZNK9TGlxMedia21GetContainedItemCountERi @ 47 NONAME
-	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 48 NONAME
-	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 49 NONAME
-	_ZNK9TGlxMedia3UriEv @ 50 NONAME
-	_ZNK9TGlxMedia5TitleEv @ 51 NONAME
-	_ZNK9TGlxMedia7CommentEv @ 52 NONAME
-	_ZNK9TGlxMedia7GetDateER5TTime @ 53 NONAME
-	_ZNK9TGlxMedia7GetSizeERi @ 54 NONAME
-	_ZNK9TGlxMedia8CategoryEv @ 55 NONAME
-	_ZNK9TGlxMedia8IsStaticEv @ 56 NONAME
-	_ZNK9TGlxMedia8MimeTypeEv @ 57 NONAME
-	_ZNK9TGlxMedia8SubTitleEv @ 58 NONAME
-	_ZNK9TGlxMedia9IdSpaceIdEv @ 59 NONAME
-	_ZTI13CGlxMediaList @ 60 NONAME
-	_ZTI15CGlxImageReader @ 61 NONAME
-	_ZTI16CGlxCacheManager @ 62 NONAME
-	_ZTI20CGlxGarbageCollector @ 63 NONAME
-	_ZTI5CIdle @ 64 NONAME
-	_ZTIN22T_CGlxGarbageCollector10CTimerTestE @ 65 NONAME
-	_ZTIN22T_CGlxGarbageCollector17CGlxMediaUserTestE @ 66 NONAME
-	_ZTV13CGlxMediaList @ 67 NONAME
-	_ZTV15CGlxImageReader @ 68 NONAME
-	_ZTV16CGlxCacheManager @ 69 NONAME
-	_ZTV20CGlxGarbageCollector @ 70 NONAME
-	_ZTV5CIdle @ 71 NONAME
-	_ZTVN22T_CGlxGarbageCollector10CTimerTestE @ 72 NONAME
-	_ZTVN22T_CGlxGarbageCollector17CGlxMediaUserTestE @ 73 NONAME
+	_ZN5CIdle3NewEi @ 4 NONAME
+	_ZN5CIdle4NewLEi @ 5 NONAME
+	_ZN5CIdle4RunLEv @ 6 NONAME
+	_ZN5CIdle5StartE9TCallBack @ 7 NONAME
+	_ZN5CIdle8DoCancelEv @ 8 NONAME
+	_ZN5CIdleC1Ei @ 9 NONAME
+	_ZN5CIdleC2Ei @ 10 NONAME
+	_ZN5CIdleD0Ev @ 11 NONAME
+	_ZN5CIdleD1Ev @ 12 NONAME
+	_ZN5CIdleD2Ev @ 13 NONAME
+	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 14 NONAME
+	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 15 NONAME
+	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 16 NONAME
+	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 17 NONAME
+	_ZN9CGlxMedia5ResetEv @ 18 NONAME
+	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 19 NONAME
+	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 20 NONAME
+	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 21 NONAME
+	_ZN9CGlxMediaD0Ev @ 22 NONAME
+	_ZN9CGlxMediaD1Ev @ 23 NONAME
+	_ZN9CGlxMediaD2Ev @ 24 NONAME
+	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 25 NONAME
+	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 26 NONAME
+	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 27 NONAME
+	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 28 NONAME
+	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 29 NONAME
+	_ZNK9TGlxMedia11GetDurationERf @ 30 NONAME
+	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 31 NONAME
+	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 32 NONAME
+	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 33 NONAME
+	_ZNK9TGlxMedia13GetFrameCountERi @ 34 NONAME
+	_ZNK9TGlxMedia13GetSystemItemERi @ 35 NONAME
+	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 36 NONAME
+	_ZNK9TGlxMedia14IsDrmProtectedEv @ 37 NONAME
+	_ZNK9TGlxMedia15GetDrmProtectedERi @ 38 NONAME
+	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 39 NONAME
+	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 40 NONAME
+	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 41 NONAME
+	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 42 NONAME
+	_ZNK9TGlxMedia21GetContainedItemCountERi @ 43 NONAME
+	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 44 NONAME
+	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 45 NONAME
+	_ZNK9TGlxMedia3UriEv @ 46 NONAME
+	_ZNK9TGlxMedia5TitleEv @ 47 NONAME
+	_ZNK9TGlxMedia7CommentEv @ 48 NONAME
+	_ZNK9TGlxMedia7GetDateER5TTime @ 49 NONAME
+	_ZNK9TGlxMedia7GetSizeERi @ 50 NONAME
+	_ZNK9TGlxMedia8CategoryEv @ 51 NONAME
+	_ZNK9TGlxMedia8IsStaticEv @ 52 NONAME
+	_ZNK9TGlxMedia8MimeTypeEv @ 53 NONAME
+	_ZNK9TGlxMedia8SubTitleEv @ 54 NONAME
+	_ZNK9TGlxMedia9IdSpaceIdEv @ 55 NONAME
+	_ZTI13CGlxMediaList @ 56 NONAME
+	_ZTI15CGlxImageReader @ 57 NONAME
+	_ZTI16CGlxCacheManager @ 58 NONAME
+	_ZTI20CGlxGarbageCollector @ 59 NONAME
+	_ZTI5CIdle @ 60 NONAME
+	_ZTIN22T_CGlxGarbageCollector10CTimerTestE @ 61 NONAME
+	_ZTIN22T_CGlxGarbageCollector17CGlxMediaUserTestE @ 62 NONAME
+	_ZTV13CGlxMediaList @ 63 NONAME
+	_ZTV15CGlxImageReader @ 64 NONAME
+	_ZTV16CGlxCacheManager @ 65 NONAME
+	_ZTV20CGlxGarbageCollector @ 66 NONAME
+	_ZTV5CIdle @ 67 NONAME
+	_ZTVN22T_CGlxGarbageCollector10CTimerTestE @ 68 NONAME
+	_ZTVN22T_CGlxGarbageCollector17CGlxMediaUserTestE @ 69 NONAME
 
--- a/photosgallery/viewframework/medialists/tsrc/eabi/ut_cglxattributecontextu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/eabi/ut_cglxattributecontextu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -57,142 +57,138 @@
 	_ZN21TGlxSelectionIteratorD1Ev @ 56 NONAME
 	_ZN21TGlxSelectionIteratorD2Ev @ 57 NONAME
 	_ZN21TGlxSelectionIteratorppEi @ 58 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 59 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 60 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 61 NONAME
-	_ZN22TGlxSequentialIterator8SetRangeEi @ 62 NONAME
-	_ZN22TGlxSequentialIteratorC1Ev @ 63 NONAME
-	_ZN22TGlxSequentialIteratorC2Ev @ 64 NONAME
-	_ZN22TGlxSpecificIdIteratorC1ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 65 NONAME
-	_ZN22TGlxSpecificIdIteratorC2ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 66 NONAME
-	_ZN23TGlxFetchContextRemover5CloseEv @ 67 NONAME
-	_ZN23TGlxFetchContextRemoverC1EP16MGlxFetchContextR13MGlxMediaList @ 68 NONAME
-	_ZN23TGlxFetchContextRemoverC2EP16MGlxFetchContextR13MGlxMediaList @ 69 NONAME
-	_ZN23TGlxFetchContextRemoverD1Ev @ 70 NONAME
-	_ZN23TGlxFetchContextRemoverD2Ev @ 71 NONAME
-	_ZN25TGlxFirstThenLastIteratorC1Ev @ 72 NONAME
-	_ZN25TGlxFirstThenLastIteratorC2Ev @ 73 NONAME
-	_ZN25TGlxFirstThenLastIteratorD1Ev @ 74 NONAME
-	_ZN25TGlxFirstThenLastIteratorD2Ev @ 75 NONAME
-	_ZN27CGlxDefaultAttributeContext15SetRangeOffsetsEii @ 76 NONAME
-	_ZN27CGlxDefaultAttributeContext4NewLEv @ 77 NONAME
-	_ZN27CGlxDefaultAttributeContextD0Ev @ 78 NONAME
-	_ZN27CGlxDefaultAttributeContextD1Ev @ 79 NONAME
-	_ZN27CGlxDefaultAttributeContextD2Ev @ 80 NONAME
-	_ZN27CGlxDefaultThumbnailContext15SetRangeOffsetsEii @ 81 NONAME
-	_ZN27CGlxDefaultThumbnailContext4NewLEv @ 82 NONAME
-	_ZN27CGlxDefaultThumbnailContextD0Ev @ 83 NONAME
-	_ZN27CGlxDefaultThumbnailContextD1Ev @ 84 NONAME
-	_ZN27CGlxDefaultThumbnailContextD2Ev @ 85 NONAME
-	_ZN28TGlxFromFocusOutwardIterator15SetRangeOffsetsEii @ 86 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorC1Ev @ 87 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorC2Ev @ 88 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorD1Ev @ 89 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorD2Ev @ 90 NONAME
-	_ZN33TGlxFromManualIndexBlockyIterator15SetRangeOffsetsEii @ 91 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorC1Ev @ 92 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorC2Ev @ 93 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorD1Ev @ 94 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorD2Ev @ 95 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorC1Ev @ 96 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorC2Ev @ 97 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorD1Ev @ 98 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorD2Ev @ 99 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIterator15SetRangeOffsetsEii @ 100 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorC1ERKNS_9MGlxIndexE @ 101 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorC2ERKNS_9MGlxIndexE @ 102 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorD1Ev @ 103 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorD2Ev @ 104 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIterator8SetIndexEi @ 105 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC1Ev @ 106 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC2Ev @ 107 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD1Ev @ 108 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD2Ev @ 109 NONAME
-	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 110 NONAME
-	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 111 NONAME
-	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 112 NONAME
-	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 113 NONAME
-	_ZN9CGlxMedia5ResetEv @ 114 NONAME
-	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 115 NONAME
-	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 116 NONAME
-	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 117 NONAME
-	_ZN9CGlxMediaD0Ev @ 118 NONAME
-	_ZN9CGlxMediaD1Ev @ 119 NONAME
-	_ZN9CGlxMediaD2Ev @ 120 NONAME
-	_ZN9MGlxCache9InstanceLEv @ 121 NONAME
-	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 122 NONAME
-	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 123 NONAME
-	_ZNK14CGlxListWindow2AtEi @ 124 NONAME
-	_ZNK14CGlxListWindow8IteratorEv @ 125 NONAME
-	_ZNK21TGlxSelectionIterator7InRangeEi @ 126 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 127 NONAME
-	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 128 NONAME
-	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 129 NONAME
-	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 130 NONAME
-	_ZNK9TGlxMedia11GetDurationERf @ 131 NONAME
-	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 132 NONAME
-	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 133 NONAME
-	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 134 NONAME
-	_ZNK9TGlxMedia13GetFrameCountERi @ 135 NONAME
-	_ZNK9TGlxMedia13GetSystemItemERi @ 136 NONAME
-	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 137 NONAME
-	_ZNK9TGlxMedia14IsDrmProtectedEv @ 138 NONAME
-	_ZNK9TGlxMedia15GetDrmProtectedERi @ 139 NONAME
-	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 140 NONAME
-	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 141 NONAME
-	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 142 NONAME
-	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 143 NONAME
-	_ZNK9TGlxMedia21GetContainedItemCountERi @ 144 NONAME
-	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 145 NONAME
-	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 146 NONAME
-	_ZNK9TGlxMedia3UriEv @ 147 NONAME
-	_ZNK9TGlxMedia5TitleEv @ 148 NONAME
-	_ZNK9TGlxMedia7CommentEv @ 149 NONAME
-	_ZNK9TGlxMedia7GetDateER5TTime @ 150 NONAME
-	_ZNK9TGlxMedia7GetSizeERi @ 151 NONAME
-	_ZNK9TGlxMedia8CategoryEv @ 152 NONAME
-	_ZNK9TGlxMedia8IsStaticEv @ 153 NONAME
-	_ZNK9TGlxMedia8MimeTypeEv @ 154 NONAME
-	_ZNK9TGlxMedia8SubTitleEv @ 155 NONAME
-	_ZNK9TGlxMedia9IdSpaceIdEv @ 156 NONAME
-	_ZTI13CGlxMediaList @ 157 NONAME
-	_ZTI14CGlxListWindow @ 158 NONAME
-	_ZTI15CGlxImageReader @ 159 NONAME
-	_ZTI16CGlxCacheManager @ 160 NONAME
-	_ZTI20CGlxAttributeContext @ 161 NONAME
-	_ZTI20CGlxGarbageCollector @ 162 NONAME
-	_ZTI20CGlxThumbnailContext @ 163 NONAME
-	_ZTI21TGlxExclusionIterator @ 164 NONAME
-	_ZTI21TGlxSelectionIterator @ 165 NONAME
-	_ZTI22TGlxSequentialIterator @ 166 NONAME
-	_ZTI22TGlxSpecificIdIterator @ 167 NONAME
-	_ZTI25TGlxFirstThenLastIterator @ 168 NONAME
-	_ZTI27CGlxDefaultAttributeContext @ 169 NONAME
-	_ZTI27CGlxDefaultThumbnailContext @ 170 NONAME
-	_ZTI28TGlxFromFocusOutwardIterator @ 171 NONAME
-	_ZTI33TGlxFromManualIndexBlockyIterator @ 172 NONAME
-	_ZTI34TGlxFromFocusOutwardBlockyIterator @ 173 NONAME
-	_ZTI34TGlxFromIndexOutwardBlockyIterator @ 174 NONAME
-	_ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 175 NONAME
-	_ZTIN23UT_CGlxAttributeContext17CGlxMediaListTestE @ 176 NONAME
-	_ZTV13CGlxMediaList @ 177 NONAME
-	_ZTV14CGlxListWindow @ 178 NONAME
-	_ZTV15CGlxImageReader @ 179 NONAME
-	_ZTV16CGlxCacheManager @ 180 NONAME
-	_ZTV20CGlxAttributeContext @ 181 NONAME
-	_ZTV20CGlxGarbageCollector @ 182 NONAME
-	_ZTV20CGlxThumbnailContext @ 183 NONAME
-	_ZTV21TGlxExclusionIterator @ 184 NONAME
-	_ZTV21TGlxSelectionIterator @ 185 NONAME
-	_ZTV22TGlxSequentialIterator @ 186 NONAME
-	_ZTV22TGlxSpecificIdIterator @ 187 NONAME
-	_ZTV25TGlxFirstThenLastIterator @ 188 NONAME
-	_ZTV27CGlxDefaultAttributeContext @ 189 NONAME
-	_ZTV27CGlxDefaultThumbnailContext @ 190 NONAME
-	_ZTV28TGlxFromFocusOutwardIterator @ 191 NONAME
-	_ZTV33TGlxFromManualIndexBlockyIterator @ 192 NONAME
-	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 193 NONAME
-	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 194 NONAME
-	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 195 NONAME
-	_ZTVN23UT_CGlxAttributeContext17CGlxMediaListTestE @ 196 NONAME
+	_ZN22TGlxSequentialIterator8SetRangeEi @ 59 NONAME
+	_ZN22TGlxSequentialIteratorC1Ev @ 60 NONAME
+	_ZN22TGlxSequentialIteratorC2Ev @ 61 NONAME
+	_ZN22TGlxSpecificIdIteratorC1ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 62 NONAME
+	_ZN22TGlxSpecificIdIteratorC2ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 63 NONAME
+	_ZN23TGlxFetchContextRemover5CloseEv @ 64 NONAME
+	_ZN23TGlxFetchContextRemoverC1EP16MGlxFetchContextR13MGlxMediaList @ 65 NONAME
+	_ZN23TGlxFetchContextRemoverC2EP16MGlxFetchContextR13MGlxMediaList @ 66 NONAME
+	_ZN23TGlxFetchContextRemoverD1Ev @ 67 NONAME
+	_ZN23TGlxFetchContextRemoverD2Ev @ 68 NONAME
+	_ZN25TGlxFirstThenLastIteratorC1Ev @ 69 NONAME
+	_ZN25TGlxFirstThenLastIteratorC2Ev @ 70 NONAME
+	_ZN25TGlxFirstThenLastIteratorD1Ev @ 71 NONAME
+	_ZN25TGlxFirstThenLastIteratorD2Ev @ 72 NONAME
+	_ZN27CGlxDefaultAttributeContext15SetRangeOffsetsEii @ 73 NONAME
+	_ZN27CGlxDefaultAttributeContext4NewLEv @ 74 NONAME
+	_ZN27CGlxDefaultAttributeContextD0Ev @ 75 NONAME
+	_ZN27CGlxDefaultAttributeContextD1Ev @ 76 NONAME
+	_ZN27CGlxDefaultAttributeContextD2Ev @ 77 NONAME
+	_ZN27CGlxDefaultThumbnailContext15SetRangeOffsetsEii @ 78 NONAME
+	_ZN27CGlxDefaultThumbnailContext4NewLEv @ 79 NONAME
+	_ZN27CGlxDefaultThumbnailContextD0Ev @ 80 NONAME
+	_ZN27CGlxDefaultThumbnailContextD1Ev @ 81 NONAME
+	_ZN27CGlxDefaultThumbnailContextD2Ev @ 82 NONAME
+	_ZN28TGlxFromFocusOutwardIterator15SetRangeOffsetsEii @ 83 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorC1Ev @ 84 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorC2Ev @ 85 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorD1Ev @ 86 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorD2Ev @ 87 NONAME
+	_ZN33TGlxFromManualIndexBlockyIterator15SetRangeOffsetsEii @ 88 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorC1Ev @ 89 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorC2Ev @ 90 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorD1Ev @ 91 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorD2Ev @ 92 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorC1Ev @ 93 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorC2Ev @ 94 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorD1Ev @ 95 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorD2Ev @ 96 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIterator15SetRangeOffsetsEii @ 97 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorC1ERKNS_9MGlxIndexE @ 98 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorC2ERKNS_9MGlxIndexE @ 99 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorD1Ev @ 100 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorD2Ev @ 101 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIterator8SetIndexEi @ 102 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC1Ev @ 103 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC2Ev @ 104 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD1Ev @ 105 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD2Ev @ 106 NONAME
+	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 107 NONAME
+	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 108 NONAME
+	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 109 NONAME
+	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 110 NONAME
+	_ZN9CGlxMedia5ResetEv @ 111 NONAME
+	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 112 NONAME
+	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 113 NONAME
+	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 114 NONAME
+	_ZN9CGlxMediaD0Ev @ 115 NONAME
+	_ZN9CGlxMediaD1Ev @ 116 NONAME
+	_ZN9CGlxMediaD2Ev @ 117 NONAME
+	_ZN9MGlxCache9InstanceLEv @ 118 NONAME
+	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 119 NONAME
+	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 120 NONAME
+	_ZNK14CGlxListWindow2AtEi @ 121 NONAME
+	_ZNK14CGlxListWindow8IteratorEv @ 122 NONAME
+	_ZNK21TGlxSelectionIterator7InRangeEi @ 123 NONAME
+	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 124 NONAME
+	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 125 NONAME
+	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 126 NONAME
+	_ZNK9TGlxMedia11GetDurationERf @ 127 NONAME
+	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 128 NONAME
+	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 129 NONAME
+	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 130 NONAME
+	_ZNK9TGlxMedia13GetFrameCountERi @ 131 NONAME
+	_ZNK9TGlxMedia13GetSystemItemERi @ 132 NONAME
+	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 133 NONAME
+	_ZNK9TGlxMedia14IsDrmProtectedEv @ 134 NONAME
+	_ZNK9TGlxMedia15GetDrmProtectedERi @ 135 NONAME
+	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 136 NONAME
+	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 137 NONAME
+	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 138 NONAME
+	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 139 NONAME
+	_ZNK9TGlxMedia21GetContainedItemCountERi @ 140 NONAME
+	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 141 NONAME
+	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 142 NONAME
+	_ZNK9TGlxMedia3UriEv @ 143 NONAME
+	_ZNK9TGlxMedia5TitleEv @ 144 NONAME
+	_ZNK9TGlxMedia7CommentEv @ 145 NONAME
+	_ZNK9TGlxMedia7GetDateER5TTime @ 146 NONAME
+	_ZNK9TGlxMedia7GetSizeERi @ 147 NONAME
+	_ZNK9TGlxMedia8CategoryEv @ 148 NONAME
+	_ZNK9TGlxMedia8IsStaticEv @ 149 NONAME
+	_ZNK9TGlxMedia8MimeTypeEv @ 150 NONAME
+	_ZNK9TGlxMedia8SubTitleEv @ 151 NONAME
+	_ZNK9TGlxMedia9IdSpaceIdEv @ 152 NONAME
+	_ZTI13CGlxMediaList @ 153 NONAME
+	_ZTI14CGlxListWindow @ 154 NONAME
+	_ZTI15CGlxImageReader @ 155 NONAME
+	_ZTI16CGlxCacheManager @ 156 NONAME
+	_ZTI20CGlxAttributeContext @ 157 NONAME
+	_ZTI20CGlxGarbageCollector @ 158 NONAME
+	_ZTI20CGlxThumbnailContext @ 159 NONAME
+	_ZTI21TGlxExclusionIterator @ 160 NONAME
+	_ZTI21TGlxSelectionIterator @ 161 NONAME
+	_ZTI22TGlxSequentialIterator @ 162 NONAME
+	_ZTI22TGlxSpecificIdIterator @ 163 NONAME
+	_ZTI25TGlxFirstThenLastIterator @ 164 NONAME
+	_ZTI27CGlxDefaultAttributeContext @ 165 NONAME
+	_ZTI27CGlxDefaultThumbnailContext @ 166 NONAME
+	_ZTI28TGlxFromFocusOutwardIterator @ 167 NONAME
+	_ZTI33TGlxFromManualIndexBlockyIterator @ 168 NONAME
+	_ZTI34TGlxFromFocusOutwardBlockyIterator @ 169 NONAME
+	_ZTI34TGlxFromIndexOutwardBlockyIterator @ 170 NONAME
+	_ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 171 NONAME
+	_ZTIN23UT_CGlxAttributeContext17CGlxMediaListTestE @ 172 NONAME
+	_ZTV13CGlxMediaList @ 173 NONAME
+	_ZTV14CGlxListWindow @ 174 NONAME
+	_ZTV15CGlxImageReader @ 175 NONAME
+	_ZTV16CGlxCacheManager @ 176 NONAME
+	_ZTV20CGlxAttributeContext @ 177 NONAME
+	_ZTV20CGlxGarbageCollector @ 178 NONAME
+	_ZTV20CGlxThumbnailContext @ 179 NONAME
+	_ZTV21TGlxExclusionIterator @ 180 NONAME
+	_ZTV21TGlxSelectionIterator @ 181 NONAME
+	_ZTV22TGlxSequentialIterator @ 182 NONAME
+	_ZTV22TGlxSpecificIdIterator @ 183 NONAME
+	_ZTV25TGlxFirstThenLastIterator @ 184 NONAME
+	_ZTV27CGlxDefaultAttributeContext @ 185 NONAME
+	_ZTV27CGlxDefaultThumbnailContext @ 186 NONAME
+	_ZTV28TGlxFromFocusOutwardIterator @ 187 NONAME
+	_ZTV33TGlxFromManualIndexBlockyIterator @ 188 NONAME
+	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 189 NONAME
+	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 190 NONAME
+	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 191 NONAME
+	_ZTVN23UT_CGlxAttributeContext17CGlxMediaListTestE @ 192 NONAME
 
--- a/photosgallery/viewframework/medialists/tsrc/eabi/ut_glxerrormanageru.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/eabi/ut_glxerrormanageru.def	Tue Feb 02 00:10:37 2010 +0200
@@ -57,140 +57,136 @@
 	_ZN21TGlxSelectionIteratorD1Ev @ 56 NONAME
 	_ZN21TGlxSelectionIteratorD2Ev @ 57 NONAME
 	_ZN21TGlxSelectionIteratorppEi @ 58 NONAME
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 59 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 60 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 61 NONAME
-	_ZN22TGlxSequentialIterator8SetRangeEi @ 62 NONAME
-	_ZN22TGlxSequentialIteratorC1Ev @ 63 NONAME
-	_ZN22TGlxSequentialIteratorC2Ev @ 64 NONAME
-	_ZN22TGlxSpecificIdIteratorC1ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 65 NONAME
-	_ZN22TGlxSpecificIdIteratorC2ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 66 NONAME
-	_ZN23TGlxFetchContextRemover5CloseEv @ 67 NONAME
-	_ZN23TGlxFetchContextRemoverC1EP16MGlxFetchContextR13MGlxMediaList @ 68 NONAME
-	_ZN23TGlxFetchContextRemoverC2EP16MGlxFetchContextR13MGlxMediaList @ 69 NONAME
-	_ZN23TGlxFetchContextRemoverD1Ev @ 70 NONAME
-	_ZN23TGlxFetchContextRemoverD2Ev @ 71 NONAME
-	_ZN25TGlxFirstThenLastIteratorC1Ev @ 72 NONAME
-	_ZN25TGlxFirstThenLastIteratorC2Ev @ 73 NONAME
-	_ZN25TGlxFirstThenLastIteratorD1Ev @ 74 NONAME
-	_ZN25TGlxFirstThenLastIteratorD2Ev @ 75 NONAME
-	_ZN27CGlxDefaultAttributeContext15SetRangeOffsetsEii @ 76 NONAME
-	_ZN27CGlxDefaultAttributeContext4NewLEv @ 77 NONAME
-	_ZN27CGlxDefaultAttributeContextD0Ev @ 78 NONAME
-	_ZN27CGlxDefaultAttributeContextD1Ev @ 79 NONAME
-	_ZN27CGlxDefaultAttributeContextD2Ev @ 80 NONAME
-	_ZN27CGlxDefaultThumbnailContext15SetRangeOffsetsEii @ 81 NONAME
-	_ZN27CGlxDefaultThumbnailContext4NewLEv @ 82 NONAME
-	_ZN27CGlxDefaultThumbnailContextD0Ev @ 83 NONAME
-	_ZN27CGlxDefaultThumbnailContextD1Ev @ 84 NONAME
-	_ZN27CGlxDefaultThumbnailContextD2Ev @ 85 NONAME
-	_ZN28TGlxFromFocusOutwardIterator15SetRangeOffsetsEii @ 86 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorC1Ev @ 87 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorC2Ev @ 88 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorD1Ev @ 89 NONAME
-	_ZN28TGlxFromFocusOutwardIteratorD2Ev @ 90 NONAME
-	_ZN33TGlxFromManualIndexBlockyIterator15SetRangeOffsetsEii @ 91 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorC1Ev @ 92 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorC2Ev @ 93 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorD1Ev @ 94 NONAME
-	_ZN33TGlxFromManualIndexBlockyIteratorD2Ev @ 95 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorC1Ev @ 96 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorC2Ev @ 97 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorD1Ev @ 98 NONAME
-	_ZN34TGlxFromFocusOutwardBlockyIteratorD2Ev @ 99 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIterator15SetRangeOffsetsEii @ 100 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorC1ERKNS_9MGlxIndexE @ 101 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorC2ERKNS_9MGlxIndexE @ 102 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorD1Ev @ 103 NONAME
-	_ZN34TGlxFromIndexOutwardBlockyIteratorD2Ev @ 104 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIterator8SetIndexEi @ 105 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC1Ev @ 106 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC2Ev @ 107 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD1Ev @ 108 NONAME
-	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD2Ev @ 109 NONAME
-	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 110 NONAME
-	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 111 NONAME
-	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 112 NONAME
-	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 113 NONAME
-	_ZN9CGlxMedia5ResetEv @ 114 NONAME
-	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 115 NONAME
-	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 116 NONAME
-	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 117 NONAME
-	_ZN9CGlxMediaD0Ev @ 118 NONAME
-	_ZN9CGlxMediaD1Ev @ 119 NONAME
-	_ZN9CGlxMediaD2Ev @ 120 NONAME
-	_ZN9MGlxCache9InstanceLEv @ 121 NONAME
-	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 122 NONAME
-	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 123 NONAME
-	_ZNK14CGlxListWindow2AtEi @ 124 NONAME
-	_ZNK14CGlxListWindow8IteratorEv @ 125 NONAME
-	_ZNK21TGlxSelectionIterator7InRangeEi @ 126 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 127 NONAME
-	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 128 NONAME
-	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 129 NONAME
-	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 130 NONAME
-	_ZNK9TGlxMedia11GetDurationERf @ 131 NONAME
-	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 132 NONAME
-	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 133 NONAME
-	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 134 NONAME
-	_ZNK9TGlxMedia13GetFrameCountERi @ 135 NONAME
-	_ZNK9TGlxMedia13GetSystemItemERi @ 136 NONAME
-	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 137 NONAME
-	_ZNK9TGlxMedia14IsDrmProtectedEv @ 138 NONAME
-	_ZNK9TGlxMedia15GetDrmProtectedERi @ 139 NONAME
-	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 140 NONAME
-	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 141 NONAME
-	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 142 NONAME
-	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 143 NONAME
-	_ZNK9TGlxMedia21GetContainedItemCountERi @ 144 NONAME
-	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 145 NONAME
-	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 146 NONAME
-	_ZNK9TGlxMedia3UriEv @ 147 NONAME
-	_ZNK9TGlxMedia5TitleEv @ 148 NONAME
-	_ZNK9TGlxMedia7CommentEv @ 149 NONAME
-	_ZNK9TGlxMedia7GetDateER5TTime @ 150 NONAME
-	_ZNK9TGlxMedia7GetSizeERi @ 151 NONAME
-	_ZNK9TGlxMedia8CategoryEv @ 152 NONAME
-	_ZNK9TGlxMedia8IsStaticEv @ 153 NONAME
-	_ZNK9TGlxMedia8MimeTypeEv @ 154 NONAME
-	_ZNK9TGlxMedia8SubTitleEv @ 155 NONAME
-	_ZNK9TGlxMedia9IdSpaceIdEv @ 156 NONAME
-	_ZTI13CGlxMediaList @ 157 NONAME
-	_ZTI14CGlxListWindow @ 158 NONAME
-	_ZTI15CGlxImageReader @ 159 NONAME
-	_ZTI16CGlxCacheManager @ 160 NONAME
-	_ZTI20CGlxAttributeContext @ 161 NONAME
-	_ZTI20CGlxGarbageCollector @ 162 NONAME
-	_ZTI20CGlxThumbnailContext @ 163 NONAME
-	_ZTI21TGlxExclusionIterator @ 164 NONAME
-	_ZTI21TGlxSelectionIterator @ 165 NONAME
-	_ZTI22TGlxSequentialIterator @ 166 NONAME
-	_ZTI22TGlxSpecificIdIterator @ 167 NONAME
-	_ZTI25TGlxFirstThenLastIterator @ 168 NONAME
-	_ZTI27CGlxDefaultAttributeContext @ 169 NONAME
-	_ZTI27CGlxDefaultThumbnailContext @ 170 NONAME
-	_ZTI28TGlxFromFocusOutwardIterator @ 171 NONAME
-	_ZTI33TGlxFromManualIndexBlockyIterator @ 172 NONAME
-	_ZTI34TGlxFromFocusOutwardBlockyIterator @ 173 NONAME
-	_ZTI34TGlxFromIndexOutwardBlockyIterator @ 174 NONAME
-	_ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 175 NONAME
-	_ZTV13CGlxMediaList @ 176 NONAME
-	_ZTV14CGlxListWindow @ 177 NONAME
-	_ZTV15CGlxImageReader @ 178 NONAME
-	_ZTV16CGlxCacheManager @ 179 NONAME
-	_ZTV20CGlxAttributeContext @ 180 NONAME
-	_ZTV20CGlxGarbageCollector @ 181 NONAME
-	_ZTV20CGlxThumbnailContext @ 182 NONAME
-	_ZTV21TGlxExclusionIterator @ 183 NONAME
-	_ZTV21TGlxSelectionIterator @ 184 NONAME
-	_ZTV22TGlxSequentialIterator @ 185 NONAME
-	_ZTV22TGlxSpecificIdIterator @ 186 NONAME
-	_ZTV25TGlxFirstThenLastIterator @ 187 NONAME
-	_ZTV27CGlxDefaultAttributeContext @ 188 NONAME
-	_ZTV27CGlxDefaultThumbnailContext @ 189 NONAME
-	_ZTV28TGlxFromFocusOutwardIterator @ 190 NONAME
-	_ZTV33TGlxFromManualIndexBlockyIterator @ 191 NONAME
-	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 192 NONAME
-	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 193 NONAME
-	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 194 NONAME
+	_ZN22TGlxSequentialIterator8SetRangeEi @ 59 NONAME
+	_ZN22TGlxSequentialIteratorC1Ev @ 60 NONAME
+	_ZN22TGlxSequentialIteratorC2Ev @ 61 NONAME
+	_ZN22TGlxSpecificIdIteratorC1ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 62 NONAME
+	_ZN22TGlxSpecificIdIteratorC2ERK6TGlxIdI17TGlxIdSpaceIdBaseE11TGlxMediaId @ 63 NONAME
+	_ZN23TGlxFetchContextRemover5CloseEv @ 64 NONAME
+	_ZN23TGlxFetchContextRemoverC1EP16MGlxFetchContextR13MGlxMediaList @ 65 NONAME
+	_ZN23TGlxFetchContextRemoverC2EP16MGlxFetchContextR13MGlxMediaList @ 66 NONAME
+	_ZN23TGlxFetchContextRemoverD1Ev @ 67 NONAME
+	_ZN23TGlxFetchContextRemoverD2Ev @ 68 NONAME
+	_ZN25TGlxFirstThenLastIteratorC1Ev @ 69 NONAME
+	_ZN25TGlxFirstThenLastIteratorC2Ev @ 70 NONAME
+	_ZN25TGlxFirstThenLastIteratorD1Ev @ 71 NONAME
+	_ZN25TGlxFirstThenLastIteratorD2Ev @ 72 NONAME
+	_ZN27CGlxDefaultAttributeContext15SetRangeOffsetsEii @ 73 NONAME
+	_ZN27CGlxDefaultAttributeContext4NewLEv @ 74 NONAME
+	_ZN27CGlxDefaultAttributeContextD0Ev @ 75 NONAME
+	_ZN27CGlxDefaultAttributeContextD1Ev @ 76 NONAME
+	_ZN27CGlxDefaultAttributeContextD2Ev @ 77 NONAME
+	_ZN27CGlxDefaultThumbnailContext15SetRangeOffsetsEii @ 78 NONAME
+	_ZN27CGlxDefaultThumbnailContext4NewLEv @ 79 NONAME
+	_ZN27CGlxDefaultThumbnailContextD0Ev @ 80 NONAME
+	_ZN27CGlxDefaultThumbnailContextD1Ev @ 81 NONAME
+	_ZN27CGlxDefaultThumbnailContextD2Ev @ 82 NONAME
+	_ZN28TGlxFromFocusOutwardIterator15SetRangeOffsetsEii @ 83 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorC1Ev @ 84 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorC2Ev @ 85 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorD1Ev @ 86 NONAME
+	_ZN28TGlxFromFocusOutwardIteratorD2Ev @ 87 NONAME
+	_ZN33TGlxFromManualIndexBlockyIterator15SetRangeOffsetsEii @ 88 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorC1Ev @ 89 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorC2Ev @ 90 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorD1Ev @ 91 NONAME
+	_ZN33TGlxFromManualIndexBlockyIteratorD2Ev @ 92 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorC1Ev @ 93 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorC2Ev @ 94 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorD1Ev @ 95 NONAME
+	_ZN34TGlxFromFocusOutwardBlockyIteratorD2Ev @ 96 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIterator15SetRangeOffsetsEii @ 97 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorC1ERKNS_9MGlxIndexE @ 98 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorC2ERKNS_9MGlxIndexE @ 99 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorD1Ev @ 100 NONAME
+	_ZN34TGlxFromIndexOutwardBlockyIteratorD2Ev @ 101 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIterator8SetIndexEi @ 102 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC1Ev @ 103 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorC2Ev @ 104 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD1Ev @ 105 NONAME
+	_ZN40TGlxFromManualIndexOutwardBlockyIteratorD2Ev @ 106 NONAME
+	_ZN9CGlxMedia13SetTextValueLERK13TMPXAttributeRK7TDesC16 @ 107 NONAME
+	_ZN9CGlxMedia14HandleModifiedERK6RArrayI13TMPXAttributeE @ 108 NONAME
+	_ZN9CGlxMedia15DeleteAttributeERK13TMPXAttribute @ 109 NONAME
+	_ZN9CGlxMedia16SetCObjectValueLERK13TMPXAttributeP5CBase @ 110 NONAME
+	_ZN9CGlxMedia5ResetEv @ 111 NONAME
+	_ZN9CGlxMedia9SetValueLERK13TMPXAttributePv17TMPXAttributeType @ 112 NONAME
+	_ZN9CGlxMediaC1ERK11TGlxMediaId @ 113 NONAME
+	_ZN9CGlxMediaC2ERK11TGlxMediaId @ 114 NONAME
+	_ZN9CGlxMediaD0Ev @ 115 NONAME
+	_ZN9CGlxMediaD1Ev @ 116 NONAME
+	_ZN9CGlxMediaD2Ev @ 117 NONAME
+	_ZN9MGlxCache9InstanceLEv @ 118 NONAME
+	_ZN9TGlxMedia23DeleteLocationAttributeEv @ 119 NONAME
+	_ZN9TGlxMedia9MatchByIdERKS_S1_ @ 120 NONAME
+	_ZNK14CGlxListWindow2AtEi @ 121 NONAME
+	_ZNK14CGlxListWindow8IteratorEv @ 122 NONAME
+	_ZNK21TGlxSelectionIterator7InRangeEi @ 123 NONAME
+	_ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 124 NONAME
+	_ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 125 NONAME
+	_ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 126 NONAME
+	_ZNK9TGlxMedia11GetDurationERf @ 127 NONAME
+	_ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 128 NONAME
+	_ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 129 NONAME
+	_ZNK9TGlxMedia13GetDimensionsER5TSize @ 130 NONAME
+	_ZNK9TGlxMedia13GetFrameCountERi @ 131 NONAME
+	_ZNK9TGlxMedia13GetSystemItemERi @ 132 NONAME
+	_ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 133 NONAME
+	_ZNK9TGlxMedia14IsDrmProtectedEv @ 134 NONAME
+	_ZNK9TGlxMedia15GetDrmProtectedERi @ 135 NONAME
+	_ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 136 NONAME
+	_ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 137 NONAME
+	_ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 138 NONAME
+	_ZNK9TGlxMedia20GetStaticItemCommandERi @ 139 NONAME
+	_ZNK9TGlxMedia21GetContainedItemCountERi @ 140 NONAME
+	_ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 141 NONAME
+	_ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 142 NONAME
+	_ZNK9TGlxMedia3UriEv @ 143 NONAME
+	_ZNK9TGlxMedia5TitleEv @ 144 NONAME
+	_ZNK9TGlxMedia7CommentEv @ 145 NONAME
+	_ZNK9TGlxMedia7GetDateER5TTime @ 146 NONAME
+	_ZNK9TGlxMedia7GetSizeERi @ 147 NONAME
+	_ZNK9TGlxMedia8CategoryEv @ 148 NONAME
+	_ZNK9TGlxMedia8IsStaticEv @ 149 NONAME
+	_ZNK9TGlxMedia8MimeTypeEv @ 150 NONAME
+	_ZNK9TGlxMedia8SubTitleEv @ 151 NONAME
+	_ZNK9TGlxMedia9IdSpaceIdEv @ 152 NONAME
+	_ZTI13CGlxMediaList @ 153 NONAME
+	_ZTI14CGlxListWindow @ 154 NONAME
+	_ZTI15CGlxImageReader @ 155 NONAME
+	_ZTI16CGlxCacheManager @ 156 NONAME
+	_ZTI20CGlxAttributeContext @ 157 NONAME
+	_ZTI20CGlxGarbageCollector @ 158 NONAME
+	_ZTI20CGlxThumbnailContext @ 159 NONAME
+	_ZTI21TGlxExclusionIterator @ 160 NONAME
+	_ZTI21TGlxSelectionIterator @ 161 NONAME
+	_ZTI22TGlxSequentialIterator @ 162 NONAME
+	_ZTI22TGlxSpecificIdIterator @ 163 NONAME
+	_ZTI25TGlxFirstThenLastIterator @ 164 NONAME
+	_ZTI27CGlxDefaultAttributeContext @ 165 NONAME
+	_ZTI27CGlxDefaultThumbnailContext @ 166 NONAME
+	_ZTI28TGlxFromFocusOutwardIterator @ 167 NONAME
+	_ZTI33TGlxFromManualIndexBlockyIterator @ 168 NONAME
+	_ZTI34TGlxFromFocusOutwardBlockyIterator @ 169 NONAME
+	_ZTI34TGlxFromIndexOutwardBlockyIterator @ 170 NONAME
+	_ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 171 NONAME
+	_ZTV13CGlxMediaList @ 172 NONAME
+	_ZTV14CGlxListWindow @ 173 NONAME
+	_ZTV15CGlxImageReader @ 174 NONAME
+	_ZTV16CGlxCacheManager @ 175 NONAME
+	_ZTV20CGlxAttributeContext @ 176 NONAME
+	_ZTV20CGlxGarbageCollector @ 177 NONAME
+	_ZTV20CGlxThumbnailContext @ 178 NONAME
+	_ZTV21TGlxExclusionIterator @ 179 NONAME
+	_ZTV21TGlxSelectionIterator @ 180 NONAME
+	_ZTV22TGlxSequentialIterator @ 181 NONAME
+	_ZTV22TGlxSpecificIdIterator @ 182 NONAME
+	_ZTV25TGlxFirstThenLastIterator @ 183 NONAME
+	_ZTV27CGlxDefaultAttributeContext @ 184 NONAME
+	_ZTV27CGlxDefaultThumbnailContext @ 185 NONAME
+	_ZTV28TGlxFromFocusOutwardIterator @ 186 NONAME
+	_ZTV33TGlxFromManualIndexBlockyIterator @ 187 NONAME
+	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 188 NONAME
+	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 189 NONAME
+	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 190 NONAME
 
--- a/photosgallery/viewframework/plugins/fullscreenviewplugin/data/glxfullscreenviewdata.rss	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/fullscreenviewplugin/data/glxfullscreenviewdata.rss	Tue Feb 02 00:10:37 2010 +0200
@@ -145,8 +145,7 @@
                             txt = qtn_lgal_options_slideshow; 
                             cascade = r_glx_fullscreen_shw_menu;},
                 MENU_ITEM { command = EGlxCmdAiwEdit; 
-                            txt = qtn_lgal_options_edit; 
-                            cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE; },
+                            txt = qtn_lgal_options_edit; },
                 MENU_ITEM { command = EGlxCmdDetails;
                             txt = qtn_lgal_options_details; },  
                 MENU_ITEM { command = EGlxCmdAddToAlbum;
@@ -200,8 +199,7 @@
                         txt = qtn_lgal_options_slideshow; 
                         cascade = r_glx_fullscreen_shw_menu;},
             MENU_ITEM { command = EGlxCmdAiwEdit; 
-                        txt = qtn_lgal_options_edit; 
-                        cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE; },
+                        txt = qtn_lgal_options_edit; },
             MENU_ITEM { command = EGlxCmdDetails;
                         txt = qtn_lgal_options_details; },  
             MENU_ITEM { command = EGlxCmdAddToAlbum;
@@ -254,8 +252,7 @@
                        txt = qtn_lgal_options_slideshow; 
                        cascade = r_glx_fullscreen_shw_menu;},
            MENU_ITEM { command = EGlxCmdAiwEdit; 
-                       txt = qtn_lgal_options_edit; 
-                       cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE; },
+                       txt = qtn_lgal_options_edit; },
            MENU_ITEM { command = EGlxCmdDetails;
                        txt = qtn_lgal_options_details; },  
            MENU_ITEM { command = EGlxCmdAddToAlbum;
@@ -363,7 +360,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON
--- a/photosgallery/viewframework/plugins/fullscreenviewpluginbase/bwins/glxfullscreenviewpluginbaseu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/fullscreenviewpluginbase/bwins/glxfullscreenviewpluginbaseu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,11 +1,7 @@
 EXPORTS
 	?AddCommandHandlersL@CGlxFullScreenViewPluginBase@@MAEXXZ @ 1 NONAME ; void CGlxFullScreenViewPluginBase::AddCommandHandlersL(void)
-	?GetResourceFilenameL@CGlxFullScreenViewPluginBase@@MAEXAAV?$TBuf@$0BAA@@@@Z @ 2 NONAME ; void CGlxFullScreenViewPluginBase::GetResourceFilenameL(class TBuf<256> &)
-	?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 3 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
-	?ImageFileHandle@CGlxImageViewerManager@@QBEAAVRFile64@@XZ @ 4 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void) const
-	?IncrementRefCount@CGlxImageViewerManager@@QAEXXZ @ 5 NONAME ; void CGlxImageViewerManager::IncrementRefCount(void)
-	??1CGlxFullScreenViewPluginBase@@UAE@XZ @ 6 NONAME ; CGlxFullScreenViewPluginBase::~CGlxFullScreenViewPluginBase(void)
-	??0CGlxFullScreenViewPluginBase@@QAE@XZ @ 7 NONAME ; CGlxFullScreenViewPluginBase::CGlxFullScreenViewPluginBase(void)
-	?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 8 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
-	?ConstructViewLC@CGlxFullScreenViewPluginBase@@MAEPAVCAknView@@XZ @ 9 NONAME ; class CAknView * CGlxFullScreenViewPluginBase::ConstructViewLC(void)
+	??1CGlxFullScreenViewPluginBase@@UAE@XZ @ 2 NONAME ; CGlxFullScreenViewPluginBase::~CGlxFullScreenViewPluginBase(void)
+	??0CGlxFullScreenViewPluginBase@@QAE@XZ @ 3 NONAME ; CGlxFullScreenViewPluginBase::CGlxFullScreenViewPluginBase(void)
+	?GetResourceFilenameL@CGlxFullScreenViewPluginBase@@MAEXAAV?$TBuf@$0BAA@@@@Z @ 4 NONAME ; void CGlxFullScreenViewPluginBase::GetResourceFilenameL(class TBuf<256> &)
+	?ConstructViewLC@CGlxFullScreenViewPluginBase@@MAEPAVCAknView@@XZ @ 5 NONAME ; class CAknView * CGlxFullScreenViewPluginBase::ConstructViewLC(void)
 
--- a/photosgallery/viewframework/plugins/fullscreenviewpluginbase/eabi/glxfullscreenviewpluginbaseu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/fullscreenviewpluginbase/eabi/glxfullscreenviewpluginbaseu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -1,16 +1,12 @@
 EXPORTS
-	_ZN22CGlxImageViewerManager17IncrementRefCountEv @ 1 NONAME
-	_ZN22CGlxImageViewerManager8ImageUriEv @ 2 NONAME
-	_ZN22CGlxImageViewerManager9IsPrivateEv @ 3 NONAME
-	_ZN28CGlxFullScreenViewPluginBase15ConstructViewLCEv @ 4 NONAME
-	_ZN28CGlxFullScreenViewPluginBase19AddCommandHandlersLEv @ 5 NONAME
-	_ZN28CGlxFullScreenViewPluginBase20GetResourceFilenameLER4TBufILi256EE @ 6 NONAME
-	_ZN28CGlxFullScreenViewPluginBaseC1Ev @ 7 NONAME
-	_ZN28CGlxFullScreenViewPluginBaseC2Ev @ 8 NONAME
-	_ZN28CGlxFullScreenViewPluginBaseD0Ev @ 9 NONAME
-	_ZN28CGlxFullScreenViewPluginBaseD1Ev @ 10 NONAME
-	_ZN28CGlxFullScreenViewPluginBaseD2Ev @ 11 NONAME
-	_ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 12 NONAME
-	_ZTI28CGlxFullScreenViewPluginBase @ 13 NONAME
-	_ZTV28CGlxFullScreenViewPluginBase @ 14 NONAME
+	_ZN28CGlxFullScreenViewPluginBase15ConstructViewLCEv @ 1 NONAME
+	_ZN28CGlxFullScreenViewPluginBase19AddCommandHandlersLEv @ 2 NONAME
+	_ZN28CGlxFullScreenViewPluginBase20GetResourceFilenameLER4TBufILi256EE @ 3 NONAME
+	_ZN28CGlxFullScreenViewPluginBaseC1Ev @ 4 NONAME
+	_ZN28CGlxFullScreenViewPluginBaseC2Ev @ 5 NONAME
+	_ZN28CGlxFullScreenViewPluginBaseD0Ev @ 6 NONAME
+	_ZN28CGlxFullScreenViewPluginBaseD1Ev @ 7 NONAME
+	_ZN28CGlxFullScreenViewPluginBaseD2Ev @ 8 NONAME
+	_ZTI28CGlxFullScreenViewPluginBase @ 9 NONAME
+	_ZTV28CGlxFullScreenViewPluginBase @ 10 NONAME
 
--- a/photosgallery/viewframework/plugins/fullscreenviewpluginbase/src/glxfullscreenviewpluginbase.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/fullscreenviewpluginbase/src/glxfullscreenviewpluginbase.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -211,7 +211,7 @@
                                 NewL(iFullScreenView, iResourceIds.iMenuId));
     GLX_LOG_INFO("Adding CGlxCommandHandlerAiwEdit");
     iFullScreenView->AddCommandHandlerL(CGlxCommandHandlerAiwEdit::
-                                NewL(iFullScreenView, iResourceIds.iMenuId));
+                                NewL(iFullScreenView));
     GLX_LOG_INFO("Adding CGlxCommandHandlerAiwPrintPreview");
     iFullScreenView->AddCommandHandlerL(CGlxCommandHandlerAiwPrintPreview::
                                 NewL(iFullScreenView, iResourceIds.iMenuId));
--- a/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss	Tue Feb 02 00:10:37 2010 +0200
@@ -152,11 +152,9 @@
                               txt = qtn_lgal_options_slideshow;
                               cascade = r_grid_shw_menu; },
                   MENU_ITEM { command = EGlxCmdAiwEdit; 
-                              txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;}, 
+                              txt = qtn_lgal_options_edit; }, 
                   MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                               txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
                               flags = EEikMenuItemSpecificListQuery;}, 
                   MENU_ITEM { command = EGlxCmdDetails;
                               txt = qtn_lgal_options_details; },    
@@ -229,11 +227,9 @@
                               txt = qtn_lgal_options_slideshow;
                               cascade = r_grid_shw_menu; },
                   MENU_ITEM { command = EGlxCmdAiwEdit; 
-                              txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;}, 
+                              txt = qtn_lgal_options_edit; }, 
                   MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                               txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
                               flags = EEikMenuItemSpecificListQuery;}, 
                   MENU_ITEM { command = EGlxCmdDetails;
                               txt = qtn_lgal_options_details; },    
@@ -303,11 +299,9 @@
                     txt = qtn_lgal_options_slideshow;
                     cascade = r_grid_shw_menu; },
         MENU_ITEM { command = EGlxCmdAiwEdit; 
-                    txt = qtn_lgal_options_edit; 
-                    cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;}, 
+                    txt = qtn_lgal_options_edit; }, 
         MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                     txt = qtn_lgal_options_edit; 
-                    cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
                     flags = EEikMenuItemSpecificListQuery;}, 
         MENU_ITEM { command = EGlxCmdDetails;
                     txt = qtn_lgal_options_details; },    
@@ -506,7 +500,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON
@@ -529,7 +523,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON
--- a/photosgallery/viewframework/plugins/gridviewpluginbase/src/glxgridviewpluginbase.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/gridviewpluginbase/src/glxgridviewpluginbase.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -164,11 +164,12 @@
                                 NewL(iGridView, iResourceIds.iMenuId));
     GLX_LOG_INFO("Adding CGlxCommandHandlerAiwEdit");
     iGridView->AddCommandHandlerL(CGlxCommandHandlerAiwEdit::
-                                NewL(iGridView, iResourceIds.iMenuId));
+                                NewL(iGridView));
     
     GLX_LOG_INFO("Adding CGlxCommandHandlerAiwEdit-Single Click");
     iGridView->AddCommandHandlerL(CGlxCommandHandlerAiwEdit::
-                                NewL(iGridView, iResourceIds.iMenuId, ETrue));
+                                NewL(iGridView, ETrue));
+
     GLX_LOG_INFO("Adding CGlxCommandHandlerAiwPrintPreview");
     iGridView->AddCommandHandlerL(CGlxCommandHandlerAiwPrintPreview::
                                 NewL(iGridView, iResourceIds.iMenuId));
--- a/photosgallery/viewframework/plugins/listviewplugin/data/glxlistviewplugin.rss	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/listviewplugin/data/glxlistviewplugin.rss	Tue Feb 02 00:10:37 2010 +0200
@@ -161,7 +161,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON
@@ -183,7 +183,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON
--- a/photosgallery/viewframework/tvout/bwins/glxtvoutu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/bwins/glxtvoutu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -2,12 +2,13 @@
 	?ScreenSizeL@CGlxTv@@QBE?AVTSize@@XZ @ 1 NONAME ; class TSize CGlxTv::ScreenSizeL(void) const
 	??1CGlxTv@@UAE@XZ @ 2 NONAME ; CGlxTv::~CGlxTv(void)
 	??1CGlxHdmiController@@UAE@XZ @ 3 NONAME ; CGlxHdmiController::~CGlxHdmiController(void)
-	?IsWidescreen@CGlxTv@@QBEHXZ @ 4 NONAME ; int CGlxTv::IsWidescreen(void) const
-	?IsConnected@CGlxTv@@QBEHXZ @ 5 NONAME ; int CGlxTv::IsConnected(void) const
+	?SetImageL@CGlxHdmiController@@QAEXABVTDesC16@@VTSize@@HH@Z @ 4 NONAME ; void CGlxHdmiController::SetImageL(class TDesC16 const &, class TSize, int, int)
+	?IsWidescreen@CGlxTv@@QBEHXZ @ 5 NONAME ; int CGlxTv::IsWidescreen(void) const
 	?NewL@CGlxTv@@SAPAV1@AAVMGlxTvObserver@@@Z @ 6 NONAME ; class CGlxTv * CGlxTv::NewL(class MGlxTvObserver &)
-	?IsVideo@CGlxHdmiController@@QAEXXZ @ 7 NONAME ; void CGlxHdmiController::IsVideo(void)
-	?NewL@CGlxHdmiController@@SAPAV1@ABVTDesC16@@@Z @ 8 NONAME ; class CGlxHdmiController * CGlxHdmiController::NewL(class TDesC16 const &)
-	?SetImageL@CGlxHdmiController@@QAEXABVTDesC16@@VTSize@@H@Z @ 9 NONAME ; void CGlxHdmiController::SetImageL(class TDesC16 const &, class TSize, int)
-	?ActivateZoom@CGlxHdmiController@@QAEXXZ @ 10 NONAME ; void CGlxHdmiController::ActivateZoom(void)
-	?DeactivateZoom@CGlxHdmiController@@QAEXXZ @ 11 NONAME ; void CGlxHdmiController::DeactivateZoom(void)
+	?IsConnected@CGlxTv@@QBEHXZ @ 7 NONAME ; int CGlxTv::IsConnected(void) const
+	?IsVideo@CGlxHdmiController@@QAEXXZ @ 8 NONAME ; void CGlxHdmiController::IsVideo(void)
+	?NewL@CGlxHdmiController@@SAPAV1@ABVTDesC16@@@Z @ 9 NONAME ; class CGlxHdmiController * CGlxHdmiController::NewL(class TDesC16 const &)
+	?IsHDMIConnected@CGlxTv@@QBEHXZ @ 10 NONAME ; int CGlxTv::IsHDMIConnected(void) const
+	?ActivateZoom@CGlxHdmiController@@QAEXXZ @ 11 NONAME ; void CGlxHdmiController::ActivateZoom(void)
+	?DeactivateZoom@CGlxHdmiController@@QAEXXZ @ 12 NONAME ; void CGlxHdmiController::DeactivateZoom(void)
 
--- a/photosgallery/viewframework/tvout/eabi/glxtvoutu.def	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/eabi/glxtvoutu.def	Tue Feb 02 00:10:37 2010 +0200
@@ -3,7 +3,7 @@
 	_ZN18CGlxHdmiController14DeactivateZoomEv @ 2 NONAME
 	_ZN18CGlxHdmiController4NewLERK7TDesC16 @ 3 NONAME
 	_ZN18CGlxHdmiController7IsVideoEv @ 4 NONAME
-	_ZN18CGlxHdmiController9SetImageLERK7TDesC165TSizei @ 5 NONAME
+	_ZN18CGlxHdmiController9SetImageLERK7TDesC165TSizeii @ 5 NONAME
 	_ZN18CGlxHdmiControllerD0Ev @ 6 NONAME
 	_ZN18CGlxHdmiControllerD1Ev @ 7 NONAME
 	_ZN18CGlxHdmiControllerD2Ev @ 8 NONAME
@@ -14,12 +14,13 @@
 	_ZNK6CGlxTv11IsConnectedEv @ 13 NONAME
 	_ZNK6CGlxTv11ScreenSizeLEv @ 14 NONAME
 	_ZNK6CGlxTv12IsWidescreenEv @ 15 NONAME
-	_ZTI17CGlxHdmiContainer @ 16 NONAME
-	_ZTI17CGlxHdmiDecoderAO @ 17 NONAME
-	_ZTI18CGlxHdmiController @ 18 NONAME
-	_ZTI22CGlxHdmiSurfaceUpdater @ 19 NONAME
-	_ZTV17CGlxHdmiContainer @ 20 NONAME
-	_ZTV17CGlxHdmiDecoderAO @ 21 NONAME
-	_ZTV18CGlxHdmiController @ 22 NONAME
-	_ZTV22CGlxHdmiSurfaceUpdater @ 23 NONAME
+	_ZNK6CGlxTv15IsHDMIConnectedEv @ 16 NONAME
+	_ZTI17CGlxHdmiContainer @ 17 NONAME
+	_ZTI17CGlxHdmiDecoderAO @ 18 NONAME
+	_ZTI18CGlxHdmiController @ 19 NONAME
+	_ZTI22CGlxHdmiSurfaceUpdater @ 20 NONAME
+	_ZTV17CGlxHdmiContainer @ 21 NONAME
+	_ZTV17CGlxHdmiDecoderAO @ 22 NONAME
+	_ZTV18CGlxHdmiController @ 23 NONAME
+	_ZTV22CGlxHdmiSurfaceUpdater @ 24 NONAME
 
--- a/photosgallery/viewframework/tvout/inc/glxhdmicontroller.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/inc/glxhdmicontroller.h	Tue Feb 02 00:10:37 2010 +0200
@@ -50,7 +50,7 @@
      * @param3 - frame count
      */
     IMPORT_C void SetImageL(const TDesC& aImageFile,TSize aImageDimensions, 
-            TInt aFrameCount);
+            TInt aFrameCount, TBool aStore = ETrue);
 
     /*
      * To Determine it is a video and not image 
@@ -118,6 +118,8 @@
     CGlxHdmiContainer*      iHdmiContainer;
     CGlxHdmiSurfaceUpdater* iSurfaceUpdater;
     CGlxTv*  iGlxTvOut;
+    TBool iIsHDMIconnected;
+    TBool iIsHDMIdisConnected;
     };
 
 #endif /* GLXHDMICONTROLLER_H_ */
--- a/photosgallery/viewframework/tvout/inc/glxtv.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/inc/glxtv.h	Tue Feb 02 00:10:37 2010 +0200
@@ -107,7 +107,7 @@
     IMPORT_C TSize ScreenSizeL() const;
    
     /**
-     * Is the TV Connected
+     * Is the Analog TV Connected
      * @return ETrue if active, otherwise EFalse
      */
     IMPORT_C TBool IsConnected() const; 
@@ -118,6 +118,11 @@
      */
     IMPORT_C TBool IsWidescreen() const; 
     
+    /**
+     * Is the HDMI TV Connected
+     * @return ETrue if active, otherwise EFalse
+     */
+    IMPORT_C TBool IsHDMIConnected() const;
     
 public: // from MGlxWindowVisibilityObserver
     /**
--- a/photosgallery/viewframework/tvout/inc/glxtvconnectionmonitor.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/inc/glxtvconnectionmonitor.h	Tue Feb 02 00:10:37 2010 +0200
@@ -76,6 +76,12 @@
      */
     TBool IsConnected() const;
 
+    /*
+     * Provides the caller with the current HDMI connetion state
+     * @return The HDMI connection state
+     */
+    TBool IsHDMIConnected() const;
+
 
 private: // From CActive
     /**
@@ -112,9 +118,12 @@
     // Not owned: TV connection observer
     MGlxTvConnectionObserver& iConnectionObserver;
 
-    // The Connection state 
-    TBool iConnectionState;
+    // TVout The Connection state 
+    TBool iTvOutConnectionState;
     
+    // TVout The Connection state 
+    TBool iHDMIConnectionState;
+
     // The (external device) Accessory Server
     RAccessoryServer iTvAccServer;
     
--- a/photosgallery/viewframework/tvout/src/glxhdmicontroller.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxhdmicontroller.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -63,15 +63,19 @@
 // Setting an Image Path 
 // -----------------------------------------------------------------------------
 EXPORT_C void CGlxHdmiController::SetImageL(const TDesC& aImageFile,
-        TSize aImageDimensions, TInt aFrameCount)
+        TSize aImageDimensions, TInt aFrameCount, TBool aStore)
     {
     TRACER("CGlxHdmiController::SetImageL()");
-    StoreImageInfoL(aImageFile, aImageDimensions, aFrameCount);
-    if (iGlxTvOut->IsConnected())
+    if (aStore)
+        StoreImageInfoL(aImageFile, aImageDimensions, aFrameCount);
+		
+    if (iGlxTvOut->IsHDMIConnected())
         {
+        iIsHDMIconnected = ETrue;
         if(aImageDimensions.iHeight<=KHdTvHeight && 
                 aImageDimensions.iWidth<= KHdTvWidth && aFrameCount > 0)
             {
+            GLX_LOG_INFO("CGlxHdmiController::SetImageL() - 1");
             DestroySurfaceUpdater();
             if (!iHdmiContainer)
                 {
@@ -81,6 +85,7 @@
             }
         else
             {
+            GLX_LOG_INFO("CGlxHdmiController::SetImageL() - 2");
             // do not close the surface , use the same surface instead.
             // Call a function to pass imagefile, imagedimension, framecount
             if (!iHdmiContainer)
@@ -95,6 +100,7 @@
                 }
             else
                 {
+                GLX_LOG_INFO("CGlxHdmiController::SetImageL() - 3");
                 iSurfaceUpdater->UpdateNewImageL(aImageFile, aFrameCount);
                 }
             iHdmiContainer->DrawNow();
@@ -108,7 +114,7 @@
 EXPORT_C void CGlxHdmiController::IsVideo()
     {
     TRACER("CGlxHdmiController::IsVideo()");
-    if (iGlxTvOut->IsConnected())
+    if (iGlxTvOut->IsHDMIConnected())
         {
         DestroySurfaceUpdater();
         }
@@ -121,7 +127,7 @@
 EXPORT_C void CGlxHdmiController::ActivateZoom()
     {
     TRACER("CGlxHdmiController::ActivateZoom()");
-    if (iGlxTvOut->IsConnected())
+    if (iGlxTvOut->IsHDMIConnected())
         {
         iSurfaceUpdater->ActivateZoom();
         }
@@ -133,7 +139,7 @@
 EXPORT_C void CGlxHdmiController::DeactivateZoom()
     {
     TRACER("CGlxHdmiController::DeactivateZoom()");
-    if (iGlxTvOut->IsConnected())
+    if (iGlxTvOut->IsHDMIConnected())
         {
         iSurfaceUpdater->DeactivateZoom();
         }
@@ -155,6 +161,8 @@
     {
     TRACER("CGlxHdmiController::ConstructL()");
     iGlxTvOut = CGlxTv::NewL(*this);
+    iIsHDMIconnected = EFalse;
+    iIsHDMIdisConnected = EFalse;
     }
 
 // -----------------------------------------------------------------------------
@@ -231,18 +239,27 @@
 void CGlxHdmiController::HandleTvStatusChangedL( TTvChangeType aChangeType )
     {
     TRACER("CGlxHdmiController::HandleTvStatusChangedL()");
-    if ( aChangeType == ETvConnectionChanged )          
+    if(iIsHDMIdisConnected)
         {
-        if ( iGlxTvOut->IsConnected() )
+        iIsHDMIdisConnected = EFalse;
+        }
+    else if ( aChangeType == ETvConnectionChanged )          
+        {
+        if ( iGlxTvOut->IsHDMIConnected() )
             {
             GLX_LOG_INFO("CGlxHdmiController::HandleTvStatusChangedL() - HDMI Connected");
             // Calling SetImageL() with appropriate parameters
-            SetImageL(iStoredImagePath->Des(), iImageDimensions, iFrameCount);
+            if(!iIsHDMIconnected)
+                {
+                SetImageL(iStoredImagePath->Des(), iImageDimensions, iFrameCount, EFalse);
+                }
             }
         else
             {
             // if it gets disconnected, destroy the surface 
             GLX_LOG_INFO("CGlxHdmiController::HandleTvStatusChangedL() - HDMI Not Connected");
+            iIsHDMIconnected = EFalse;
+            iIsHDMIdisConnected = ETrue;
             DestroySurfaceUpdater();
             }
         }
--- a/photosgallery/viewframework/tvout/src/glxhdmisurfaceupdater.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxhdmisurfaceupdater.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -61,10 +61,10 @@
     TRACER("CGlxHdmiSurfaceUpdater::~CGlxHdmiSurfaceUpdater()");
     ReleaseContent();
     if(iTimer->IsActive())
-         {
-         iTimer->Cancel();
-         }
-     delete iTimer;   
+        {
+        iTimer->Cancel();
+        }
+    delete iTimer;   
     if (iGlxDecoderAO)
         {
         delete iGlxDecoderAO;
@@ -145,9 +145,9 @@
     CreateBitmapL();
     CreateHdmiL();
     error = iSurfUpdateSession.Connect();
-    #ifdef _DEBUG
+#ifdef _DEBUG
     iStartTime.HomeTime();
-    #endif
+#endif
     //to refresh the HD screen for the first time.
     iFirstTime = ETrue;
     //start decoding the image    
@@ -175,9 +175,9 @@
     CreateImageDecoderL(aImageFile);    
     CreateBitmapL();
     CreateHdmiL(EFalse);
-    #ifdef _DEBUG
+#ifdef _DEBUG
     iStartTime.HomeTime();
-    #endif
+#endif
     //start decoding the image
     iGlxDecoderAO->ConvertImageL(*iDecodedBitmap,0,iImageDecoder);
     }
@@ -238,10 +238,13 @@
         GLX_LOG_INFO1("CGlxHdmiSurfaceUpdater::CreateSurfaceL, Creating surface failed with error : %d",error);
         User::LeaveIfError(error);
         }    
-    //Map the surface and stire the surface info
+    //Map the surface and stride the surface info
     MapSurfaceL();
     }
 
+// -----------------------------------------------------------------------------
+// MapSurfaceL 
+// -----------------------------------------------------------------------------
 void CGlxHdmiSurfaceUpdater::MapSurfaceL()
     {
     TRACER("CGlxHdmiSurfaceUpdater::MapSurfaceL()");
@@ -283,11 +286,11 @@
     SwapBuffers();   
     iCallBack->DoGenCallback();       
     if(iFirstTime)  
-	{
-	iFirstTime = EFalse;
-	iWindow->RemoveBackgroundSurface(ETrue);
-	iWindow->SetBackgroundSurface(iSurfId);
-	}
+        {
+        iFirstTime = EFalse;
+        iWindow->RemoveBackgroundSurface(ETrue);
+        iWindow->SetBackgroundSurface(iSurfId);
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -356,22 +359,22 @@
 void CGlxHdmiSurfaceUpdater::HandleRunL()
     {
     TRACER("CGlxHdmiSurfaceUpdater::HandleRunL()");
-    
-    #ifdef _DEBUG
+
+#ifdef _DEBUG
     iStopTime.HomeTime();
     GLX_LOG_INFO1("CGlxHdmiSurfaceUpdater::HandleRunL() ConvertImageL took"
-                " <%d> us", (TInt)iStopTime.MicroSecondsFrom(iStartTime).Int64());
-    #endif
-    
+            " <%d> us", (TInt)iStopTime.MicroSecondsFrom(iStartTime).Int64());
+#endif
+
     iZoomRectSz = iDecodedBitmap->SizeInPixels(); 
     if (iSurfBufferAO->iStatus != KRequestPending && !iSurfBufferAO->IsActive())
-           {
-           Refresh();              
-           iSurfBufferAO->iStatus = KRequestPending;
-           iSurfBufferAO->SetActive();    
-           iSurfUpdateSession.NotifyWhenAvailable(iSurfBufferAO->iStatus);
-           TInt err = iSurfUpdateSession.SubmitUpdate(1, iSurfId, 0, NULL);       
-           }
+        {
+        Refresh();              
+        iSurfBufferAO->iStatus = KRequestPending;
+        iSurfBufferAO->SetActive();    
+        iSurfUpdateSession.NotifyWhenAvailable(iSurfBufferAO->iStatus);
+        TInt err = iSurfUpdateSession.SubmitUpdate(1, iSurfId, 0, NULL);       
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -466,7 +469,6 @@
         GLX_LOG_INFO2("CGlxHdmiSurfaceUpdater::Zoom()--- 4,iZoomRectSz.iWidth = %d, iZoomRectSz.iHeight = %d", iZoomRectSz.iWidth,iZoomRectSz.iHeight);
         iConfig.SetViewport(TRect(iLeftCornerForZoom.iX,iLeftCornerForZoom.iY,iZoomRectSz.iWidth,iZoomRectSz.iHeight));
         }
-    TSize bitmapsize = iDecodedBitmap->SizeInPixels();
-    iConfig.SetExtent(TRect(0,0,bitmapsize.iWidth,bitmapsize.iHeight));    
+    iConfig.SetExtent(TRect(0,0,KHdTvWidth,KHdTvHeight));    
     iWindow->SetBackgroundSurface(iConfig, ETrue);   
     }
--- a/photosgallery/viewframework/tvout/src/glxtv.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxtv.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -318,7 +318,7 @@
 
 
 //-----------------------------------------------------------------------------
-// Is the TV Connected
+// Is the analog TV Connected
 //-----------------------------------------------------------------------------
 //
 EXPORT_C TBool CGlxTv::IsConnected() const
@@ -328,6 +328,15 @@
     }
     
     
+//-----------------------------------------------------------------------------
+// Is the HDMI TV Connected
+//-----------------------------------------------------------------------------
+//
+EXPORT_C TBool CGlxTv::IsHDMIConnected() const
+    {
+    TRACER("CGlxTv::IsHDMIConnected()");
+    return iTvConnectionMonitor->IsHDMIConnected();
+    }
     
 //-----------------------------------------------------------------------------
 // Is the TV widescreen
--- a/photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -86,8 +86,9 @@
     User::LeaveIfError( iTvAccServer.Connect() );
     User::LeaveIfError( iTvAccMode.CreateSubSession( iTvAccServer ) );
     User::LeaveIfError( iTvAccMode.GetAccessoryMode( iCurrentAccMode ) );
-    iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut 
-                            || iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
+    iTvOutConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut);
+    iHDMIConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
+    
     IssueRequest();  
     }
 
@@ -140,9 +141,19 @@
 TBool CGlxTvConnectionMonitor::IsConnected() const
     {
     GLX_LOG_INFO("CGlxTvConnectionMonitor::IsConnected");
-    return iConnectionState;
+    return iTvOutConnectionState;
     }
 
+//-----------------------------------------------------------------------------
+// Is the TV out cable connected
+// IsConnected
+//-----------------------------------------------------------------------------
+//
+TBool CGlxTvConnectionMonitor::IsHDMIConnected() const
+    {
+    GLX_LOG_INFO("CGlxTvConnectionMonitor::IsHDMIConnected");
+    return iHDMIConnectionState;
+    }
 
 //-----------------------------------------------------------------------------
 // Request accessory server events
@@ -166,8 +177,8 @@
 void CGlxTvConnectionMonitor::IssueNotificationL()
     {
     GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueNotificationL");
-    iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut || 
-            iCurrentAccMode.iAccessoryMode == EAccModeHDMI );
+    iTvOutConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut);
+    iHDMIConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
     iConnectionObserver.HandleTvConnectionStatusChangedL();
     }
 
--- a/photosgallery/viewframework/uiutilities/data/glxuiutilities.rss	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/uiutilities/data/glxuiutilities.rss	Tue Feb 02 00:10:37 2010 +0200
@@ -32,6 +32,10 @@
 #include "glxutilities.hrh"
 #include <glxcommandhandlers.hrh>
 
+#if defined(FF_IMAGE_EDITOR) || defined(FF_VIDEO_EDITOR)
+#include <bldnokia.hrh> //for Editor feature flags
+#endif
+
 NAME GLXR    // 4 letter ID
 
 //  RESOURCE DEFINITIONS
@@ -451,6 +455,21 @@
 // AIW interest structure for assign
 //
 // -----------------------------------------------------------------------------
+#if defined(FF_IMAGE_EDITOR) || defined(FF_VIDEO_EDITOR)
+RESOURCE AIW_INTEREST r_glx_aiw_assign_to_contact_interest
+    {
+    items=
+        {
+        AIW_CRITERIA_ITEM
+            {
+            id = EGlxCmdAiwAssign;
+            serviceCmd = KAiwCmdAssign;
+            contentType = "ArcsoftEditor/*";
+            serviceClass = KAiwClassMenu;
+            }
+        };
+    }
+#else
 RESOURCE AIW_INTEREST r_glx_aiw_assign_to_contact_interest
     {
     items=
@@ -465,6 +484,7 @@
             }
         };
     }
+#endif
 
 // -----------------------------------------------------------------------------
 //
--- a/photosgallery/viewframework/views/cloudview/inc/glxcloudviewcontrol.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/views/cloudview/inc/glxcloudviewcontrol.h	Tue Feb 02 00:10:37 2010 +0200
@@ -35,7 +35,7 @@
 #include <alf/alfeventhandler.h>
 
 #include <AknLayout2Def.h>
-#include <AknPhysicsObserverIface.h> //Physics - Kinetic scrolling listener
+#include <aknphysicsobserveriface.h> //Physics - Kinetic scrolling listener
 using namespace Alf;
 
 
--- a/photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -707,7 +707,6 @@
     ActivateFullScreenL(); 
     if(iZoomControl->Activated())
         {
-        iHdmiController->DeactivateZoom();
         iZoomControl->Deactivate();
         }
     //Once into fullscreen view,show the screen furniture
--- a/photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -161,7 +161,7 @@
         iUiUtility->SetViewNavigationDirection(EGlxNavigationForwards); 
         }
 
-    if ( EGlxCmdOptions == aCommand )
+    if ( EAknSoftkeyOptions == aCommand )
         {
         FetchAttributesL();
         // Open the options menu properly
--- a/photosgallery/viewframework/views/zoomview/inc/glxzoomcontrol.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/views/zoomview/inc/glxzoomcontrol.h	Tue Feb 02 00:10:37 2010 +0200
@@ -252,6 +252,7 @@
     CGlxTv*  iGlxTvOut;
     CPeriodic* iTimer;
     TBool iZoomIn;
+    TBool iIsHDMIconnected;
     };
 
 #endif  // C_GLXZOOMCONTROL_H
--- a/photosgallery/viewframework/views/zoomview/src/glxzoomcontrol.cpp	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/views/zoomview/src/glxzoomcontrol.cpp	Tue Feb 02 00:10:37 2010 +0200
@@ -114,6 +114,8 @@
     // Hide the Zoom at the construction
     ShowZoom(EFalse);
     iZoomActive = EFalse;
+	iIsHDMIconnected = EFalse;
+	
     //To know if HDMi cable is connected.
     iGlxTvOut = CGlxTv::NewL(*this);
     iTimer = CPeriodic::NewL( CActive::EPriorityStandard );
@@ -230,10 +232,12 @@
         iTimer->Cancel();
         }
     delete iTimer;
+
     if(iGlxTvOut)
         {
         delete iGlxTvOut;
         }
+
     if(iEventHandler)
         {
         delete iEventHandler;
@@ -273,6 +277,8 @@
         TInt aFocusIndex, TGlxMedia& aItem, TPoint* aZoomFocus)
     {
     TRACER("CGlxZoomControl::ActivateL()");
+
+    //To know if HDMi cable is connected.
     if ( !iZoomActive )
         {
         //This Varaiable updates that we are in zoom state now.
@@ -286,8 +292,10 @@
                 ScreenSize(),aItem, idspace, this ));
         iImageVisual->SetImage(*iImageTexture);
         
-        if(iGlxTvOut->IsConnected())
+        
+        if(iGlxTvOut->IsHDMIConnected())
             {
+            iIsHDMIconnected = ETrue;
             StartZoomAnimation();
             }
         else
@@ -408,7 +416,8 @@
 EXPORT_C void CGlxZoomControl::Deactivate()
     {
     TRACER("CGlxZoomControl::Deactivate()");
-    
+    iIsHDMIconnected = EFalse;
+
     if ( iZoomActive )
         {
          if(iTimer->IsActive())
@@ -882,9 +891,9 @@
 void CGlxZoomControl::HandleTvStatusChangedL( TTvChangeType aChangeType )
     {
     TRACER("CGlxZoomControl::HandleTvStatusChangedL()");
-    if ( aChangeType == ETvConnectionChanged )          
+    if ( aChangeType == ETvConnectionChanged && !iIsHDMIconnected && iZoomActive)          
         {
-        if ( iGlxTvOut->IsConnected() )
+        if ( iGlxTvOut->IsHDMIConnected() )
             {
             //go to fullscreen.
             HandleZoomOutL(KGlxZoomOutCommand);