[dconf] Split dconf-editor out of dconf
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf] Split dconf-editor out of dconf
- Date: Wed, 18 Feb 2015 20:57:37 +0000 (UTC)
commit 2997ce0df6fe8c5a5b068a20252c06a1079329dd
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Feb 18 15:13:41 2015 -0500
Split dconf-editor out of dconf
Makefile.am | 6 +-
autogen.sh | 1 -
configure.ac | 17 -
editor/.gitignore | 7 -
editor/Makefile.am | 90 ---
editor/ca.desrt.dconf-editor.appdata.xml | 18 -
editor/ca.desrt.dconf-editor.desktop.in.in | 15 -
editor/ca.desrt.dconf-editor.gschema.xml | 25 -
editor/config.vapi | 8 -
editor/dconf-editor-menu.ui | 22 -
editor/dconf-editor.gresource.xml | 7 -
editor/dconf-editor.ui | 348 ---------
editor/dconf-editor.vala | 440 -----------
editor/dconf-model.vala | 763 --------------------
editor/dconf-schema.vala | 485 -------------
editor/dconf-view.vala | 328 ---------
.../icons/HighContrast/16x16/apps/dconf-editor.png | Bin 553 -> 0 bytes
.../icons/HighContrast/22x22/apps/dconf-editor.png | Bin 845 -> 0 bytes
.../icons/HighContrast/24x24/apps/dconf-editor.png | Bin 1010 -> 0 bytes
.../HighContrast/256x256/apps/dconf-editor.png | Bin 12330 -> 0 bytes
.../icons/HighContrast/32x32/apps/dconf-editor.png | Bin 1334 -> 0 bytes
.../icons/HighContrast/48x48/apps/dconf-editor.png | Bin 2016 -> 0 bytes
editor/icons/hicolor/16x16/apps/dconf-editor.png | Bin 804 -> 0 bytes
editor/icons/hicolor/22x22/apps/dconf-editor.png | Bin 1242 -> 0 bytes
editor/icons/hicolor/24x24/apps/dconf-editor.png | Bin 1279 -> 0 bytes
editor/icons/hicolor/256x256/apps/dconf-editor.png | Bin 38754 -> 0 bytes
editor/icons/hicolor/32x32/apps/dconf-editor.png | Bin 2087 -> 0 bytes
editor/icons/hicolor/48x48/apps/dconf-editor.png | Bin 3653 -> 0 bytes
editor/icons/hicolor/64x64/apps/dconf-editor.png | Bin 5683 -> 0 bytes
editor/screenshot.png | Bin 34893 -> 0 bytes
po/.gitignore | 6 -
po/LINGUAS | 59 --
po/POTFILES.in | 8 -
po/POTFILES.skip | 5 -
po/an.po | 175 -----
po/ar.po | 160 ----
po/as.po | 187 -----
po/be.po | 174 -----
po/bg.po | 182 -----
po/bn_IN.po | 168 -----
po/ca.po | 182 -----
po/ca valencia po | 181 -----
po/cs.po | 183 -----
po/da.po | 186 -----
po/de.po | 189 -----
po/el.po | 199 -----
po/en_GB.po | 168 -----
po/eo.po | 173 -----
po/es.po | 184 -----
po/et.po | 145 ----
po/eu.po | 186 -----
po/fa.po | 161 ----
po/fi.po | 163 -----
po/fr.po | 182 -----
po/fur.po | 166 -----
po/gl.po | 193 -----
po/he.po | 184 -----
po/hi.po | 192 -----
po/hu.po | 186 -----
po/id.po | 185 -----
po/is.po | 182 -----
po/it.po | 190 -----
po/ja.po | 160 ----
po/kk.po | 182 -----
po/ko.po | 184 -----
po/lt.po | 184 -----
po/lv.po | 185 -----
po/ml.po | 171 -----
po/mr.po | 169 -----
po/nb.po | 180 -----
po/nl.po | 179 -----
po/pa.po | 192 -----
po/pl.po | 191 -----
po/pt.po | 173 -----
po/pt_BR.po | 184 -----
po/ru.po | 188 -----
po/sk.po | 192 -----
po/sl.po | 185 -----
po/sr.po | 190 -----
po/sr latin po | 190 -----
po/sv.po | 189 -----
po/ta.po | 176 -----
po/te.po | 169 -----
po/tg.po | 177 -----
po/th.po | 181 -----
po/tr.po | 184 -----
po/ug.po | 166 -----
po/uk.po | 180 -----
po/vi.po | 182 -----
po/zh_CN.po | 178 -----
po/zh_HK.po | 175 -----
po/zh_TW.po | 180 -----
92 files changed, 1 insertions(+), 13079 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8c1a485..83cd492 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,7 @@ include Makefile.gtester
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = shm gvdb common engine service gdbus gsettings dbus-1 client bin docs tests po
-
-if ENABLE_EDITOR
-SUBDIRS += editor
-endif
+SUBDIRS = shm gvdb common engine service gdbus gsettings dbus-1 client bin docs tests
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
EXTRA_DIST = trim-lcov.py m4
diff --git a/autogen.sh b/autogen.sh
index 27eb01d..831054a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,6 @@ else
fi
mkdir -p m4 build-aux
-intltoolize --force
gtkdocize --docdir docs --flavour no-tmpl
aclocal${automake_suffix}
autoheader
diff --git a/configure.ac b/configure.ac
index f025eb5..6a974ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,17 +49,6 @@ PKG_CHECK_MODULES(glib, glib-2.0 >= 2.39.1)
PKG_CHECK_MODULES(gio, gio-unix-2.0)
PKG_CHECK_MODULES(dbus, dbus-1)
-AC_ARG_ENABLE(editor,
- AC_HELP_STRING([--disable-editor],
- [Disable the dconf editor]))
-AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" != "xno")
-
-if test "x$enable_editor" != "xno"; then
- PKG_CHECK_MODULES(gtk, gtk+-3.0 >= 3.4)
- PKG_CHECK_MODULES(gmodule, gmodule-2.0)
- PKG_CHECK_MODULES(libxml, libxml-2.0)
-fi
-
AC_ARG_WITH(gio_modules_dir, [ --with-gio-modules-dir=PATH choose directory for the GIO module,
[default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules)
AC_SUBST(giomodulesdir)
@@ -87,9 +76,6 @@ GETTEXT_PACKAGE=dconf
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.50.0])
-
AC_CONFIG_FILES([
common/Makefile
shm/Makefile
@@ -103,11 +89,8 @@ AC_CONFIG_FILES([
service/Makefile
dbus-1/Makefile
bin/Makefile
- editor/Makefile
- editor/ca.desrt.dconf-editor.desktop.in
tests/Makefile
docs/Makefile
- po/Makefile.in
Makefile
])
AC_OUTPUT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
