From 246761b7a8ae1bad51a7e2c7385c5e05cddebd63 Mon Sep 17 00:00:00 2001 From: "louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13" Date: Mon, 1 Feb 2010 20:28:33 +0000 Subject: [PATCH] /usr/bin/environ c'est mieux --- Makefile | 2 +- poezio_80.png => data/poezio_80.png | Bin launch.sh | 3 ++- src/window.py | 8 ++------ 4 files changed, 5 insertions(+), 8 deletions(-) rename poezio_80.png => data/poezio_80.png (100%) diff --git a/Makefile b/Makefile index 83138703..96d99b57 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ install:all done $(INSTALL) -m644 src/xmpp/* $(DATADIR)/poezio/src/xmpp/ - echo "#!/bin/sh" > $(BINDIR)/poezio + echo "#!/usr/bin/environ sh" > $(BINDIR)/poezio echo "cd $(DATADIR)/poezio/src/ && python client.py" >> $(BINDIR)/poezio chmod 755 $(BINDIR)/poezio diff --git a/poezio_80.png b/data/poezio_80.png similarity index 100% rename from poezio_80.png rename to data/poezio_80.png diff --git a/launch.sh b/launch.sh index c1c292d9..6fba3920 100644 --- a/launch.sh +++ b/launch.sh @@ -1,3 +1,4 @@ -#!/bin/sh +#!/usr/bin/environ sh + cd src/ && python client.py "$@" diff --git a/src/window.py b/src/window.py index 0d42a88b..61c07378 100644 --- a/src/window.py +++ b/src/window.py @@ -26,9 +26,7 @@ class Win(object): def _resize(self, height, width, y, x, parent_win): self.height, self.width, self.x, self.y = height, width, x, y - # try: self.win = parent_win.subwin(height, width, y, x) - # except: def refresh(self): self.win.noutrefresh() @@ -98,9 +96,7 @@ class TextWin(object): def rebuild(self, lines): """ - called when the terminal is resized. - resize all the windows, clear them and rewrite - the lines in them + deprecated """ pass # TODO @@ -134,7 +130,7 @@ class TextWin(object): break try: try:win.addstr('\n['+line[0].strftime("%H:%M:%S") + "] <") - except:pass # exception happens on resize, but it doesn't change anything... + except:pass # exception happens on resize length = len('['+line[0].strftime("%H:%M:%S") + "] <") try:win.attron(curses.color_pair(user.color)) except:pass