Merge branch 'fix_efl'

drf · Apr 21, 2009 · 6289b0d · 6289b0d
2 parents daf442b + b69cd0e
commit 6289b0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/amsn2/gui/front_ends/efl/login.py b/amsn2/gui/front_ends/efl/login.py
@@ -58,7 +58,7 @@ def show(self):
 
     def hide(self):
         self._edje.hide()
-        #FIXME: those are not hidden by self._edje.hide() 
+        #FIXME: those are not hidden by self._edje.hide()
         self.password.hide()
         self.status.hide()
         self.username.hide()
@@ -83,9 +83,9 @@ def switch_to_profile(self, profile):
 
 
     def signin(self):
-        self.current_profile.username = self.username.entry_get()
-        self.current_profile.email = self.username.entry_get()
-        self.current_profile.password = self.password.entry_get()
+        self.current_profile.username = elementary.Entry.markup_to_utf8(self.username.entry_get())
+        self.current_profile.email = self.current_profile.username
+        self.current_profile.password = elementary.Entry.markup_to_utf8(self.password.entry_get())
         self._amsn_core.signinToAccount(self, self.current_profile)
 
     def onConnecting(self, progress, message):
@@ -108,5 +108,5 @@ def onConnecting(self, progress, message):
     def __signin_cb(self, edje_obj, signal, source):
         self.signin()
 
-    def __signin_button_cb(self, button, event):
+    def __signin_button_cb(self, button, event, data):
         self.signin()
diff --git a/amsn2/gui/front_ends/efl/main.py b/amsn2/gui/front_ends/efl/main.py
@@ -21,7 +21,7 @@ def __init__(self, amsn_core):
     def __on_show(self, evas_obj):
         self._amsn_core.mainWindowShown()
 
-    def __on_delete_request(self, evas_obj):
+    def __on_delete_request(self, evas_obj, emission, data):
         self._amsn_core.quit()
 
     def __on_key_down(self, obj, event):