diff --git a/Makefile.in b/Makefile.in
index d5b43a2..ddcdbca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,8 +55,8 @@ SOURCES= \
$(wildcard $(srcdir)/src/main/@OSNAME@/*.rc)
SCHEMAS= \
- $(wildcard schemas/@OSNAME@/*.gschema.xml) \
- $(wildcard schemas/common/*.gschema.xml)
+ $(wildcard schemas/*.gschema.xml) \
+ $(wildcard schemas/*.gschema.xml)
#---[ Tools ]----------------------------------------------------------------------------
@@ -198,7 +198,7 @@ $(POTDIR)/%.pot: \
@touch $@
$(OBJDIR)/schemas/%.xml: \
- schemas/@OSNAME@/%.xml
+ schemas/%.xml
@$(MKDIR) $(@D)
@cp "$^" "$@"
diff --git a/configure.ac b/configure.ac
index 86b319c..90ae587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,8 +75,6 @@ case "$host" in
AC_CONFIG_FILES(src/main/windows/app-manifest.xml)
# Windows and linux doesn't use the same defaults.
- AC_CONFIG_FILES(schemas/windows/application.gschema.xml)
- AC_CONFIG_FILES(schemas/windows/window.gschema.xml)
AC_CONFIG_FILES(win/makeruntime.sh)
AC_CONFIG_FILES(win/pw3270.nsi)
@@ -93,7 +91,7 @@ case "$host" in
AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
AC_SUBST(WINARCH,$app_cv_winarch)
AC_SUBST(NSISREDIR,$app_cv_nsisredir)
-
+ AC_SUBST(DEFAULT_UI_STYLE,0)
;;
*-apple-darwin*)
@@ -102,9 +100,7 @@ case "$host" in
CFLAGS="$CFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
-
- AC_CONFIG_FILES(schemas/macos/application.gschema.xml)
- AC_CONFIG_FILES(schemas/macos/window.gschema.xml)
+ AC_SUBST(DEFAULT_UI_STYLE,0)
;;
*)
@@ -113,9 +109,7 @@ case "$host" in
CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir)"
LDFLAGS="$LDFLAGS -pthread"
-
- AC_CONFIG_FILES(schemas/linux/application.gschema.xml)
- AC_CONFIG_FILES(schemas/linux/window.gschema.xml)
+ AC_SUBST(DEFAULT_UI_STYLE,0)
esac
@@ -202,8 +196,15 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product
AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product,[The product name])
AC_SUBST(PRODUCT_NAME,$app_cv_product)
-AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id=`pkg-config --variable=product_id lib3270`.terminal ])
+AC_ARG_WITH([product-id], [AS_HELP_STRING([--product-id], [Set the product ID])], [ app_cv_product_id="$withval" ],[ app_cv_product_id=`$PKG_CONFIG --variable=product_id lib3270` ])
+AC_DEFINE_UNQUOTED(PRODUCT_ID, $app_cv_product_id,[The product ID])
+AC_SUBST(PRODUCT_ID,$app_cv_product_id)
+app_cv_object_path="/"`echo $app_cv_product_id | sed -e "s@\.@/@g"`"/"
+AC_DEFINE_UNQUOTED(PRODUCT_PATH, "$app_cv_object_path",[The schema path])
+AC_SUBST(PRODUCT_PATH,$app_cv_object_path)
+
+AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id=$app_cv_product_id.terminal ])
AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id,[The application ID])
AC_SUBST(APPLICATION_ID,$app_cv_application_id)
@@ -294,7 +295,11 @@ dnl Configure which files to generate.
dnl ---------------------------------------------------------------------------
AC_CONFIG_FILES(Makefile)
+
+AC_CONFIG_FILES(schemas/application.gschema.xml)
+AC_CONFIG_FILES(schemas/window.gschema.xml)
AC_CONFIG_FILES(schemas/Makefile)
+
AC_CONFIG_FILES(locale/Makefile)
AC_CONFIG_FILES(branding/Makefile)
diff --git a/schemas/Makefile.in b/schemas/Makefile.in
index 5f24902..02731b6 100644
--- a/schemas/Makefile.in
+++ b/schemas/Makefile.in
@@ -50,18 +50,18 @@ all:
@$(MKDIR) $(BINDIR)
@$(GLIB_SCHEMA_COMPILER) \
--targetdir=$(BINDIR) \
- ./@OSNAME@
+ .
install: \
all
@$(MKDIR) $(DESTDIR)/$(schemadir)
@$(INSTALL_DATA) \
- @OSNAME@/application.gschema.xml \
+ application.gschema.xml \
$(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-application.gschema.xml
@$(INSTALL_DATA) \
- @OSNAME@/window.gschema.xml \
+ window.gschema.xml \
$(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-window.gschema.xml
@$(GLIB_SCHEMA_COMPILER) \
diff --git a/schemas/application.gschema.xml.in b/schemas/application.gschema.xml.in
new file mode 100644
index 0000000..898cae1
--- /dev/null
+++ b/schemas/application.gschema.xml.in
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+ @DEFAULT_UI_STYLE@
+ UI Style
+ The ID of the current user interface style
+
+
+
+ 0
+ GTK CSD
+ Gtk Client side decorations (win32 only)
+
+
+
+ true
+ Allow host settings
+ Allow changing of host session properties
+
+
+
+ true
+ Enable open session actions actions
+ Enable open session actions
+
+
+
+ true
+ Enable new tab actions
+ Enable new tab actions
+
+
+
+ true
+ Enable new window actions
+ Enable new window actions
+
+
+
+ '~/.config/default.3270'
+ Path of the default session file
+
+
+
+
+ false
+ Update default session time from command line
+
+
+
+
+ true
+ Add session file to recent file list
+
+
+
+
+
+
+
diff --git a/schemas/linux/application.gschema.xml.in b/schemas/linux/application.gschema.xml.in
deleted file mode 100644
index 8c07164..0000000
--- a/schemas/linux/application.gschema.xml.in
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
- 2
- UI Style
- The ID of the current user interface style
-
-
-
-
- true
- Allow host settings
- Allow changing of host session properties
-
-
-
- true
- Enable open session actions actions
- Enable open session actions
-
-
-
- true
- Enable new tab actions
- Enable new tab actions
-
-
-
- true
- Enable new window actions
- Enable new window actions
-
-
-
- '~/.config/default.3270'
- Path of the default session file
-
-
-
-
- false
- Update default session time from command line
-
-
-
-
- true
- Add session file to recent file list
-
-
-
-
-
-
-
diff --git a/schemas/linux/window.gschema.xml.in b/schemas/linux/window.gschema.xml.in
deleted file mode 100644
index 02bb0c4..0000000
--- a/schemas/linux/window.gschema.xml.in
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
- -1
- The window width.
-
-
-
-
- -1
- The window height.
-
-
-
-
- false
- Is the window maximized?
-
-
-
-
- false
- Is the window in full screen mode?
-
-
-
-
- false
- Enable top window subtitle
- If TRUE, reserve space for a subtitle, even if none is currently set.
-
-
-
- false
- The toolbar visible state
-
-
-
-
- false
- The menubar visible state
-
-
-
-
- -1
- How to draw the toolbar.
-
-
-
-
- 0
- The size of the toolbar icons
-
-
-
-
- 0
- Use symbolic icons on toolbar
-
-
-
-
- 0
- Use symbolic icons on title bar
-
-
-
-
- 0
- The toolbar position
-
-
-
-
- 'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'
- The toolbar action list
-
-
-
-
- 'menu.open-menu,win.disconnect,win.reconnect:'
- The title bar action list
-
-
-
-
- ''
- Path of the default session file
-
-
-
-
-
-
diff --git a/schemas/macos/application.gschema.xml.in b/schemas/macos/application.gschema.xml.in
deleted file mode 100644
index 8c07164..0000000
--- a/schemas/macos/application.gschema.xml.in
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
- 2
- UI Style
- The ID of the current user interface style
-
-
-
-
- true
- Allow host settings
- Allow changing of host session properties
-
-
-
- true
- Enable open session actions actions
- Enable open session actions
-
-
-
- true
- Enable new tab actions
- Enable new tab actions
-
-
-
- true
- Enable new window actions
- Enable new window actions
-
-
-
- '~/.config/default.3270'
- Path of the default session file
-
-
-
-
- false
- Update default session time from command line
-
-
-
-
- true
- Add session file to recent file list
-
-
-
-
-
-
-
diff --git a/schemas/macos/window.gschema.xml.in b/schemas/macos/window.gschema.xml.in
deleted file mode 100644
index 62d1a2e..0000000
--- a/schemas/macos/window.gschema.xml.in
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
- -1
- The window width.
-
-
-
-
- -1
- The window height.
-
-
-
-
- false
- Is the window maximized?
-
-
-
-
- false
- Is the window in full screen mode?
-
-
-
-
- false
- Enable top window subtitle
- If TRUE, reserve space for a subtitle, even if none is currently set.
-
-
-
- false
- The toolbar visible state
-
-
-
-
- -1
- How to draw the toolbar.
-
-
-
-
- 0
- The size of the toolbar icons
-
-
-
-
- 0
- Use symbolic icons on toolbar
-
-
-
-
- 0
- Use symbolic icons on title bar
-
-
-
-
- 0
- The toolbar position
-
-
-
-
- 'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'
- The toolbar action list
-
-
-
-
- 'app.tab.new:menu.open-menu,win.disconnect,win.reconnect'
- The title bar action list
-
-
-
-
- ''
- Path of the default session file
-
-
-
-
-
-
diff --git a/schemas/window.gschema.xml.in b/schemas/window.gschema.xml.in
new file mode 100644
index 0000000..34786a0
--- /dev/null
+++ b/schemas/window.gschema.xml.in
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+ -1
+ The window width.
+
+
+
+
+ -1
+ The window height.
+
+
+
+
+ false
+ Is the window maximized?
+
+
+
+
+ false
+ Is the window in full screen mode?
+
+
+
+
+ false
+ Enable top window subtitle
+ If TRUE, reserve space for a subtitle, even if none is currently set.
+
+
+
+ false
+ The toolbar visible state
+
+
+
+
+ false
+ The menubar visible state
+
+
+
+
+ -1
+ How to draw the toolbar.
+
+
+
+
+ 0
+ The size of the toolbar icons
+
+
+
+
+ 0
+ Use symbolic icons on toolbar
+
+
+
+
+ 0
+ Use symbolic icons on title bar
+
+
+
+
+ 0
+ The toolbar position
+
+
+
+
+ 'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'
+ The toolbar action list
+
+
+
+
+ 'menu.open-menu,win.disconnect,win.reconnect:'
+ The title bar action list
+
+
+
+
+ ''
+ Path of the default session file
+
+
+
+
+
+
diff --git a/schemas/windows/application.gschema.xml.in b/schemas/windows/application.gschema.xml.in
deleted file mode 100644
index ea7cedd..0000000
--- a/schemas/windows/application.gschema.xml.in
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
- 0
- UI Style
- The ID of the current user interface style
-
-
-
- 0
- GTK CSD
- Gtk Client side decorations
-
-
-
- true
- Allow host settings
- Allow changing of host session properties
-
-
-
- true
- Enable open session actions actions
- Enable open session actions
-
-
-
- true
- Enable new tab actions
- Enable new tab actions
-
-
-
- true
- Enable new window actions
- Enable new window actions
-
-
-
- '~/.config/default.3270'
- Path of the default session file
-
-
-
-
- false
- Update default session time from command line
-
-
-
-
- true
- Add session file to recent file list
-
-
-
-
-
-
-
diff --git a/schemas/windows/window.gschema.xml.in b/schemas/windows/window.gschema.xml.in
deleted file mode 100644
index 39321e7..0000000
--- a/schemas/windows/window.gschema.xml.in
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
- -1
- The window width.
-
-
-
-
- -1
- The window height.
-
-
-
-
- false
- Is the window maximized?
-
-
-
-
- false
- Is the window in full screen mode?
-
-
-
-
- false
- Enable top window subtitle
- If TRUE, reserve space for a subtitle, even if none is currently set.
-
-
-
- true
- The toolbar visible state
-
-
-
-
- true
- The menubar visible state
-
-
-
-
- 0
- How to draw the toolbar.
-
-
-
-
- 2
- The size of the toolbar icons
-
-
-
-
- 0
- Use symbolic icons on toolbar
-
-
-
-
- 0
- Use symbolic icons on title bar
-
-
-
-
- 0
- The toolbar position
-
-
-
-
- 'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'
- The toolbar action list
-
-
-
-
- 'menu.open-menu,win.disconnect,win.reconnect:'
- The title bar action list
-
-
-
-
- ''
- Path of the default session file
-
-
-
-
-
-
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 5768846..6234a28 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -96,9 +96,15 @@
/* The product name */
#undef PLUGIN_DIR
+/* The product ID */
+#undef PRODUCT_ID
+
/* The product name */
#undef PRODUCT_NAME
+/* The schema path */
+#undef PRODUCT_PATH
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
--
libgit2 0.21.2