[gnome-schedule] Remove gnome-python dependency



commit c95bd600d062bf55b9603a34f2c0525a76d87b92
Author: György Balló <ballogy freestart hu>
Date:   Fri May 10 11:30:20 2013 +0200

    Remove gnome-python dependency

 src/atEditor.py       |    1 -
 src/crontabEditor.py  |    1 -
 src/gnome-schedule.py |    8 +-------
 src/mainWindow.py     |   15 +++++----------
 src/scheduleapplet.py |   12 +++---------
 5 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/src/atEditor.py b/src/atEditor.py
index 8d56fab..eb3af3d 100644
--- a/src/atEditor.py
+++ b/src/atEditor.py
@@ -20,7 +20,6 @@
 #pygtk modules
 import gtk
 import gobject
-import gnome
 
 #python modules
 import os
diff --git a/src/crontabEditor.py b/src/crontabEditor.py
index 7379d07..654a811 100644
--- a/src/crontabEditor.py
+++ b/src/crontabEditor.py
@@ -20,7 +20,6 @@
 #pygtk modules
 import gtk
 import gobject
-import gnome
 
 #python modules
 import re
diff --git a/src/gnome-schedule.py b/src/gnome-schedule.py
index 7b9f47c..f265500 100644
--- a/src/gnome-schedule.py
+++ b/src/gnome-schedule.py
@@ -58,9 +58,6 @@ except:
 try:
   import gtk
   import gtk.glade
-  # TODO: Gnome specific
-  import gnome
-  import gnome.ui
 
 except:
   print _("You need to install pyGTK or GTKv2,\n"
@@ -68,8 +65,5 @@ except:
           "try: export PYTHONPATH= ")
   sys.exit(1)
 
-props = { gnome.PARAM_APP_DATADIR : config.getPrefix() + "/share" }
-pr = gnome.program_init ("gnome-schedule", config.getVersion(), properties=props)
-
-mainWindow = mainWindow.main(debug_flag, False, pr, manual_poscorrect)
+mainWindow = mainWindow.main(debug_flag, False, manual_poscorrect)
 
diff --git a/src/mainWindow.py b/src/mainWindow.py
index a514276..8d38558 100644
--- a/src/mainWindow.py
+++ b/src/mainWindow.py
@@ -22,15 +22,13 @@ import gtk
 import gtk.glade
 import gobject
 
-# gnome specific
-import gnome
-from gnome import url_show
 
 #python modules
 import os
 import pwd
 import tempfile
 import stat
+import subprocess
 
 #custom modules
 import config
@@ -52,10 +50,9 @@ gtk.glade.bindtextdomain(config.GETTEXT_PACKAGE(), config.GNOMELOCALEDIR())
 ## The MainWindow class
 ##
 class main:
-    def __init__(self, debug_flag=None, inapplet=False, gprogram = None, manual_poscorrect=False):
+    def __init__(self, debug_flag=None, inapplet=False, manual_poscorrect=False):
         self.debug_flag = debug_flag
         self.inapplet = inapplet
-        self.gprogram = gprogram
         self.manual_poscorrect = manual_poscorrect
 
         self.__loadIcon__()
@@ -646,7 +643,7 @@ class main:
 
     #about box
     def open_url (self, *args):
-        url_show("http://gnome-schedule.sourceforge.net";)
+        gtk.show_uri(None, "http://gnome-schedule.sourceforge.net";, 0)
 
 
 
@@ -717,7 +714,7 @@ class main:
             # unset POSIXLY_CORRECT if manually set, bug 612459
             if self.manual_poscorrect: os.unsetenv ('POSIXLY_CORRECT')
 
-            gnome.execute_terminal_shell (self.user_home_dir, execute)
+            subprocess.Popen('gnome-terminal --working-directory="' + self.user_home_dir + '" -e "' + 
execute + '"', shell=True)
 
             if self.manual_poscorrect: os.putenv ('POSIXLY_CORRECT', 'enabled')
 
@@ -761,9 +758,7 @@ class main:
     #open help
     def on_manual_menu_activate (self, *args):
         try:
-            gnome.help_display (
-                    'gnome-schedule',
-                    None)
+            gtk.show_uri(None, 'ghelp:gnome-schedule', 0)
         except gobject.GError, error:
             dialog = gtk.MessageDialog (
                     self.widget,
diff --git a/src/scheduleapplet.py b/src/scheduleapplet.py
index cc0d55f..66700b4 100755
--- a/src/scheduleapplet.py
+++ b/src/scheduleapplet.py
@@ -58,8 +58,6 @@ try:
   import gtk
   import gtk.glade
   # TODO: Gnome specific
-  import gnome
-  import gnome.ui
   import gnomeapplet
   import gobject
 
@@ -69,13 +67,10 @@ except:
           "try: export PYTHONPATH= ")
   sys.exit(1)
 
-props = { gnome.PARAM_APP_DATADIR : config.getPrefix() + "/share"}
-pr = gnome.program_init ("gnome-schedule", config.getVersion(), properties=props)
-
 
 
 class ScheduleApplet(gnomeapplet.Applet):
-    def __init__(self, applet, iid, gprogram, debug_flag, manual_poscorrect):
+    def __init__(self, applet, iid, debug_flag, manual_poscorrect):
         self.__gobject_init__()
         self.debug_flag = debug_flag
         self.manual_poscorrect = manual_poscorrect
@@ -88,7 +83,6 @@ class ScheduleApplet(gnomeapplet.Applet):
 
 
         self.applet = applet
-        self.gprogram = gprogram
         self.__loadIcon__()
 
 
@@ -150,7 +144,7 @@ class ScheduleApplet(gnomeapplet.Applet):
     def show_main_window(self, *args):
         if self.main_loaded == False:
             self.main_loaded = True
-            self.main_window = mainWindow.main(None, True, self.gprogram, self.manual_poscorrect)
+            self.main_window = mainWindow.main(None, True, self.manual_poscorrect)
         else:
             self.main_window.widget.show ()
             self.main_window.schedule_reload()
@@ -179,7 +173,7 @@ gobject.type_register(ScheduleApplet)
 
 #factory
 def schedule_applet_factory(applet, iid):
-    ScheduleApplet(applet, iid, pr, debug_flag, manual_poscorrect)
+    ScheduleApplet(applet, iid, debug_flag, manual_poscorrect)
     return True
 
 gnomeapplet.bonobo_factory("OAFIID:GNOME_GnomeSchedule_Factory",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]