Josh VanderLinden avatar Josh VanderLinden committed f539d7f

Fixed some minor issues with the GetClient method. Updated the setup scripts for Windows. Bumped the version. The biggest problem with this latest release of Twibber was that Windows was not including the dnspython package when it compiled everything with py2exe. These changes should make it work better in the future.

Comments (0)

Files changed (5)

 dist
 simplejson
 xmpp
+dns
 scripts/Output
 twim.wpr
 nbproject
 # -*- coding: utf-8 -*-
 
 import cgi
+import dns
 import logging
 import re
 import simplejson
     0x2019: u"'",
 }
 
-class ConnectionError(object): pass
+class ConnectionError(Exception): pass
 
 class Twibber(object):
     """
                                            config.jabber_server_port,
                                            debug=[])
 
+            log.info('Is connected: %s' % self._client.isConnected())
             if not self._client.isConnected():
                 server = None
                 proxy = None
                 self._client.UnregisterDisconnectHandler(self._client.DisconnectHandler)
                 self._client.RegisterDisconnectHandler(self.Disconnect)
 
-            # tell people we're online
-            self._client.sendInitPresence()
-            self.presence = xmpp.Presence(show='chat',
-                                          status='Doing thy bidding, master.')
-            self._client.send(self.presence)
+                # tell people we're online
+                log.info('Setting IM status')
+                self._client.sendInitPresence()
+                self.presence = xmpp.Presence(show='chat',
+                                              status='Doing thy bidding, master.')
+                self._client.send(self.presence)
             self._is_connected = True
             self._has_connected = True
         except:

scripts/inno_setup.iss

 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{C4008525-C8A4-4CD6-BFD7-0A9EFDD9F8A7}
 AppName=Twibber
-AppVerName=Twibber 0.0.3.8
-VersionInfoVersion=0.0.3.8
+AppVerName=Twibber 0.0.4.1
+VersionInfoVersion=0.0.4.1
 AppPublisher=Josh VanderLinden
-AppPublisherURL=http://bitbucket.org/codekoala/twitter-im
-AppSupportURL=http://bitbucket.org/codekoala/twitter-im
-AppUpdatesURL=http://bitbucket.org/codekoala/twitter-im
+AppPublisherURL=http://bitbucket.org/codekoala/twibber
+AppSupportURL=http://bitbucket.org/codekoala/twibber
+AppUpdatesURL=http://bitbucket.org/codekoala/twibber
 DefaultDirName={pf}\Twibber
 DefaultGroupName=Twibber
 AllowNoIcons=yes
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"
+Name: "launchatstart"; Description: "Launch when Windows starts"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Files]
 Source: "C:\dev\twitter-im\dist\twibber.exe"; DestDir: "{app}"; Flags: ignoreversion
 Name: "{group}\{cm:UninstallProgram,Twibber}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\Twibber"; Filename: "{app}\twibber.exe"; WorkingDir: "{app}"; Tasks: desktopicon
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Twibber"; Filename: "{app}\twibber.exe"; WorkingDir: "{app}"; Tasks: quicklaunchicon
+Name: "{commonstartup}\Twibber"; Filename: "{app}\twibber.exe"; WorkingDir: "{app}"; Tasks: launchatstart
 
 [Run]
 Filename: "{app}\twibber.exe"; Description: "{cm:LaunchProgram,Twibber}"; Flags: nowait postinstall skipifsilent
                     ('{565783C6-CB41-11D1-8B02-00600806D9B6}', 0, 1, 2),
                 ],
                 'compressed': 1,
-                'optimize': 2,
+                'optimize': 0,
                 'bundle_files': 1,
                 'excludes': excludes,
                 'includes': [
                     'twitter',
                     'simplejson',
                     'xmpp',
+                    'dns',
                 ],
+                'packages': ['dns'],
             }
         },
         windows=[twibber_target],
     setup(
         name=APP_TITLE.lower(),
         version=__version__,
-        url='http://bitbucket.org/codekoala/twitter-im',
+        url='http://bitbucket.org/codekoala/twibber',
         author='Josh VanderLinden',
         author_email='codekoala@gmail.com',
         license='MIT',
 
 APP_TITLE = 'Twibber'
 __url__ = 'http://bitbucket.org/codekoala/twibber'
-__version__ = '0.0.4.0'
+__version__ = '0.0.4.1'
 
 if __name__ == '__main__':
     # configure logging
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.