Changeset 954

Timestamp:

04/01/05 16:55:56 (4 years ago)

Author:

nk

Message:

gajim.sh --> gajim.py, adding psyco support if available, small fix in new message dialog if @ is not given

Location:

trunk

Files:

• debian/rules (modified) (1 diff)
• gajim.py (moved) (moved from trunk/gajim.sh)
• Makefile (modified) (2 diffs)
• plugins/gtkgui/dialogs.py (modified) (1 diff)
• plugins/gtkgui/gtkgui.py (modified) (1 diff)
• README (modified) (1 diff)
• scripts/gajim (modified) (1 diff)
• setup_win32.py (modified) (2 diffs)

trunk/debian/rules

@@ -29 +29 @@
         make install PREFIX=/usr DESTDIR=`pwd`/debian/tmp
         cp gajim.xpm debian/tmp/usr/share/pixmaps
-        chmod -x debian/tmp/usr/share/gajim/gajim.sh
-        sed -ne '1d;w debian/tmp/gajim.sh.tmp' debian/tmp/usr/share/gajim/gajim.sh
-        mv debian/tmp/gajim.sh.tmp debian/tmp/usr/share/gajim/gajim.sh
+        chmod -x debian/tmp/usr/share/gajim/gajim.py
+        sed -ne '1d;w debian/tmp/gajim.py.tmp' debian/tmp/usr/share/gajim/gajim.py
+        mv debian/tmp/gajim.py.tmp debian/tmp/usr/share/gajim/gajim.py
 
 binary-indep: checkroot build

trunk/Makefile

@@ -5 +5 @@
 DESTDIR         = /
 
-FIND            = find -regex '.*\.\(\(glade\)\|\(py\)\|\(sh\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)'
+FIND            = find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)'
 FILES           = `$(FIND)`
 DIRS            = `$(FIND) -exec dirname {} \; | sort -u`
@@ -38 +38 @@
         mkdir gajim-$(VERSION)
         cp -r plugins scripts common Core doc Messages sounds gajim-$(VERSION)/
-        cp setup_win32.py gajim.iss AUTHORS gajim.1 gajim.xpm gajim.ico COPYING Makefile Changelog README gajim.sh gajim-$(VERSION)
+        cp setup_win32.py gajim.iss AUTHORS gajim.1 gajim.xpm gajim.ico COPYING Makefile Changelog README gajim.py gajim-$(VERSION)
         -find gajim-$(VERSION) -name '.svn' -exec rm -rf {} \; 2> /dev/null
         find gajim-$(VERSION) -name '*.pyc' -exec rm {} \;

trunk/plugins/gtkgui/dialogs.py

@@ -676 +676 @@
                 """When Chat button is clicked"""
                 jid = self.jid_entry.get_text()
+                if jid.find('@') == -1: # if no @ was given
+                        Error_dialog(_('User ID is not valid'))
+                        return
                 # use User class, new_chat expects it that way
                 # is it in the roster?

trunk/plugins/gtkgui/gtkgui.py

@@ -20 +20 @@
 if __name__ == "__main__":
         import getopt, pickle, sys, socket
+
+        try:    # Import Psyco if available
+                import psyco
+                psyco.full()
+        except ImportError:
+                pass
+                
         try:
                 opts, args = getopt.getopt(sys.argv[1:], "p:h", ["help"])

trunk/README

@@ -23 +23 @@
 
 or if you didn't 'make install' you can also run from gajim folder with
-./gajim.sh
+./gajim.py
 
 TROUBLESHOOTING

trunk/scripts/gajim

@@ -25 +25 @@
 cd PREFIX/share/gajim
 export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim"
-gajim.sh
+gajim.py

trunk/setup_win32.py

@@ -2 +2 @@
 ##
 ## Gajim Team:
-##      - Yann Le Boulanger <asterix@lagaule.org>
-##      - Vincent Hanquez <tab@snarc.org>
+## - Yann Le Boulanger <asterix@lagaule.org>
+## - Vincent Hanquez <tab@snarc.org>
 ##      - Nikos Kouremenos <kourem@gmail.com>
 ##      Copyright (C) 2003-2005 Gajim Team
@@ -41 +41 @@
     name = "Gajim",
     description = "A jabber client",
-#    console=["gajim.sh"],
-    windows = [{"script": "gajim.sh",
+#    console=["gajim.py"],
+    windows = [{"script": "gajim.py",
                 "icon_resources": [(1, "gajim.ico")]}],
     options=opts,