Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@sugarlabs.org>2008-12-23 10:24:42 (GMT)
committer Tomeu Vizoso <tomeu@sugarlabs.org>2008-12-23 10:24:42 (GMT)
commit849f7558faacaca12f27f1180503a30bc1230f1c (patch)
tree1c06f1bf9f356060130f5a9c963edcbb9b6bafe6
parent2fb3d75b6a64630f7a2b9d0a621245301385f80d (diff)
#126 Fix erase button in the journal
-rw-r--r--src/jarabe/journal/journalactivity.py4
-rw-r--r--src/jarabe/journal/journaltoolbox.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 99d84fb..18412a6 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -267,7 +267,8 @@ class JournalActivity(Window):
def _check_for_bundle(self, object_id):
registry = bundleregistry.get_registry()
- bundle = misc.get_bundle(object_id)
+ metadata = model.get(object_id)
+ bundle = misc.get_bundle(metadata)
if bundle is None:
return
@@ -280,7 +281,6 @@ class JournalActivity(Window):
(bundle.get_path(), e))
return
- metadata = model.get(object_id)
if metadata['mime_type'] == JournalEntryBundle.MIME_TYPE:
model.delete(object_id)
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index f8052eb..bcd59b7 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -365,7 +365,7 @@ class EntryToolbar(gtk.Toolbar):
def _erase_button_clicked_cb(self, button):
registry = bundleregistry.get_registry()
- bundle = misc.get_bundle(self._metadata['uid'])
+ bundle = misc.get_bundle(self._metadata)
if bundle is not None and registry.is_installed(bundle):
registry.uninstall(bundle)
model.delete(self._metadata['uid'])