From b93e7ce786355afc8728bec8a946f0967dedbecc Mon Sep 17 00:00:00 2001 From: chungryeol Lim Date: Thu, 4 Jan 2018 13:02:14 +0000 Subject: [PATCH 1/1] Revert "Changed DllIport entry point for new system-settings API for callback." This reverts commit 75146ab8c4a83f34e30c42ea44444853b46e7861. Change-Id: I10d4a2fa9e4d3ea2c8a3841cd3329866b39183af --- .../Interop/Interop.SystemSettings.cs | 6 +-- .../Tizen.System.SystemSettings/SystemSettings.cs | 62 +++++++++++----------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Tizen.System.SystemSettings/Interop/Interop.SystemSettings.cs b/src/Tizen.System.SystemSettings/Interop/Interop.SystemSettings.cs index 0980bf4..3925cd5 100644 --- a/src/Tizen.System.SystemSettings/Interop/Interop.SystemSettings.cs +++ b/src/Tizen.System.SystemSettings/Interop/Interop.SystemSettings.cs @@ -44,9 +44,9 @@ internal static partial class Interop // Callback [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void SystemSettingsChangedCallback(SystemSettingsKeys key, IntPtr data); - [DllImport("capi-system-system-settings.so.0", EntryPoint = "system_settings_add_changed_cb", CallingConvention = CallingConvention.Cdecl)] + [DllImport("capi-system-system-settings.so.0", EntryPoint = "system_settings_set_changed_cb", CallingConvention = CallingConvention.Cdecl)] internal static extern int SystemSettingsSetCallback(SystemSettingsKeys systemSettingsKey, SystemSettingsChangedCallback cb, IntPtr data); - [DllImport("capi-system-system-settings.so.0", EntryPoint = "system_settings_remove_changed_cb", CallingConvention = CallingConvention.Cdecl)] - internal static extern int SystemSettingsRemoveCallback(SystemSettingsKeys systemSettingsKey, SystemSettingsChangedCallback cb); + [DllImport("capi-system-system-settings.so.0", EntryPoint = "system_settings_unset_changed_cb", CallingConvention = CallingConvention.Cdecl)] + internal static extern int SystemSettingsRemoveCallback(SystemSettingsKeys systemSettingsKey); } } diff --git a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettings.cs b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettings.cs index 02a8ee7..ebce594 100755 --- a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettings.cs +++ b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettings.cs @@ -1006,7 +1006,7 @@ namespace Tizen.System s_incomingCallRingtoneChanged -= value; if (s_incomingCallRingtoneChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.IncomingCallRingtone, s_incomingCallRingtoneChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.IncomingCallRingtone); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1054,7 +1054,7 @@ namespace Tizen.System s_wallpaperHomeScreenChanged -= value; if (s_wallpaperHomeScreenChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.WallpaperHomeScreen, s_wallpaperHomeScreenChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.WallpaperHomeScreen); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1102,7 +1102,7 @@ namespace Tizen.System s_wallpaperLockScreenChanged -= value; if (s_wallpaperLockScreenChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.WallpaperLockScreen, s_wallpaperLockScreenChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.WallpaperLockScreen); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1149,7 +1149,7 @@ namespace Tizen.System s_fontSizeChanged -= value; if (s_fontSizeChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.FontSize, s_fontSizeChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.FontSize); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1196,7 +1196,7 @@ namespace Tizen.System s_fontTypeChanged -= value; if (s_fontTypeChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.FontType, s_fontTypeChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.FontType); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1243,7 +1243,7 @@ namespace Tizen.System s_motionActivationChanged -= value; if (s_motionActivationChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.MotionActivationEnabled, s_motionActivationChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.MotionActivationEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1291,7 +1291,7 @@ namespace Tizen.System s_emailAlertRingtoneChanged -= value; if (s_emailAlertRingtoneChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.EmailAlertRingtone, s_emailAlertRingtoneChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.EmailAlertRingtone); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1338,7 +1338,7 @@ namespace Tizen.System s_usbDebuggingSettingChanged -= value; if (s_usbDebuggingSettingChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.UsbDebuggingEnabled, s_usbDebuggingSettingChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.UsbDebuggingEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1385,7 +1385,7 @@ namespace Tizen.System s_data3GNetworkSettingChanged -= value; if (s_data3GNetworkSettingChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.Data3GNetworkEnabled, s_data3GNetworkSettingChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.Data3GNetworkEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1433,7 +1433,7 @@ namespace Tizen.System s_lockscreenAppChanged -= value; if (s_lockscreenAppChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LockScreenApp, s_lockscreenAppChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LockScreenApp); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1480,7 +1480,7 @@ namespace Tizen.System s_localeCountryChanged -= value; if (s_localeCountryChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleCountry, s_localeCountryChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleCountry); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1527,7 +1527,7 @@ namespace Tizen.System s_localeLanguageChanged -= value; if (s_localeLanguageChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleLanguage, s_localeLanguageChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleLanguage); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1574,7 +1574,7 @@ namespace Tizen.System s_localeTimeFormat24HourChanged -= value; if (s_localeTimeFormat24HourChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleTimeFormat24HourEnabled, s_localeTimeFormat24HourChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleTimeFormat24HourEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1621,7 +1621,7 @@ namespace Tizen.System s_localeTimeZoneChanged -= value; if (s_localeTimeZoneChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleTimeZone, s_localeTimeZoneChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LocaleTimeZone); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1669,7 +1669,7 @@ namespace Tizen.System s_timeChanged -= value; if (s_timeChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.Time, s_timeChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.Time); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1716,7 +1716,7 @@ namespace Tizen.System s_soundLockChanged -= value; if (s_soundLockChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundLockEnabled, s_soundLockChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundLockEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1763,7 +1763,7 @@ namespace Tizen.System s_soundSilentModeChanged -= value; if (s_soundSilentModeChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundSilentModeEnabled, s_soundSilentModeChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundSilentModeEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1811,7 +1811,7 @@ namespace Tizen.System if (s_soundTouchChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundTouchEnabled, s_soundTouchChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundTouchEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1858,7 +1858,7 @@ namespace Tizen.System s_displayScreenRotationAutoChanged -= value; if (s_displayScreenRotationAutoChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.DisplayScreenRotationAutoEnabled, s_displayScreenRotationAutoChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.DisplayScreenRotationAutoEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1905,7 +1905,7 @@ namespace Tizen.System s_deviceNameChanged -= value; if (s_deviceNameChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.DeviceName, s_deviceNameChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.DeviceName); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -1952,7 +1952,7 @@ namespace Tizen.System s_motionSettingChanged -= value; if (s_motionSettingChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.MotionEnabled, s_motionSettingChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.MotionEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2000,7 +2000,7 @@ namespace Tizen.System s_networkWifiNotificationChanged -= value; if (s_networkWifiNotificationChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.NetworkWifiNotificationEnabled, s_networkWifiNotificationChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.NetworkWifiNotificationEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2047,7 +2047,7 @@ namespace Tizen.System s_networkFlightModeChanged -= value; if (s_networkFlightModeChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.NetworkFlightModeEnabled, s_networkFlightModeChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.NetworkFlightModeEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2094,7 +2094,7 @@ namespace Tizen.System s_screenBacklightTimeChanged -= value; if (s_screenBacklightTimeChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.ScreenBacklightTime, s_screenBacklightTimeChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.ScreenBacklightTime); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2142,7 +2142,7 @@ namespace Tizen.System s_soundNotificationChanged -= value; if (s_soundNotificationChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundNotification, s_soundNotificationChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundNotification); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2189,7 +2189,7 @@ namespace Tizen.System s_soundNotificationRepetitionPeriodChanged -= value; if (s_soundNotificationRepetitionPeriodChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundNotificationRepetitionPeriod, s_soundNotificationRepetitionPeriodChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.SoundNotificationRepetitionPeriod); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2236,7 +2236,7 @@ namespace Tizen.System s_lockStateChanged -= value; if (s_lockStateChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LockState, s_lockStateChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.LockState); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2283,7 +2283,7 @@ namespace Tizen.System s_adsIdChanged -= value; if (s_adsIdChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.AdsId, s_adsIdChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.AdsId); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2331,7 +2331,7 @@ namespace Tizen.System s_ultraDataSaveChanged -= value; if (s_ultraDataSaveChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.UltraDataSave, s_ultraDataSaveChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.UltraDataSave); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2379,7 +2379,7 @@ namespace Tizen.System s_ultraDataSavePackageListChanged -= value; if (s_ultraDataSavePackageListChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.UltraDataSavePackageList, s_ultraDataSavePackageListChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.UltraDataSavePackageList); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); @@ -2427,7 +2427,7 @@ namespace Tizen.System if (s_accessibilityTtsChanged == null) { - SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.AccessibilityTtsEnabled, s_accessibilityTtsChangedCallback); + SystemSettingsError ret = (SystemSettingsError)Interop.Settings.SystemSettingsRemoveCallback(SystemSettingsKeys.AccessibilityTtsEnabled); if (ret != SystemSettingsError.None) { throw SystemSettingsExceptionFactory.CreateException(ret, "Error in callback handling"); -- 2.7.4