Re: [Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
On 04/03/2011 01:59 PM, Gonzalo Odiard wrote: Thanks. Must I close the ticket? Gonzalo Hi Gonzalo, let's keep it open, I commented in the ticket about it. Regards, Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
Excerpts from Gonzalo Odiard's message of Thu Mar 31 17:21:19 +0200 2011: If the activity is initiated with create_object=False Acked-by: Sascha Silbe si...@activitycentral.com Pushed as 35cb4e3 [1] (master) and a883557 [2] (sucrose-0.92). Thanks for the patch! Sascha [1] http://git.sugarlabs.org/sugar-toolkit/mainline/commit/35cb4e38811472c50f10ce34607871d3bc0ce59b [2] http://git.sugarlabs.org/sugar-toolkit/mainline/commit/a883557ee1d79990eed64da89bd03d4b1dba1c58 -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
Thanks. Must I close the ticket? Gonzalo On Sun, Apr 3, 2011 at 2:07 PM, Sascha Silbe si...@activitycentral.comwrote: Excerpts from Gonzalo Odiard's message of Thu Mar 31 17:21:19 +0200 2011: If the activity is initiated with create_object=False Acked-by: Sascha Silbe si...@activitycentral.com Pushed as 35cb4e3 [1] (master) and a883557 [2] (sucrose-0.92). Thanks for the patch! Sascha [1] http://git.sugarlabs.org/sugar-toolkit/mainline/commit/35cb4e38811472c50f10ce34607871d3bc0ce59b [2] http://git.sugarlabs.org/sugar-toolkit/mainline/commit/a883557ee1d79990eed64da89bd03d4b1dba1c58 -- http://sascha.silbe.org/ http://www.infra-silbe.de/ -- Gonzalo Odiard SugarLabs Argentina ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
Done: http://bugs.sugarlabs.org/ticket/2743 On Thu, Mar 31, 2011 at 12:23 PM, Simon Schampijer si...@schampijer.dewrote: Hi Gonzalo, thanks for the patch! Can we open a ticket that has a test case for it and add the bug number to the description? If you open it on SL infra please add the '11.2.0' keywords. Regards, Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
Excerpts from Gonzalo Odiard's message of Wed Mar 30 19:22:43 +0200 2011: +if metadata is not None and metadata.get('icon-color', ''): We can drop the second parameter of the get(). The default is None which will be evaluated as False, like the empty string did. Acked-by: Sascha Silbe si...@activitycentral.com Thanks for the patch! Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
If the activity is initiated with create_object=False Acked-by: Sascha Silbe si...@activitycentral.com --- src/sugar/activity/widgets.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py index b5e4ce7..ef23032 100644 --- a/src/sugar/activity/widgets.py +++ b/src/sugar/activity/widgets.py @@ -34,7 +34,7 @@ _ = lambda msg: gettext.dgettext('sugar-toolkit', msg) def _create_activity_icon(metadata): -if metadata.get('icon-color', ''): +if metadata is not None and metadata.get('icon-color'): color = XoColor(metadata['icon-color']) else: client = gconf.client_get_default() -- 1.7.4 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
Hi Gonzalo, thanks for the patch! Can we open a ticket that has a test case for it and add the bug number to the description? If you open it on SL infra please add the '11.2.0' keywords. Regards, Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH] The activity icon does not handle the case of a activity without metadata.
If the activity is initiated with create_object=False --- src/sugar/activity/widgets.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py index b5e4ce7..ef23032 100644 --- a/src/sugar/activity/widgets.py +++ b/src/sugar/activity/widgets.py @@ -34,7 +34,7 @@ _ = lambda msg: gettext.dgettext('sugar-toolkit', msg) def _create_activity_icon(metadata): -if metadata.get('icon-color', ''): +if metadata is not None and metadata.get('icon-color', ''): color = XoColor(metadata['icon-color']) else: client = gconf.client_get_default() -- 1.7.4 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel