From 65f1e5c0475d5f747233b94c0709d3d525e36171 Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@waishou>
Date: Tue, 29 Jan 2008 23:58:08 +0000
Subject: [PATCH] Only use the gnome module if it is available, otherwise use
 the (inferior) built-in webbrowser module. This will probably break email
 URLs for non-gnome users, but there's not much we can do about that and it's
 better than not working at all. Fixes LP #184809 Also laying some groundwork
 for 0.8

---
 ChangeLog         |  6 ++++++
 po/terminator.pot | 41 ++++++++++++++++++++++++++---------------
 setup.py          |  2 +-
 terminator        | 18 ++++++++++++++----
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0b32833..61fb3bc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+terminator 0.8:
+	* Make dependency on python-gnome optional. Non-gnome users can now reap
+	  the glorious benefits of Terminator and will only lose the ability to
+		open email URLs (assuming their browser won't handle this for them).
+		Closes LP #184809
+
 terminator 0.7:
 
   * Fullscreen support, via a patch from Thomas Meire. Closes LP #178914
diff --git a/po/terminator.pot b/po/terminator.pot
index 00ee6889..5d937854 100644
--- a/po/terminator.pot
+++ b/po/terminator.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-03 09:22+0100\n"
+"POT-Creation-Date: 2008-01-29 23:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,55 +16,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: terminator:42
+#: terminator:44
 msgid ""
-"You need to install the python bindings for gobject, gnome, gtk, gconf and "
-"pango to run Terminator."
+"You need to install the python bindings for gobject, gtk, gconf and pango to "
+"run Terminator."
 msgstr ""
 
-#: terminator:51
+#: terminator:63
 msgid ""
 "You need to install python bindings for libvte (\"python-vte\" in debian/"
 "ubuntu)"
 msgstr ""
 
-#: terminator:315
+#: terminator:127
+#, python-format
+msgid "Warning: unable to find profile %s. Continue with default values..."
+msgstr ""
+
+#: terminator:213
+msgid ""
+"Unknown value requested. Unable to find in gconf profile or default "
+"settings: "
+msgstr ""
+
+#: terminator:414
 msgid "_Open Link"
 msgstr ""
 
-#: terminator:316
+#: terminator:415
 msgid "_Copy Link Address"
 msgstr ""
 
-#: terminator:322
+#: terminator:421
 msgid "_Send Mail To..."
 msgstr ""
 
-#: terminator:323
+#: terminator:422
 msgid "_Copy Email Address"
 msgstr ""
 
-#: terminator:348
+#: terminator:447
 msgid "Show scrollbar"
 msgstr ""
 
-#: terminator:348
+#: terminator:455
 msgid "Split H_orizontally"
 msgstr ""
 
-#: terminator:352
+#: terminator:459
 msgid "Split V_ertically"
 msgstr ""
 
-#: terminator:422
+#: terminator:527
 msgid "Close?"
 msgstr ""
 
-#: terminator:427
+#: terminator:532
 msgid "<big><b>Close all terminals?</b></big>"
 msgstr ""
 
-#: terminator:430
+#: terminator:535
 #, python-format
 msgid ""
 "This window has %s terminals open.  Closing the window will also close all "
diff --git a/setup.py b/setup.py
index 8db90920..e501847f 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ class InstallData(install_data):
 
 
 setup(name='Terminator',
-      version='0.7',
+      version='0.8',
       description='Terminator, the robot future of terminals',
       author='Chris Jones',
       author_email='cmsj@tenshu.net',
diff --git a/terminator b/terminator
index 9ed2fa96..eee3a910 100755
--- a/terminator
+++ b/terminator
@@ -36,15 +36,25 @@ gettext.install ('terminator')
 # import unix-lib
 import pwd
 
-# import gtk/gnome libs
+# import gtk libs
 # check just in case anyone runs it on a non-gnome system.
 try:
-  import gobject, gtk, gnome, gconf, pango
+  import gobject, gtk, gconf, pango
 except:
   print >> sys.stderr, _("You need to install the python bindings for " \
-    "gobject, gnome, gtk, gconf and pango to run Terminator.")
+    "gobject, gtk, gconf and pango to run Terminator.")
   sys.exit(1)
 
+# import a library for viewing URLs
+try:
+  # gnome.url_show() is really useful
+  import gnome
+  url_show = gnome.url_show
+except:
+  # webbrowser.open() is not really useful, but will do as a fallback
+  import webbrowser
+  url_show = webbrowser.open
+
 # import vte-bindings
 try:
   import vte
@@ -412,7 +422,7 @@ class TerminatorTerm:
         namecopy = _("_Copy Email Address")
 
       item = gtk.MenuItem (nameopen)
-      item.connect ("activate", lambda menu_item: gnome.url_show (address))
+      item.connect ("activate", lambda menu_item: url_show (address))
       menu.append (item)
 
       item = gtk.MenuItem (namecopy)