From 06c6fe34c7b90339d881b63c268aeeddba5af413 Mon Sep 17 00:00:00 2001 From: Bogdan Iusco Date: Wed, 29 Aug 2012 14:20:00 +0300 Subject: [PATCH 1/2] Fix for MOSYNC-2366 "OptionsMenu Test doesn't compile". --- .../OptionsMenuTest/Resources/Resources.lst | 2 ++ .../OptionsMenuTest/Resources/image.png | Bin 0 -> 10298 bytes 2 files changed, 2 insertions(+) create mode 100644 testPrograms/native_ui_lib/OptionsMenuTest/Resources/Resources.lst create mode 100644 testPrograms/native_ui_lib/OptionsMenuTest/Resources/image.png diff --git a/testPrograms/native_ui_lib/OptionsMenuTest/Resources/Resources.lst b/testPrograms/native_ui_lib/OptionsMenuTest/Resources/Resources.lst new file mode 100644 index 000000000..fb316decb --- /dev/null +++ b/testPrograms/native_ui_lib/OptionsMenuTest/Resources/Resources.lst @@ -0,0 +1,2 @@ +.res RES_IMAGE +.image "image.png" diff --git a/testPrograms/native_ui_lib/OptionsMenuTest/Resources/image.png b/testPrograms/native_ui_lib/OptionsMenuTest/Resources/image.png new file mode 100644 index 0000000000000000000000000000000000000000..89de36a0750662f29664f969fbab3b76f0104894 GIT binary patch literal 10298 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 Kp-?Vo{`P-Hh30Pn literal 0 HcmV?d00001 From 7bfe21b1c01e1c4c8f8bc2d5987c2e827fda8b48 Mon Sep 17 00:00:00 2001 From: Bogdan Iusco Date: Tue, 11 Sep 2012 13:56:45 +0300 Subject: [PATCH 2/2] Fix for MOSYNC-2387 "PushNotificationReceiver crashes on iOS". --- .../notification/PushNotificationReceiver/SettingsScreen.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testPrograms/notification/PushNotificationReceiver/SettingsScreen.cpp b/testPrograms/notification/PushNotificationReceiver/SettingsScreen.cpp index fb8dae4b8..d784970d5 100644 --- a/testPrograms/notification/PushNotificationReceiver/SettingsScreen.cpp +++ b/testPrograms/notification/PushNotificationReceiver/SettingsScreen.cpp @@ -83,8 +83,11 @@ SettingsScreen::SettingsScreen(SettingsScreenListener* listener): mIPEditBox->addEditBoxListener(this); mPortEditBox->addEditBoxListener(this); + if (isAndroid()) + { mTickerText->addEditBoxListener(this); mContentTitle->addEditBoxListener(this); + } mConnectButton->addButtonListener(this); if (isAndroid())