[dia: 94/105] #19 review: Don't worry about meson code duplication in */pixmaps.
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia: 94/105] #19 review: Don't worry about meson code duplication in */pixmaps.
- Date: Mon, 28 Jan 2019 19:27:15 +0000 (UTC)
commit ccfdf06f48f2794995affa6ac979b0d87542f46a
Author: Eduard Nicodei <eddnicodei gmail com>
Date: Sat Jan 26 15:46:04 2019 +0000
#19 review: Don't worry about meson code duplication in */pixmaps.
- Will be removed once we port to GResource.
See !14#note_410459.
app/pixmaps/meson.build | 3 ++-
lib/pixmaps/meson.build | 2 ++
objects/standard/pixmaps/meson.build | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/app/pixmaps/meson.build b/app/pixmaps/meson.build
index 4fda5d7d..ecfbb46d 100644
--- a/app/pixmaps/meson.build
+++ b/app/pixmaps/meson.build
@@ -25,7 +25,8 @@ icons = [
'cursor-magnify-plus.png'
]
-#TODO: this is duplicated from lib/pixmaps. Any way to remove this duplication?
+#TODO: this is duplicated in app/pixmaps, lib/pixmaps and objects/standard/pixmaps.
+# Remove from all three once we port from gdk_pixbuf_csource to GResource.
icon_pairs = []
foreach icon_file : icons
icon_pairs += ['dia_' + icon_file.split('.')[0].underscorify() + '_icon', files(icon_file)]
diff --git a/lib/pixmaps/meson.build b/lib/pixmaps/meson.build
index 567ce4a8..3759ad30 100644
--- a/lib/pixmaps/meson.build
+++ b/lib/pixmaps/meson.build
@@ -1,6 +1,8 @@
# Generate csource for the icons.
icons = [ 'broken.png', 'broken-chain.png', 'unbroken-chain.png', 'standard-path.png' ]
+#TODO: this is duplicated in app/pixmaps, lib/pixmaps and objects/standard/pixmaps.
+# Remove from all three once we port from gdk_pixbuf_csource to GResource.
icon_pairs = []
foreach icon_file : icons
icon_pairs += ['dia_' + icon_file.split('.')[0].underscorify() + '_icon', files(icon_file)]
diff --git a/objects/standard/pixmaps/meson.build b/objects/standard/pixmaps/meson.build
index 9232be70..bf6397c7 100644
--- a/objects/standard/pixmaps/meson.build
+++ b/objects/standard/pixmaps/meson.build
@@ -13,7 +13,8 @@ icons = [
'zigzagline.png'
]
-#TODO: this is duplicated from lib/pixmaps. Any way to remove this duplication?
+#TODO: this is duplicated in app/pixmaps, lib/pixmaps and objects/standard/pixmaps.
+# Remove from all three once we port from gdk_pixbuf_csource to GResource.
icon_pairs = []
foreach icon_file : icons
icon_pairs += [icon_file.split('.')[0].underscorify() + '_icon', files(icon_file)]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]