summaryrefslogtreecommitdiff
path: root/src/PhotoPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-05-23 07:44:24 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-05-23 07:44:24 +0200
commitbeb8b0dad71871aa66b63901b3e6b6c047e1a646 (patch)
treef96b49e7dabca98306db6cf716592c62adcc9b77 /src/PhotoPage.vala
parent2861a48339aa0756131008dfaf399426c97de34b (diff)
parent08f04632f65e109dae9bd554621e33454adacf41 (diff)
Merge branch 'release/debian/0.30.16-1'debian/0.30.16-1
Diffstat (limited to 'src/PhotoPage.vala')
-rw-r--r--src/PhotoPage.vala8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index bced0ea..fd513b2 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -396,9 +396,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
private Gtk.ToggleToolButton redeye_button = null;
private Gtk.ToggleToolButton adjust_button = null;
private Gtk.ToggleToolButton straighten_button = null;
-#if ENABLE_FACES
private Gtk.ToggleToolButton faces_button = null;
-#endif
private Gtk.ToolButton enhance_button = null;
private Gtk.Scale zoom_slider = null;
private Gtk.ToolButton prev_button = new Gtk.ToolButton(null, Resources.PREVIOUS_LABEL);
@@ -491,12 +489,10 @@ public abstract class EditingHostPage : SinglePhotoPage {
enhance_button.is_important = true;
toolbar.insert(enhance_button, -1);
-#if ENABLE_FACES
// faces tool
insert_faces_button(toolbar);
faces_button = new Gtk.ToggleToolButton();
//face_button
-#endif
// separator to force next/prev buttons to right side of toolbar
Gtk.SeparatorToolItem separator = new Gtk.SeparatorToolItem();
@@ -2357,9 +2353,7 @@ public class LibraryPhotoPage : EditingHostPage {
}
}
-#if ENABLE_FACES
private Gtk.ToggleToolButton faces_button = null;
-#endif
private CollectionPage? return_page = null;
private bool return_to_collection_on_release = false;
private LibraryPhotoPageViewFilter filter = new LibraryPhotoPageViewFilter();
@@ -3168,7 +3162,6 @@ public class LibraryPhotoPage : EditingHostPage {
get_command_manager().execute(new ModifyTagsCommand(photo, new_tags));
}
-#if ENABLE_FACES
private void on_faces_toggled() {
on_tool_button_toggled(faces_button, FacesTool.factory);
}
@@ -3186,6 +3179,5 @@ public class LibraryPhotoPage : EditingHostPage {
faces_button.is_important = true;
toolbar.insert(faces_button, -1);
}
-#endif
}