[tuxdroid-svn] r304 - in software: alarm_clock/trunk email_alert/trunk gtdi/trunk

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2007-05-08 18:39:26 +0200 (Tue, 08 May 2007)
New Revision: 304

Modified:
   software/alarm_clock/trunk/tdac.py
   software/email_alert/trunk/tdema.py
   software/gtdi/trunk/gtdi.py
Log:
- ADD: patch from Georges Dubus to add support for terminals in kde and xterm
- UPD: removed the unnecessary gnome module from email alert and alarm clock


Modified: software/alarm_clock/trunk/tdac.py
===================================================================
--- software/alarm_clock/trunk/tdac.py	2007-05-03 06:05:56 UTC (rev 303)
+++ software/alarm_clock/trunk/tdac.py	2007-05-08 16:39:26 UTC (rev 304)
@@ -37,7 +37,6 @@
 import os
 
 import gtk
-import gnome
 
 from SimpleGladeApp import SimpleGladeApp
 from SimpleGladeApp import bindtextdomain
@@ -168,7 +167,6 @@
 #------------------------------------------------------------------------------
 def main():
     gtk.gdk.threads_init()
-    gnome.program_init("tdac", "0.0.1")
     window1 = Window1()
 
     window1.run()

Modified: software/email_alert/trunk/tdema.py
===================================================================
--- software/email_alert/trunk/tdema.py	2007-05-03 06:05:56 UTC (rev 303)
+++ software/email_alert/trunk/tdema.py	2007-05-08 16:39:26 UTC (rev 304)
@@ -37,7 +37,6 @@
 import os
 
 import gtk
-import gnome
 
 from poplib import *
 import thread
@@ -236,7 +235,6 @@
 #------------------------------------------------------------------------------
 def main():
     gtk.gdk.threads_init()
-    gnome.program_init("tdema", "0.0.1")
     window1 = Window1()
 
     window1.run()

Modified: software/gtdi/trunk/gtdi.py
===================================================================
--- software/gtdi/trunk/gtdi.py	2007-05-03 06:05:56 UTC (rev 303)
+++ software/gtdi/trunk/gtdi.py	2007-05-08 16:39:26 UTC (rev 304)
@@ -56,6 +56,11 @@
 status_list_st=[]
 status_list_changed=False
 toggled_by_event=False
+
+for term in ["gnome-terminal","konsole","xterm"]:
+	if not os.popen('type %s'%term).close():
+		terminal_app=term
+		break
 #==============================================================================
 # Main window class
 #==============================================================================
@@ -374,7 +379,7 @@
     # On "Tux Droid shell" button clicked
     #--------------------------------------------------------------------------
     def on_tdshell_bt_clicked(self, widget, *args):
-        tux.sys.shell_free('gnome-terminal -e "tuxsh"')
+        tux.sys.shell_free(terminal_app + ' -e "tuxsh"')
 
     #--------------------------------------------------------------------------
     # On "Get light level" button clicked