[gnome-initial-setup/mcatanzaro/uselocale-take-2: 1/2] Have only one copy of cc-common-language
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/mcatanzaro/uselocale-take-2: 1/2] Have only one copy of cc-common-language
- Date: Fri, 1 Mar 2019 21:37:01 +0000 (UTC)
commit 16c3d211a093d1ce9f9e6ba9a1db424f87a2cbcd
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Fri Mar 1 13:41:15 2019 -0600
Have only one copy of cc-common-language
Currently we have three separate copies of cc-common-language in the
source tree, of which only one actually gets built. (But we do use all
three of the separate headers.)
Let's drop down to just one, because I need to edit it.
Oh, and for bonus points, they of course weren't kept in sync. I at
first selected the copy from the region page to be used, but this one
was stale and broken so that didn't work great.
.../{pages/language => }/cc-common-language.c | 0
.../{pages/keyboard => }/cc-common-language.h | 0
gnome-initial-setup/meson.build | 1 +
.../pages/keyboard/cc-common-language.c | 304 -------------------
.../pages/language/cc-common-language.h | 36 ---
gnome-initial-setup/pages/language/meson.build | 2 -
.../pages/region/cc-common-language.c | 325 ---------------------
.../pages/region/cc-common-language.h | 36 ---
8 files changed, 1 insertion(+), 703 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/cc-common-language.c
b/gnome-initial-setup/cc-common-language.c
similarity index 100%
rename from gnome-initial-setup/pages/language/cc-common-language.c
rename to gnome-initial-setup/cc-common-language.c
diff --git a/gnome-initial-setup/pages/keyboard/cc-common-language.h
b/gnome-initial-setup/cc-common-language.h
similarity index 100%
rename from gnome-initial-setup/pages/keyboard/cc-common-language.h
rename to gnome-initial-setup/cc-common-language.h
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index c461562..bc04108 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -10,6 +10,7 @@ resources = gnome.compile_resources(
sources += [
resources,
+ 'cc-common-language.c',
'gnome-initial-setup.c',
'gis-assistant.c',
'gis-page.c',
diff --git a/gnome-initial-setup/pages/language/meson.build b/gnome-initial-setup/pages/language/meson.build
index 7bd06f7..ef6ba3f 100644
--- a/gnome-initial-setup/pages/language/meson.build
+++ b/gnome-initial-setup/pages/language/meson.build
@@ -5,8 +5,6 @@ sources += gnome.compile_resources(
)
sources += files(
- 'cc-common-language.c',
- 'cc-common-language.h',
'cc-language-chooser.c',
'cc-language-chooser.h',
'cc-util.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]