[FIX][setting-backup-and-reset] Fixed dbus message

Change-Id: Icd8caf5e1db63c2e93c0a3668c4f1a8734dc0b97
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c b/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c
index 98fb04e79d8aeff1639043d1df8f96b1d037d3a4..126e1c82c62e5fec08d840bdbd0dde2ac950e1a8 100755 (executable)
--- a/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c
+++ b/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c
@@ -305,8 +305,10 @@ static void _dbus_call_notify_cb(DBusPendingCall *pending, void *popup)
 {
        SETTING_TRACE("dbus call end %p %d", pending,
                                        dbus_pending_call_get_completed(pending));
-       if (TRUE == dbus_pending_call_get_completed(pending))
+       if (TRUE == dbus_pending_call_get_completed(pending)) {
+               SETTING_TRACE_DEBUG("Dbus call completed");
                evas_object_del(popup);
+       }
 }
 
 static void create_transition_popup(SettingBackupReset *sbr)
@@ -367,15 +369,15 @@ static void create_transition_popup(SettingBackupReset *sbr)
                SETTING_TRACE_WARNING("dbus_bus_get() error");
                return;
        }
-       message = dbus_message_new_signal("/com/samsung/factoryreset",
-                       "com.samsung.factoryreset.start",
+       message = dbus_message_new_signal("/org/tizen/factoryreset",
+                       "org.tizen.factoryreset.start",
                        "setting");
        if (!message) {
                SETTING_TRACE_WARNING("dbus_message_new_signal() error");
                dbus_connection_unref(conn);
                return;
        }
-       dbus_message_set_destination(message, "com.samsung.factoryreset");
+       dbus_message_set_destination(message, "org.tizen.factoryreset");
 
        if (FALSE ==
                dbus_connection_send_with_reply(conn, message, &pending_call, 100)) {

diff --git a/setting-backup-and-reset/tizen-manifest.xml b/setting-backup-and-reset/tizen-manifest.xml
index 0c82e7b3b4fcbf8c48a9ba7d23aa029591b58fbd..b96b3416dbf109fc6dc1c8b5e311d550e6d5d479 100644 (file)
--- a/setting-backup-and-reset/tizen-manifest.xml
+++ b/setting-backup-and-reset/tizen-manifest.xml
@@ -1,62 +1,54 @@
-<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-backup-and-reset" version="1.0.0">
-       <profile name="mobile"/>
-       <ui-application appid="org.tizen.setting-backup-and-reset" exec="setting-backup-and-reset" nodisplay="true" multiple="false" type="capp" taskmanage="false" hw-acceleration="on" launch_mode="caller">
-               <metadata key="http://developer.samsung.com/tizen/metadata/legacylifecycle"/>
-               <label>Backup and reset</label>
-               <label xml:lang="en-gb">Backup and reset</label>
-               <label xml:lang="en-ph">Backup and reset</label>
-               <label xml:lang="en-us">Backup and reset</label>
-       </ui-application>
-       <privileges>
-               <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-               <privilege>http://tizen.org/privilege/appmanager.kill</privilege>
-               <privilege>http://tizen.org/privilege/appmanager.kill.bgapp</privilege>
-               <privilege>http://tizen.org/privilege/account.read</privilege>
-               <privilege>http://tizen.org/privilege/account.write</privilege>
-               <privilege>http://tizen.org/privilege/notification</privilege>
-               <privilege>http://tizen.org/privilege/volume.set</privilege>
-               <privilege>http://tizen.org/privilege/haptic</privilege>
-               <privilege>http://tizen.org/privilege/telephony.admin</privilege>
-               <privilege>http://tizen.org/privilege/telephony</privilege>
-               <privilege>http://tizen.org/privilege/tethering.admin</privilege>
-
-               <privilege>http://tizen.org/privilege/display</privilege>
-               <privilege>http://tizen.org/privilege/nfc.admin</privilege>
-
-               <privilege>http://tizen.org/privilege/packagemanager.install</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
-
-               <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
-               <privilege>http://tizen.org/privilege/system</privilege>
-               <privilege>http://tizen.org/privilege/systemmanager</privilege>
-               <privilege>http://tizen.org/privilege/systemmonitor</privilege>
-
-               <privilege>http://tizen.org/privilege/application.launch</privilege>
-               <privilege>http://tizen.org/privilege/content.read</privilege>
-               <privilege>http://tizen.org/privilege/filesystem.read</privilege>
-               <privilege>http://tizen.org/privilege/filesystem.write</privilege>
-               <privilege>http://tizen.org/privilege/fullscreen</privilege>
-
-               <privilege>http://tizen.org/privilege/http</privilege>
-               <privilege>http://tizen.org/privilege/ime</privilege>
-               <privilege>http://tizen.org/privilege/internet</privilege>
-               <privilege>http://tizen.org/privilege/mediastorage</privilege>
-               <privilege>http://tizen.org/privilege/externalstorage</privilege>
-               <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
-               <privilege>http://tizen.org/privilege/datasharing</privilege>
-
-               <privilege>http://tizen.org/privilege/network.get</privilege>
-               <privilege>http://tizen.org/privilege/network.profile</privilege>
-               <privilege>http://tizen.org/privilege/network.set</privilege>
-               <privilege>http://tizen.org/privilege/package.info</privilege>
-
-               <privilege>http://tizen.org/privilege/apphistory.read</privilege>
-               <privilege>http://tizen.org/privilege/mediahistory.read</privilege>
-
-               <privilege>http://tizen.org/privilege/alarm.set</privilege>
-
-               <privilege>http://tizen.org/privilege/dpm.password</privilege>
-       </privileges>
-</manifest>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-backup-and-reset2" version="1.0.0">
+    <profile name="mobile"/>
+    <ui-application appid="org.tizen.setting-backup-and-reset2" exec="setting-backup-and-reset" hw-acceleration="on" launch_mode="caller" multiple="false" nodisplay="true" taskmanage="false" type="capp">
+        <label>Backup and reset</label>
+        <label xml:lang="en-gb">Backup and reset</label>
+        <label xml:lang="en-ph">Backup and reset</label>
+        <label xml:lang="en-us">Backup and reset</label>
+        <metadata key="http://developer.samsung.com/tizen/metadata/legacylifecycle"/>
+    </ui-application>
+    <privileges>
+        <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        <privilege>http://tizen.org/privilege/account.read</privilege>
+        <privilege>http://tizen.org/privilege/mediahistory.read</privilege>
+        <privilege>http://tizen.org/privilege/haptic</privilege>
+        <privilege>http://tizen.org/privilege/display</privilege>
+        <privilege>http://tizen.org/privilege/datasharing</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
+        <privilege>http://tizen.org/privilege/application.launch</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.install</privilege>
+        <privilege>http://tizen.org/privilege/mediastorage</privilege>
+        <privilege>http://tizen.org/privilege/telephony.admin</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.kill</privilege>
+        <privilege>http://tizen.org/privilege/package.info</privilege>
+        <privilege>http://tizen.org/privilege/system</privilege>
+        <privilege>http://tizen.org/privilege/alarm.set</privilege>
+        <privilege>http://tizen.org/privilege/http</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
+        <privilege>http://tizen.org/privilege/network.profile</privilege>
+        <privilege>http://tizen.org/privilege/fullscreen</privilege>
+        <privilege>http://tizen.org/privilege/telephony</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
+        <privilege>http://tizen.org/privilege/systemmonitor</privilege>
+        <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
+        <privilege>http://tizen.org/privilege/content.read</privilege>
+        <privilege>http://tizen.org/privilege/network.set</privilege>
+        <privilege>http://tizen.org/privilege/account.write</privilege>
+        <privilege>http://tizen.org/privilege/nfc.admin</privilege>
+        <privilege>http://tizen.org/privilege/filesystem.write</privilege>
+        <privilege>http://tizen.org/privilege/tethering.admin</privilege>
+        <privilege>http://tizen.org/privilege/ime</privilege>
+        <privilege>http://tizen.org/privilege/dpm.password</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage</privilege>
+        <privilege>http://tizen.org/privilege/systemmanager</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.kill.bgapp</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+        <privilege>http://tizen.org/privilege/filesystem.read</privilege>
+        <privilege>http://tizen.org/privilege/volume.set</privilege>
+        <privilege>http://tizen.org/privilege/internet</privilege>
+        <privilege>http://tizen.org/privilege/notification</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+    </privileges>
+</manifest>

diff --git a/setting-ringtone/tizen-manifest.xml b/setting-ringtone/tizen-manifest.xml
index a4e7e207dbef2a4a1434de858a3070a6adef8705..d4550232e0903e2e0c464e0e01810d339e237d97 100644 (file)
--- a/setting-ringtone/tizen-manifest.xml
+++ b/setting-ringtone/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-ringtone2" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-ringtone" version="1.0.0">
     <profile name="mobile"/>
-    <ui-application appid="org.tizen.setting-ringtone2" exec="setting-ringtone" hw-acceleration="on" launch_mode="caller" multiple="true" nodisplay="true" taskmanage="false" type="capp">
+    <ui-application appid="org.tizen.setting-ringtone" exec="setting-ringtone" hw-acceleration="on" launch_mode="caller" multiple="true" nodisplay="true" taskmanage="false" type="capp">
         <label>Ringtone</label>
         <label xml:lang="en-gb">Ringtone</label>
         <label xml:lang="en-ph">Ringtone</label>