# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1270575866 -3600
# Node ID ad4c3a8ea851ac8bb51abee54d8007de82eef05a
# Parent  0bc0ea26031e5d6f904dc25445e5cb4f04c6f19e
Add missing IMPORT_C statements, add unfrozen ARMV5 exports to two DEF files

diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/commonui/inc/glxbackservicewrapper.h
--- a/photosgallery/commonui/inc/glxbackservicewrapper.h	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/commonui/inc/glxbackservicewrapper.h	Tue Apr 06 18:44:26 2010 +0100
@@ -41,8 +41,8 @@
      * Two-phased constructors
      * @param aUid client application UID
      */
-    static CGlxBackServiceWrapper* NewL( const TUid aUid );
-    static CGlxBackServiceWrapper* NewLC( const TUid aUid );
+    IMPORT_C static CGlxBackServiceWrapper* NewL( const TUid aUid );
+    IMPORT_C static CGlxBackServiceWrapper* NewLC( const TUid aUid );
     
     /**
     * Destructor.
diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/controllers/imageviewer/inc/glximageviewermanager.h
--- a/photosgallery/controllers/imageviewer/inc/glximageviewermanager.h	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/controllers/imageviewer/inc/glximageviewermanager.h	Tue Apr 06 18:44:26 2010 +0100
@@ -43,7 +43,7 @@
     /**
      * Singleton constructor.
      */
-    static CGlxImageViewerManager* InstanceL();
+    IMPORT_C static CGlxImageViewerManager* InstanceL();
     
 public:
     IMPORT_C HBufC* ImageUri();
diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/viewframework/commandhandlers/commandhandlerbase/inc/glxmpxcommandcommandhandler.h
--- a/photosgallery/viewframework/commandhandlers/commandhandlerbase/inc/glxmpxcommandcommandhandler.h	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/viewframework/commandhandlers/commandhandlerbase/inc/glxmpxcommandcommandhandler.h	Tue Apr 06 18:44:26 2010 +0100
@@ -181,7 +181,7 @@
 
 private:
     /** See @ref CGlxMediaListCommandHandler::DoExecuteL */
-	virtual TBool DoExecuteL(TInt aCommandId, MGlxMediaList& aList);
+	IMPORT_C virtual TBool DoExecuteL(TInt aCommandId, MGlxMediaList& aList);
 
 	/**
 	 * Launch a confirmation note (single or multiple depending on media list selection)
diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/viewframework/commandhandlers/commandhandlerupnp/eabi/glxupnpcommandhandleru.def
--- a/photosgallery/viewframework/commandhandlers/commandhandlerupnp/eabi/glxupnpcommandhandleru.def	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/viewframework/commandhandlers/commandhandlerupnp/eabi/glxupnpcommandhandleru.def	Tue Apr 06 18:44:26 2010 +0100
@@ -3,4 +3,10 @@
 	_ZN15GlxUpnpRenderer6StatusEv @ 2 NONAME
 	_ZN29CGlxCommandHandlerShowViaUpnp4NewLEP21MGlxMediaListProvideri @ 3 NONAME
 	_ZN35CGlxCommandHandlerCopyToHomeNetwork4NewLER21MGlxMediaListProvider @ 4 NONAME
+  _ZN29CGlxCommandHandlerShowViaUpnpD0Ev @ 5 NONAME
+  _ZN29CGlxCommandHandlerShowViaUpnpD1Ev @ 6 NONAME
+  _ZN29CGlxCommandHandlerShowViaUpnpD2Ev @ 7 NONAME
+  _ZN35CGlxCommandHandlerCopyToHomeNetworkD0Ev @ 8 NONAME
+  _ZN35CGlxCommandHandlerCopyToHomeNetworkD1Ev @ 9 NONAME
+  _ZN35CGlxCommandHandlerCopyToHomeNetworkD2Ev @ 10 NONAME
 
diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/viewframework/medialists/eabi/glxmedialistsu.def
--- a/photosgallery/viewframework/medialists/eabi/glxmedialistsu.def	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/viewframework/medialists/eabi/glxmedialistsu.def	Tue Apr 06 18:44:26 2010 +0100
@@ -190,4 +190,9 @@
 	_ZTV34TGlxFromFocusOutwardBlockyIterator @ 189 NONAME
 	_ZTV34TGlxFromIndexOutwardBlockyIterator @ 190 NONAME
 	_ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 191 NONAME
+  _ZNK12CGlxItemList18__DbgTestInvariantEv @ 192 NONAME
+  _ZNK14CGlxListWindow18__DbgTestInvariantEv @ 193 NONAME
+  _ZNK17CGlxNavigableList18__DbgTestInvariantEv @ 194 NONAME
+  _ZNK18CGlxStaticItemList18__DbgTestInvariantEv @ 195 NONAME
+  _ZNK9CGlxMedia18__DbgTestInvariantEv @ 196 NONAME
 
diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/viewframework/plugins/fullscreenviewpluginbase/inc/glxfullscreenviewpluginbase.h
--- a/photosgallery/viewframework/plugins/fullscreenviewpluginbase/inc/glxfullscreenviewpluginbase.h	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/viewframework/plugins/fullscreenviewpluginbase/inc/glxfullscreenviewpluginbase.h	Tue Apr 06 18:44:26 2010 +0100
@@ -62,13 +62,13 @@
      * Override to add command handlers to the view
      *
      */
-virtual void AddCommandHandlersL();
+IMPORT_C virtual void AddCommandHandlersL();
 
     /**
      * Override to define resource file 
      *
      */
-virtual void GetResourceFilenameL(TFileName& aResFile);
+IMPORT_C virtual void GetResourceFilenameL(TFileName& aResFile);
 
 public:
 
diff -r 0bc0ea26031e -r ad4c3a8ea851 photosgallery/viewframework/plugins/gridviewpluginbase/inc/glxgridviewpluginbase.h
--- a/photosgallery/viewframework/plugins/gridviewpluginbase/inc/glxgridviewpluginbase.h	Tue Apr 06 17:25:48 2010 +0100
+++ b/photosgallery/viewframework/plugins/gridviewpluginbase/inc/glxgridviewpluginbase.h	Tue Apr 06 18:44:26 2010 +0100
@@ -62,13 +62,13 @@
      * Override to add command handlers to the view
      *
      */
-virtual void AddCommandHandlersL();
+IMPORT_C virtual void AddCommandHandlersL();
 
     /**
      * Override to define resource file 
      *
      */
-virtual void GetResourceFilenameL(TFileName& aResFile);
+IMPORT_C virtual void GetResourceFilenameL(TFileName& aResFile);
 
 public: