diff -r a180113055cb -r 83d6a149c755 smf/smfservermodule/smfserver/pluginmgr/smfpluginmanager.cpp --- a/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanager.cpp Thu Sep 23 17:43:31 2010 +0530 +++ b/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanager.cpp Mon Oct 11 21:59:54 2010 +0530 @@ -356,7 +356,6 @@ qDebug()<<"Plugin responseAvailable() failed!!!, error = "<resultsAvailable(sessionId, &arr, retValue); } @@ -471,7 +470,7 @@ tableCreated = query.exec("CREATE TABLE IF NOT EXISTS pluginDetails (" "pluginId TEXT PRIMARY KEY, interfaceName TEXT, serviceProvider TEXT, " - "description TEXT, serviceUrl TEXT, authAppId TEXT)"); + "description TEXT, serviceUrl TEXT, authAppId TEXT, authAppName TEXT)"); // Error - table not created, Plugin Manager might not work properly if(!tableCreated) @@ -545,6 +544,9 @@ // get the service URL QString servURL = plugin->getProviderInfo()->serviceUrl().toString(); + // get the auth application process name + QString authAppName = plugin->getProviderInfo()->authenticationAppName(); + // get the authentication application id QString str; QStringList list; @@ -557,16 +559,19 @@ QSqlQuery rowInsertQuery; // insert into database - bool rowInserted = rowInsertQuery.exec(QString("INSERT INTO pluginDetails VALUES ('%1', " - "'%2', '%3', '%4', '%5', '%6')").arg(id).arg(intfImplemented).arg(serProv) - .arg(desc).arg(servURL).arg(authAppId)); + bool rowInserted = rowInsertQuery.exec(QString("INSERT INTO pluginDetails VALUES (" + "'%1', '%2', '%3', '%4', '%5', '%6', '%7')").arg(id).arg(intfImplemented) + .arg(serProv).arg(desc).arg(servURL).arg(authAppId).arg(authAppName)); if(rowInserted) - qDebug()<getProviderInfo()->authenticationApp(prgm, list, QIODevice::ReadWrite); + authAppName = instance->getProviderInfo()->authenticationAppName(); } unload(instance); @@ -1026,7 +1037,7 @@ // Also add to the database the value newListIterator and aPath QSqlQuery insertRowQuery; bool rowInserted = insertRowQuery.exec(QString("INSERT INTO pluginDetails VALUES " - "('%1', '%2', '%3', '%4')").arg(pluginId).arg(interfaceName).arg(serviceProv).arg(authAppId)); + "('%1', '%2', '%3', '%4', '%5')").arg(pluginId).arg(interfaceName).arg(serviceProv).arg(authAppId).arg(authAppName)); // Error if (!rowInserted) @@ -1133,7 +1144,7 @@ // Query the database for all pluginIDs that implement the given interface QSqlQuery query(QString("SELECT pluginId, interfaceName, serviceProvider, description, " - "serviceUrl FROM pluginDetails where interfaceName = '%1'").arg(aInterface)); + "serviceUrl, authAppId, authAppName FROM pluginDetails where interfaceName = '%1'").arg(aInterface)); while(query.next()) { @@ -1176,6 +1187,20 @@ qDebug()<<" Its url = "<