[billreminder commit] r601 - in trunk: . src/gui

[codesite...@google.com]

Author: og.maciel
Date: Mon Jul 14 09:56:51 2008
New Revision: 601

Modified:
trunk/setup.py
trunk/src/gui/Changelog
trunk/src/gui/maindialog.py

Log:
Trigger gconf schema registration upon installation; fixed bug
(regression) caused when saving settings to gconf

Modified: trunk/setup.py
==============================================================================
--- trunk/setup.py (original)
+++ trunk/setup.py Mon Jul 14 09:56:51 2008
@@ -53,18 +53,24 @@
print "%s: %s" % (type(e), e)
sys.exit(1)

-class InstallSchema(object):
+class InstallSchema(build):

- def run(self):
- try:
- rc = subprocess.call(['GCONF_CONFIG_SOURCE=`gconftool-2
--get-default-source`', \
- 'gconftool-2', '--makefile-install-rule', '/etc/gconf/schemas/billreminder.schemas'])
- if rc != 0:
- raise Warning, "gconftool returned %d" % rc
- except Exception, e:
- print "Registering the gconf schema has failed."
- print "%s: %s" % (type(e), e)
- sys.exit(1)
+ def run(self):
+ cmd = ["GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`",
+ 'gconftool-2',
+ '--makefile-install-rule',
+ 'data/billreminder.schemas']
+ try:
+ os.system('GCONF_CONFIG_SOURCE=`gconftool-2
--get-default-source` gconftool-2 --makefile-install-rule data/billreminder.schemas')
+ """
+ rc = subprocess.call(cmd)
+ if rc != 0:
+ raise Warning, "gconftool returned %d" % rc
+ """
+ except Exception, e:
+ print "Registering the gconf schema has failed."
+ print "%s: %s" % (type(e), e)
+ sys.exit(1)

class InstallData(install_data):
def run (self):
@@ -122,7 +128,7 @@
#config_files=[('gconf/schemas', ['data/billreminder.schemas'], 'with-gconf-schema-file-dir')],
#packages=['billreminder', 'billreminder.daemon', 'billreminder.db', 'billreminder.gui',
# 'billreminder.gui.widgets', 'billreminder.lib', 'data', 'data/images'],
- cmdclass={'build': BuildData, 'install_data':
InstallData, 'install_schema': InstallSchema},
+ cmdclass={'build': BuildData, 'build':
InstallSchema, 'install_data': InstallData},
distclass=BillReminderDist
)

Modified: trunk/src/gui/Changelog
==============================================================================
--- trunk/src/gui/Changelog (original)
+++ trunk/src/gui/Changelog Mon Jul 14 09:56:51 2008
@@ -1,3 +1,7 @@
+2008-07-14 Og Maciel <ogma...@gnome.org>
+
+ * maindialog.py: No need to cast value passed from View submenus
to strings
+
2008-07-11 Og Maciel <ogma...@gnome.org>

* maindialog.py: Remove duplicated menu entry and fix event handling

Modified: trunk/src/gui/maindialog.py
==============================================================================
--- trunk/src/gui/maindialog.py (original)
+++ trunk/src/gui/maindialog.py Mon Jul 14 09:56:51 2008
@@ -199,7 +199,7 @@
def _change_view(self, action, current):
#TODO: Change the records selection based on option chose
self.gconf_client.set_int(GCONF_GUI_PATH + 'show_paid_bills',
- str(current.get_current_value()))
+ current.get_current_value())
self.reloadTreeView()
return True