diff -Nru egmont-gateway-0.10ubuntu1/data/egmont.glade egmont-gateway-0.11ubuntu1/data/egmont.glade --- egmont-gateway-0.10ubuntu1/data/egmont.glade 2009-04-27 12:22:36.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/data/egmont.glade 2009-04-27 14:11:22.000000000 +0100 @@ -115,13 +115,14 @@ - Remember password + _Remember password True True False + True 0.55000001192092896 - True True + 1 diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/debian/changelog /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/debian/changelog --- egmont-gateway-0.10ubuntu1/debian/changelog 2009-04-27 12:35:27.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/debian/changelog 2009-04-27 14:16:06.000000000 +0100 @@ -1,3 +1,9 @@ +egmont-gateway (0.11ubuntu1) jaunty; urgency=low + + * Fixed bug in the password storage. + + -- Daniel Schierbeck Mon, 27 Apr 2009 15:15:53 +0200 + egmont-gateway (0.10ubuntu1) jaunty; urgency=low * Allow automatic login. diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/egmont/window.py /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/egmont/window.py --- egmont-gateway-0.10ubuntu1/egmont/window.py 2009-04-27 12:27:08.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/egmont/window.py 2009-04-27 14:15:21.000000000 +0100 @@ -24,6 +24,7 @@ try: gateway.connect(host, port, username, password) notify("You are now connected") + return True except (AuthenticationException, NetworkError, AccountClosedException) as error: if type(error) == AuthenticationException: title = "Failed to authenticate" @@ -41,8 +42,6 @@ display_error(title, message) return False - else: - return True class Window: @@ -51,7 +50,7 @@ self.port = config.get_port() self.username = config.get_username() self.password = config.get_password(self.host, self.port, self.username) - self.remember = False + self.remember = True if all((self.host, self.port, self.username, self.password)): if connect(self.host, self.port, self.username, self.password): @@ -70,16 +69,17 @@ if self.password is not None: self.password_entry.set_text(self.password) - self.remember_checkbox.set_active(True) + + self.remember_checkbox.set_active(self.remember) def connect(self, *args): self.window.set_sensitive(False) if connect(self.host, self.port, self.username, self.password): - if not self.remember: - password = "" - else: + if self.remember: password = self.password + else: + password = "" config.set_credentials(self.host, self.port, self.username, password) gtk.main_quit() @@ -93,7 +93,8 @@ 'on_username_entry_changed': self.username_changed_cb, 'on_password_entry_changed': self.password_changed_cb, 'on_host_entry_changed': self.host_changed_cb, - 'on_port_entry_changed': self.port_changed_cb} + 'on_port_entry_changed': self.port_changed_cb, + 'on_remember_toggled': self.remember_toggled_cb} gui = gtk.glade.XML(sys.prefix + "/share/egmont-gateway/glade/egmont.glade") gui.signal_autoconnect(dic) @@ -120,7 +121,7 @@ self.password = self.password_entry.get_text() self.credentials_changed_cb() - def remember_changed(self, *args): + def remember_toggled_cb(self, *args): self.remember = self.remember_checkbox.get_active() def credentials_changed_cb(self): Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/egmont/.window.py.swp and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/egmont/.window.py.swp differ diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/COMMIT_EDITMSG /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/COMMIT_EDITMSG --- egmont-gateway-0.10ubuntu1/.git/COMMIT_EDITMSG 2009-04-27 12:35:36.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/COMMIT_EDITMSG 2009-04-27 14:16:16.000000000 +0100 @@ -1,7 +1,9 @@ -Add changelog entry +Bump to version 0.11 # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master +# Your branch is ahead of 'origin/master' by 1 commit. +# # Changes to be committed: # (use "git reset HEAD ..." to unstage) # Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/index and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/index differ diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/logs/HEAD /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/logs/HEAD --- egmont-gateway-0.10ubuntu1/.git/logs/HEAD 2009-04-27 12:35:36.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/logs/HEAD 2009-04-27 14:16:16.000000000 +0100 @@ -17,3 +17,5 @@ 9668ab8d793d66952df82f58cb78c1c65dea8c21 c974dae5757c1576b64ed50a2346d2b8e2bbcc85 Daniel Schierbeck 1240830448 +0200 commit: Bump version number to 0.11 c974dae5757c1576b64ed50a2346d2b8e2bbcc85 3be24610fca5eba06e546f592c543b81111c142c Daniel Schierbeck 1240831635 +0200 commit: Allow toggling whether to remember the password 3be24610fca5eba06e546f592c543b81111c142c 8da1d97009089388754fe2672b5e749a1efc8cc8 Daniel Schierbeck 1240832131 +0200 commit: Add changelog entry +8da1d97009089388754fe2672b5e749a1efc8cc8 c8ecc4d62a87c234afd71ea75da9d5a2d9c43568 Daniel Schierbeck 1240838135 +0200 commit: Fixed bug in the remember logic +c8ecc4d62a87c234afd71ea75da9d5a2d9c43568 40e1de86c82a86e97d9caf1369c697e74ae20ab5 Daniel Schierbeck 1240838169 +0200 commit: Bump to version 0.11 diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/logs/refs/heads/master /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/logs/refs/heads/master --- egmont-gateway-0.10ubuntu1/.git/logs/refs/heads/master 2009-04-27 12:35:36.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/logs/refs/heads/master 2009-04-27 14:16:16.000000000 +0100 @@ -17,3 +17,5 @@ 9668ab8d793d66952df82f58cb78c1c65dea8c21 c974dae5757c1576b64ed50a2346d2b8e2bbcc85 Daniel Schierbeck 1240830448 +0200 commit: Bump version number to 0.11 c974dae5757c1576b64ed50a2346d2b8e2bbcc85 3be24610fca5eba06e546f592c543b81111c142c Daniel Schierbeck 1240831635 +0200 commit: Allow toggling whether to remember the password 3be24610fca5eba06e546f592c543b81111c142c 8da1d97009089388754fe2672b5e749a1efc8cc8 Daniel Schierbeck 1240832131 +0200 commit: Add changelog entry +8da1d97009089388754fe2672b5e749a1efc8cc8 c8ecc4d62a87c234afd71ea75da9d5a2d9c43568 Daniel Schierbeck 1240838135 +0200 commit: Fixed bug in the remember logic +c8ecc4d62a87c234afd71ea75da9d5a2d9c43568 40e1de86c82a86e97d9caf1369c697e74ae20ab5 Daniel Schierbeck 1240838169 +0200 commit: Bump to version 0.11 diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/logs/refs/remotes/origin/master /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/logs/refs/remotes/origin/master --- egmont-gateway-0.10ubuntu1/.git/logs/refs/remotes/origin/master 2009-04-27 12:27:39.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/logs/refs/remotes/origin/master 2009-04-27 14:16:30.000000000 +0100 @@ -2,3 +2,5 @@ 626f7f73b3fba980998bc040527fe7f2126afff9 2dc721800edc15ed361d216d42bc4c383be52ff1 Daniel Schierbeck 1239112409 +0200 update by push 2dc721800edc15ed361d216d42bc4c383be52ff1 abe64725df6aeaf714b6cdf4bfbce8e28e458aac Daniel Schierbeck 1239739169 +0200 update by push abe64725df6aeaf714b6cdf4bfbce8e28e458aac 3be24610fca5eba06e546f592c543b81111c142c Daniel Schierbeck 1240831659 +0200 update by push +3be24610fca5eba06e546f592c543b81111c142c 8da1d97009089388754fe2672b5e749a1efc8cc8 Daniel Schierbeck 1240832239 +0200 update by push +8da1d97009089388754fe2672b5e749a1efc8cc8 40e1de86c82a86e97d9caf1369c697e74ae20ab5 Daniel Schierbeck 1240838190 +0200 update by push Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/2b/9cfb7d07b575443fedd37f5d1306d8c088dace and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/2b/9cfb7d07b575443fedd37f5d1306d8c088dace differ diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/40/e1de86c82a86e97d9caf1369c697e74ae20ab5 /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/40/e1de86c82a86e97d9caf1369c697e74ae20ab5 --- egmont-gateway-0.10ubuntu1/.git/objects/40/e1de86c82a86e97d9caf1369c697e74ae20ab5 1970-01-01 01:00:00.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/objects/40/e1de86c82a86e97d9caf1369c697e74ae20ab5 2009-04-27 14:16:16.000000000 +0100 @@ -0,0 +1 @@ +xMN1 @a9H8?DB܀xh&Ur~*xz[9TiŌ1-Da 7c$ UX8Ȯd >R2|>sձ|rHo/.Rg5} Oy+:n`D`T \ No newline at end of file Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/45/62f29fa426ea098e1e8a4bad6eecaaaa5866be and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/45/62f29fa426ea098e1e8a4bad6eecaaaa5866be differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/49/03b739bdb3b47afb0dad8e8f689aa281206114 and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/49/03b739bdb3b47afb0dad8e8f689aa281206114 differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/5d/1caf1aaa1a7ac34945b762a82563d6db9fe38d and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/5d/1caf1aaa1a7ac34945b762a82563d6db9fe38d differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/65/ac46f77b67cbec8520fb338054510f24da9ace and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/65/ac46f77b67cbec8520fb338054510f24da9ace differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/a6/7191a519daf012864bba1def8111bcc54636a6 and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/a6/7191a519daf012864bba1def8111bcc54636a6 differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/bc/3e4237b4f04568d39d07f9d8068fc45ef3dd26 and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/bc/3e4237b4f04568d39d07f9d8068fc45ef3dd26 differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/c8/ecc4d62a87c234afd71ea75da9d5a2d9c43568 and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/c8/ecc4d62a87c234afd71ea75da9d5a2d9c43568 differ Binary files /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/objects/d9/80af476f69599c9ae863043c13b0de86b47cbb and /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/objects/d9/80af476f69599c9ae863043c13b0de86b47cbb differ diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/refs/heads/master /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/refs/heads/master --- egmont-gateway-0.10ubuntu1/.git/refs/heads/master 2009-04-27 12:35:36.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/refs/heads/master 2009-04-27 14:16:16.000000000 +0100 @@ -1 +1 @@ -8da1d97009089388754fe2672b5e749a1efc8cc8 +40e1de86c82a86e97d9caf1369c697e74ae20ab5 diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/refs/remotes/origin/master /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/refs/remotes/origin/master --- egmont-gateway-0.10ubuntu1/.git/refs/remotes/origin/master 2009-04-27 12:27:39.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/refs/remotes/origin/master 2009-04-27 14:16:30.000000000 +0100 @@ -1 +1 @@ -3be24610fca5eba06e546f592c543b81111c142c +40e1de86c82a86e97d9caf1369c697e74ae20ab5 diff -Nru /tmp/J7p8c2xrOS/egmont-gateway-0.10ubuntu1/.git/refs/tags/v0.11 /tmp/wfqIkg1oyL/egmont-gateway-0.11ubuntu1/.git/refs/tags/v0.11 --- egmont-gateway-0.10ubuntu1/.git/refs/tags/v0.11 1970-01-01 01:00:00.000000000 +0100 +++ egmont-gateway-0.11ubuntu1/.git/refs/tags/v0.11 2009-04-27 14:16:21.000000000 +0100 @@ -0,0 +1 @@ +40e1de86c82a86e97d9caf1369c697e74ae20ab5