--- a/connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h Tue Jul 13 03:39:25 2010 +0530
+++ b/connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h Fri Jul 23 22:01:55 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 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"
@@ -212,7 +212,7 @@
{
public:
CSConInstApp() {};
- ~CSConInstApp() {};
+ ~CSConInstApp();
CSConInstApp* CopyL();
TFileName iName;
@@ -222,6 +222,7 @@
TInt64 iSize;
TSConAppType iType;
TUid iUid;
+ HBufC* iWidgetBundleId; // Widget bundle identifier like "com.nokia.widget.HelloWorld"
};
//============================================================
--- a/connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp Tue Jul 13 03:39:25 2010 +0530
+++ b/connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp Fri Jul 23 22:01:55 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 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"
@@ -156,6 +156,10 @@
return copy;
}
+CSConInstApp::~CSConInstApp()
+ {
+ delete iWidgetBundleId;
+ }
// -----------------------------------------------------------------------------
// CSConInstApp::Copy()
//
@@ -172,6 +176,14 @@
copy->iSize = iSize;
copy->iType = iType;
copy->iUid = iUid;
+ if ( iWidgetBundleId )
+ {
+ copy->iWidgetBundleId = iWidgetBundleId->AllocL();
+ }
+ else
+ {
+ copy->iWidgetBundleId = NULL;
+ }
return copy;
}
--- a/connectivitymodules/SeCon/group/stubs/secon_stub.pkg Tue Jul 13 03:39:25 2010 +0530
+++ b/connectivitymodules/SeCon/group/stubs/secon_stub.pkg Fri Jul 23 22:01:55 2010 +0530
@@ -17,7 +17,7 @@
&EN
; Header
-#{"Service Controllers"},(0x101F99F6),1,72,0, TYPE=SA
+#{"Service Controllers"},(0x101F99F6),1,73,0, TYPE=SA
; Localised Vendor name
%{"Nokia"}
--- a/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Tue Jul 13 03:39:25 2010 +0530
+++ b/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Fri Jul 23 22:01:55 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 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"
@@ -28,7 +28,7 @@
TARGETTYPE exe
EPOCSTACKSIZE 0x10000
-EPOCHEAPSIZE 0x10000 0x800000
+EPOCHEAPSIZE 0x10000 0x1000000 // heap memory 16MB
UID 0 0x101F99F6
--- a/connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp Tue Jul 13 03:39:25 2010 +0530
+++ b/connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp Fri Jul 23 22:01:55 2010 +0530
@@ -2310,9 +2310,9 @@
if ( aResult->iApps.Count() > 0 )
{
- // 5 * KMaxFileName should be enought
- // ( 4 items of TFileName and uid + type + size + 6* "#" )
- HBufC8* buf = HBufC8::NewLC( 5 * KMaxFileName );
+ // 6 * KMaxFileName should be enought
+ // ( 5 items of TFileName and uid + type + size + 7* "#" )
+ HBufC8* buf = HBufC8::NewLC( 6 * KMaxFileName );
TPtr8 ptrBuf = buf->Des();
aContent->applications = new ( ELeave ) ConML_Applications_t();
@@ -2330,7 +2330,7 @@
aResult->iApps[i]->iName));
CleanupStack::PopAndDestroy(); // BufToDesLC
- // create uid: UID # Type # Size # Version # Vendor # Parent app. name #
+ // create uid: UID # Type # Size # Version # Vendor # Parent app. name # WidgetBundleId #
LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : Create Uid" );
ptrBuf.Copy( UidToDesLC( aResult->iApps[i]->iUid ) );
@@ -2358,6 +2358,13 @@
CleanupStack::PopAndDestroy(); // BufToDesLC
ptrBuf.Append( KSConAppInfoSeparator );
+ if (aResult->iApps[i]->iWidgetBundleId)
+ {
+ ptrBuf.Append( BufToDesLC( *aResult->iApps[i]->iWidgetBundleId ) );
+ CleanupStack::PopAndDestroy(); // BufToDesLC
+ }
+
+ ptrBuf.Append( KSConAppInfoSeparator );
LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : set data" );
app->data->uid = new ( ELeave ) pcdata_t();
Binary file connectivitymodules/SeCon/services/csc/bld/101f99f6.xml has changed
--- a/connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp Tue Jul 13 03:39:25 2010 +0530
+++ b/connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp Fri Jul 23 22:01:55 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 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"
@@ -317,7 +317,7 @@
RWidgetInfoArray widgetInfoArr;
CleanupClosePushL( widgetInfoArr );
widgetSession.InstalledWidgetsL( widgetInfoArr );
-
+ TFileName bundleId;
for ( TInt i = 0; i < widgetInfoArr.Count(); i++ )
{
CWidgetInfo *item = widgetInfoArr[i];
@@ -359,6 +359,9 @@
}
delete propValue;
propValue = NULL;
+ bundleId.Zero();
+ widgetSession.GetWidgetBundleId( item->iUid, bundleId );
+ app->iWidgetBundleId = bundleId.AllocL();
User::LeaveIfError( aListInstApps.iApps.Append( app ) );
CleanupStack::Pop( app ); // ownership transferred, do not delete
--- a/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp Tue Jul 13 03:39:25 2010 +0530
+++ b/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp Fri Jul 23 22:01:55 2010 +0530
@@ -35,6 +35,8 @@
SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore
SOURCEPATH ../data
start resource 20022FBC.rss
@@ -45,4 +47,5 @@
LIBRARY euser.lib ECom.lib efsrv.lib
LIBRARY centralrepository.lib
-LIBRARY commonengine.lib
\ No newline at end of file
+LIBRARY commonengine.lib
+LIBRARY hbcore.lib hbwidgets.lib
\ No newline at end of file
--- a/dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp Tue Jul 13 03:39:25 2010 +0530
+++ b/dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp Fri Jul 23 22:01:55 2010 +0530
@@ -25,6 +25,7 @@
//USER INCLUDES
#include "nsmldsctrldcmoadapter.h"
+#include "hbtextresolversymbian.h"
// CONSTANTS
const TUid KCRUidDSDCMOConfig = { 0x20022FC0 };
@@ -33,9 +34,11 @@
// Name of the Plug-in adapter
_LIT(KNsmlDesktopSyncTitle, "Desktop Sync");
// Description for Desktop Sync adapter
-_LIT(KNsmlDSDCMODescription, "Used to enable/disable the Desktop Sync." ); //use Nsml?????
-// Path used for fetching the string to be displayed
-_LIT( KRuntimeResourceFileName, "z:dcmo.rsc" );
+_LIT(KNsmlDSDCMODescription, "Used to enable/disable the Desktop Sync." );
+// Filename in which title is present
+_LIT( KdcmoResourceFileName, "deviceupdates_" );
+// Path to the translation file
+_LIT( KdcmoResourceFilePath, "z:/resource/qt/translations/" );
// ============================ MEMBER FUNCTIONS ===============================
@@ -215,14 +218,7 @@
//
void CNsmlDsCtrlDCMOAdapter::GetLocalizedNameL (HBufC*& aLocName)
{
- TFileName myFileName;
- TParse parseObj;
- parseObj.Set( KRuntimeResourceFileName(), &KDC_RESOURCE_FILES_DIR,NULL );
- myFileName = parseObj.FullName();
- CStringResourceReader* readPluginName = CStringResourceReader::NewL( myFileName );
- CleanupStack::PushL(readPluginName);
- TPtrC buf;
- buf.Set(readPluginName->ReadResourceString(R_DM_RUN_TIME_VAR_DESKTOP_SYNC));
- aLocName = buf.AllocL() ;
- CleanupStack::PopAndDestroy(readPluginName);
+ TBool result = HbTextResolverSymbian::Init(KdcmoResourceFileName, KdcmoResourceFilePath );
+ _LIT(KTextDesktopSync, "txt_device_update_info_desktop_sync");
+ aLocName = HbTextResolverSymbian::LoadL(KTextDesktopSync);
}