[gnome-photos] application: Shuffle some code around
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] application: Shuffle some code around
- Date: Wed, 17 Feb 2016 15:06:18 +0000 (UTC)
commit f4c11b8570a01e5d4fd0ec323d9c5a59661bf17b
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Feb 17 15:27:01 2016 +0100
application: Shuffle some code around
We are going to reuse the loop for app.open-current also. So, let's
move things around a bit to make it more convenient.
https://bugzilla.gnome.org/show_bug.cgi?id=761587
src/photos-application.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 4cee2d3..3fce884 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -299,6 +299,7 @@ photos_application_actions_update (PhotosApplication *self)
GList *selection;
PhotosLoadState load_state;
PhotosWindowMode mode;
+ gboolean can_trash;
gboolean enable;
gboolean selection_mode;
@@ -349,18 +350,20 @@ photos_application_actions_update (PhotosApplication *self)
g_simple_action_set_enabled (priv->print_action, enable);
g_simple_action_set_enabled (priv->save_action, enable);
- enable = ((load_state == PHOTOS_LOAD_STATE_FINISHED
- && mode == PHOTOS_WINDOW_MODE_PREVIEW
- && photos_base_item_can_trash (item))
- || (selection_mode && selection != NULL));
+ can_trash = selection != NULL;
for (l = selection; l != NULL; l = l->next)
{
PhotosBaseItem *selected_item;
const gchar *urn = (gchar *) l->data;
selected_item = PHOTOS_BASE_ITEM (photos_base_manager_get_object_by_id (priv->state->item_mngr, urn));
- enable = enable && photos_base_item_can_trash (selected_item);
+ can_trash = can_trash && photos_base_item_can_trash (selected_item);
}
+
+ enable = ((load_state == PHOTOS_LOAD_STATE_FINISHED
+ && mode == PHOTOS_WINDOW_MODE_PREVIEW
+ && photos_base_item_can_trash (item))
+ || (selection_mode && can_trash));
g_simple_action_set_enabled (priv->delete_action, enable);
enable = (load_state == PHOTOS_LOAD_STATE_FINISHED
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]