clicompanion-devs team mailing list archive

[David Caro <david.caro.estevez@xxxxxxxxx>]

David Caro has proposed merging lp:~dcaro/clicompanion/fix-1035073.2 into lp:clicompanion.

Requested reviews:
  CLI Companion Development Team (clicompanion-devs)
Related bugs:
  Bug #1035073 in CLI Companion: "CLI companion gives error code when ran"
  https://bugs.launchpad.net/clicompanion/+bug/1035073

For more details, see:
https://code.launchpad.net/~dcaro/clicompanion/fix-1035073.2/+merge/145083

Now it does not need python-gconf module nor gconf to return a default font, it uses 'Monospace 10' if none found.
-- 
https://code.launchpad.net/~dcaro/clicompanion/fix-1035073.2/+merge/145083
Your team CLI Companion Development Team is requested to review the proposed merge of lp:~dcaro/clicompanion/fix-1035073.2 into lp:clicompanion.

=== modified file 'clicompanionlib/tabs.py'
--- clicompanionlib/tabs.py	2012-01-29 23:57:51 +0000
+++ clicompanionlib/tabs.py	2013-01-27 10:19:22 +0000
@@ -37,7 +37,6 @@
 import view
 import gobject
 import pango
-import gconf
 from clicompanionlib.utils import dbg
 import clicompanionlib.utils as cc_utils
 import clicompanionlib.helpers as cc_helpers

=== modified file 'clicompanionlib/utils.py'
--- clicompanionlib/utils.py	2012-01-11 20:16:12 +0000
+++ clicompanionlib/utils.py	2013-01-27 10:19:22 +0000
@@ -30,7 +30,8 @@
 try:
     import gconf
 except ImportError:
-    pass
+    gconf = False
+
 
 
 ## set to True if you want to see more logs
@@ -211,13 +212,15 @@
 def get_system_font(callback=None):
     """Look up the system font"""
     global gconf_cli
-    if 'gconf' not in globals():
+    if not gconf:
         return 'Monospace 10'
     else:
         if not gconf_cli:
             gconf_cli = gconf.client_get_default()
         value = gconf_cli.get(
                     '/desktop/gnome/interface/monospace_font_name')
+        if not value:
+            return 'Monospace 10'
         system_font = value.get_string()
         if callback:
             gconf_cli.notify_add(

=== modified file 'setup.py'
--- setup.py	2012-01-08 01:23:55 +0000
+++ setup.py	2013-01-27 10:19:22 +0000
@@ -23,26 +23,31 @@
 try:
     from DistUtilsExtra.command import *
 except ImportError:
-    print "This program needs python's DistUtilsExtra module to run, see https://launchpad.net/python-distutils-extra";
+    print ("This program needs python's DistUtilsExtra module to run,"
+            " see https://launchpad.net/python-distutils-extra";
+            )
     sys.exit(1)
 
 
 
 
-setup(  name='clicompanion',
-        version='1.1',
-        description='Run Terminal commands from a GUI. Store commands for later use.',
-        author='Duane Hinnen',
-        author_email='duanedesign@xxxxxxxxx',
-        scripts=['clicompanion'],
-        packages=['clicompanionlib', 'plugins'],
-        data_files=[('/etc/clicompanion.d/', ['data/clicompanion2.config']),
+setup(
+    name='clicompanion',
+    version='1.1',
+    description='Run Terminal commands from a GUI. Store commands for later use.',
+    author='Duane Hinnen',
+    author_email='duanedesign@xxxxxxxxx',
+    scripts=['clicompanion'],
+    packages=['clicompanionlib', 'plugins'],
+    data_files=[
+        ('/etc/clicompanion.d/', ['data/clicompanion2.config']),
         ('/usr/share/pixmaps', ['data/clicompanion.16.png']),
         ('/usr/share/applications', ['data/clicompanion.desktop']),
         ('/usr/share/clicompanion/locale/', glob.glob('locale/*/LC_MESSAGES/*.mo')),
-         ],
-         
-        cmdclass = { 'build'       : build_extra.build_extra,
-                     'build_i18n' :  build_i18n.build_i18n,
-        },  
-        )
+        ],
+
+    cmdclass = {
+        'build'       : build_extra.build_extra,
+        'build_i18n' :  build_i18n.build_i18n,
+        },
+    )