diff options
author | Ajay Garg <ajay@activitycentral.com> | 2012-09-18 19:05:22 (GMT) |
---|---|---|
committer | Ajay Garg <ajay@activitycentral.com> | 2012-09-18 19:05:22 (GMT) |
commit | 6ffc1d19a147a3b785cc90bfbc01557cb7f8206c (patch) | |
tree | 9d7417141015044212d50d26ac76dccc28572eda | |
parent | e417921a4fda4774ecba7c11646ea09ab1efe8d7 (diff) |
sdxo#2345: Now, favorite-buttons work as desired.
-rw-r--r-- | rpms/sugar/0142-sdxo-2345-Now-favorite-buttons-work-as-desired.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/rpms/sugar/0142-sdxo-2345-Now-favorite-buttons-work-as-desired.patch b/rpms/sugar/0142-sdxo-2345-Now-favorite-buttons-work-as-desired.patch new file mode 100644 index 0000000..039543a --- /dev/null +++ b/rpms/sugar/0142-sdxo-2345-Now-favorite-buttons-work-as-desired.patch @@ -0,0 +1,77 @@ +From e2f880c64ceeb7620b436f0bed69c388e81ec804 Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@activitycentral.com> +Date: Wed, 19 Sep 2012 00:32:54 +0530 +Subject: [PATCH] sdxo#2345: Now, favorite-buttons work as desired. +Organization: Sugar Labs Foundation +Signed-off-by: Ajay Garg <ajay@activitycentral.com> +--- + src/jarabe/journal/expandedentry.py | 13 +++++-------- + src/jarabe/journal/journalactivity.py | 3 +++ + src/jarabe/journal/listview.py | 6 +++++- + 3 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py +index 1e857ba..10e18ae 100644 +--- a/src/jarabe/journal/expandedentry.py ++++ b/src/jarabe/journal/expandedentry.py +@@ -429,14 +429,11 @@ class ExpandedEntry(hippo.CanvasBox): + needs_update = True + + if needs_update: +- if self._metadata.get('mountpoint', '/') == '/': +- model.write(self._metadata, update_mtime=False) +- else: +- old_file_path = os.path.join(self._metadata['mountpoint'], +- model.get_file_name(old_title, +- self._metadata['mime_type'])) +- model.write(self._metadata, file_path=old_file_path, +- update_mtime=False) ++ from jarabe.journal.journalactivity import get_journal ++ self._metadata['mountpoint'] = \ ++ get_journal().get_detail_toolbox().get_mount_point() ++ ++ model.update_only_metadata_and_preview_files_and_return_file_paths(self._metadata) + + self._update_title_sid = None + +diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py +index 3ecb97c..05b2e67 100644 +--- a/src/jarabe/journal/journalactivity.py ++++ b/src/jarabe/journal/journalactivity.py +@@ -518,6 +518,9 @@ class JournalActivity(JournalWindow): + def get_toolbar_box(self): + return self._toolbox + ++ def get_detail_toolbox(self): ++ return self._detail_toolbox ++ + + def get_journal(): + global _journal +diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py +index a4b4d8e..780ba0a 100644 +--- a/src/jarabe/journal/listview.py ++++ b/src/jarabe/journal/listview.py +@@ -330,7 +330,7 @@ class BaseListView(gtk.Bin): + + favorite = None + if 'keep' in metadata.keys(): +- favorite = metadata['keep'] ++ favorite = str(metadata['keep']) + + if favorite == '1': + client = gconf.client_get_default() +@@ -348,6 +348,10 @@ class BaseListView(gtk.Bin): + metadata['keep'] = '0' + else: + metadata['keep'] = '1' ++ ++ from jarabe.journal.journalactivity import get_mount_point ++ metadata['mountpoint'] = get_mount_point() ++ + model.write(metadata, update_mtime=False) + + self.__redraw_view_if_necessary() +-- +1.7.4.4 + |