Fixed icon name

[Issue#] N/A
[Problem] icon name isn't updated.
[Cause] installer doesn't send icon_path signal to pkgmgr
[Solution] send icon_path signal to pkgmgr for update icon name.
[SCMRequest] N/A

diff --git a/src/jobs/job.cpp b/src/jobs/job.cpp
index a94bc63..ec56d3d 100644 (file)
--- a/src/jobs/job.cpp
+++ b/src/jobs/job.cpp
@@ -95,6 +95,9 @@ void Job::SendFinishedSuccess()
 void Job::SendFinishedFailure()
 {}
 
+void Job::SendProgressIconPath(const std::string &path)
+{}
+
 void Job::SaveExceptionData(const Jobs::JobExceptionBase&)
 {}
 } //namespace Jobs

diff --git a/src/jobs/job.h b/src/jobs/job.h
index c8d35ab..1050cbc 100644 (file)
--- a/src/jobs/job.h
+++ b/src/jobs/job.h
@@ -54,6 +54,7 @@ class Job :
     virtual void SendProgress();
     virtual void SendFinishedSuccess();
     virtual void SendFinishedFailure();
+    virtual void SendProgressIconPath(const std::string &path);
 
     virtual void SaveExceptionData(const Jobs::JobExceptionBase&);
 

diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp
index 1337293..f8dc52d 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.cpp
+++ b/src/jobs/widget_install/job_widget_install.cpp
@@ -792,6 +792,19 @@ void JobWidgetInstall::SendProgress()
     }
 }
 
+void JobWidgetInstall::SendProgressIconPath(const std::string &path)
+{
+    using namespace PackageManager;
+    if (GetProgressFlag() != false) {
+        if (getInstallerStruct().progressCallback != NULL) {
+            // send progress signal of pkgmgr
+            getInstallerStruct().pkgmgrInterface->sendSignal(
+                PKGMGR_ICON_PATH,
+                path);
+        }
+    }
+}
+
 void JobWidgetInstall::SendFinishedSuccess()
 {
     using namespace PackageManager;

diff --git a/src/jobs/widget_install/job_widget_install.h b/src/jobs/widget_install/job_widget_install.h
index a97b8eb..b323cc3 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.h
+++ b/src/jobs/widget_install/job_widget_install.h
@@ -100,6 +100,7 @@ class JobWidgetInstall :
     void SendProgress();
     void SendFinishedSuccess();
     void SendFinishedFailure();
+    void SendProgressIconPath(const std::string &path);
     void SaveExceptionData(const Jobs::JobExceptionBase&);
 };
 } //namespace WidgetInstall

diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp
index 7187b52..298a06d 100644 (file)
--- a/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@ -716,6 +716,10 @@ void TaskManifestFile::generateWidgetIcon(UiApplication & uiApp,
     } else {
         uiApp.addIcon(IconType(iconText));
     }
+    std::ostringstream iconPath;
+    iconPath << GlobalConfig::GetUserWidgetDesktopIconPath() << "/";
+    iconPath << getIconTargetFilename(locale);
+     m_context.job->SendProgressIconPath(iconPath.str());
 }
 
 void TaskManifestFile::setWidgetManifest(Manifest & manifest)

diff --git a/src/pkg-manager/pkgmgr_signal.h b/src/pkg-manager/pkgmgr_signal.h
index 734d77d..638e593 100644 (file)
--- a/src/pkg-manager/pkgmgr_signal.h
+++ b/src/pkg-manager/pkgmgr_signal.h
@@ -35,6 +35,7 @@ namespace PackageManager {
 #define PKGMGR_END_SUCCESS          "ok"
 #define PKGMGR_END_FAILURE          "fail"
 #define PKGMGR_PROGRESS_KEY         "install_percent"
+#define PKGMGR_ICON_PATH            "icon_path"
 
 typedef pkgmgr_installer* PkgmgrHandle;