Modified UserIconFile(), Add DesktopType to UnitySettings,Add some nux::Property in textinput

(bzr r4016.2.26)

1 files changed, 1 insertions, 1 deletions

diff --git a/shutdown/StandaloneSession.cpp b/shutdown/StandaloneSession.cpp
index a6355e032..40415e15e 100644
--- a/shutdown/StandaloneSession.cpp
+++ b/shutdown/StandaloneSession.cpp
@@ -39,7 +39,7 @@ public:
 std::string RealName() const { return "Marco Trevisan"; }
 std::string UserName() const { return "marco"; }
 std::string HostName() const { return "tricky"; }
- std::string UserIconFile() const { return "/usr/share/pixmaps/faces/fish.jpg"; }
+ void UserIconFile(std::function<void(GVariant*)>) const { std::cout << "UserIconFile" << std::endl; }
 
 void ScreenSaverActivate() { std::cout << "ScreenSaverActivate" << std::endl; }
 void ScreenSaverDeactivate() { std::cout << "ScreenSaverDeactivate" << std::endl; }