Browse files

Updating in order to work with pyobjc

  • Loading branch information...
1 parent 7c24952 commit 027c65fccc8a22a45a350dc240f0c229b399f3dd Giovanni Degani committed Jan 23, 2010
Showing with 5 additions and 5 deletions.
  1. +2 −2 amsn2/core/amsn.py
  2. +1 −1 amsn2/ui/front_ends/cocoa/nibs/CocoaLoginView.py
  3. +2 −2 setupCocoa.py
View
4 amsn2/core/amsn.py
@@ -29,7 +29,7 @@
from personalinfo_manager import *
from event_manager import *
from userinterface_manager import *
-
+import sys
import papyon
import logging
@@ -196,7 +196,7 @@ def quit(self):
if self._loop:
self._loop.quit()
logging.shutdown()
- exit(0)
+ sys.exit(0)
def createMainMenuView(self):
menu = MenuView()
View
2 amsn2/ui/front_ends/cocoa/nibs/CocoaLoginView.py
@@ -26,7 +26,7 @@ def awakeFromNib(self):
def setParent(self, parent):
self.parent = parent
- def login_(self):
+ def login(self):
username = str(self.usernameField.stringValue())
password = str(self.passwordField.stringValue())
self.parent.login(username, password)
View
4 setupCocoa.py 100644 → 100755
@@ -8,8 +8,8 @@
files = ['amsn2', 'papyon']
# Nibs need to be appened individually because they they need to be in the root of the bundle.
-for f in listdir('amsn2/gui/front_ends/cocoa/nibs/files/'):
- files.append('amsn2/gui/front_ends/cocoa/nibs/files/' + f)
+for f in listdir('amsn2/ui/front_ends/cocoa/nibs/files/'):
+ files.append('amsn2/ui/front_ends/cocoa/nibs/files/' + f)
setup(
name = 'aMSN2',

0 comments on commit 027c65f

Please sign in to comment.