Commit 89a49795 authored by Victor Ananjevsky's avatar Victor Ananjevsky

add --enable-deprecated parameter to configure script

parent 05dd3422
......@@ -105,6 +105,16 @@ if test x$build_sa = xyes; then
AC_DEFINE([STANDALONE], [1], [Define this if you need standalone YAD binary])
fi
dnl deprecated options
AC_ARG_ENABLE([deprecated],
[AS_HELP_STRING([--enable-deprecated],
[Build YAD with deprecated options])],
[build_depr=$enableval], [build_depr=yes])
if test x$build_depr = xyes; then
AC_DEFINE([DEPRECATED], [1], [Define this if you need to build YAD with deprecated options])
fi
dnl tools
AC_ARG_ENABLE([tools],
[AS_HELP_STRING([--enable-tools],
......@@ -173,6 +183,7 @@ echo " GtkSourceView - $have_sourceview"
echo " Spell checking - $have_spell"
echo " Path to rgb.txt - $with_rgb"
echo " Standalone build - $build_sa"
echo " Deprecated options - $build_depr"
echo " Tools - $build_tools"
echo " Icon browser - $build_ib"
echo
......@@ -242,7 +242,7 @@ Set default exit code to \fINUMBER\fP instead of \fI0\fP.
.B \-\-css=\fISTRING\fP
Read and parse additional GTK+ CSS styles from given data. If \fISTRING\fP is filename, the content of file is loaded. If not \fISTRING\fP treats like CSS data.
.TP
.B \-\-gtkrc=\fIFILENAME\fP
.B \-\-gtkrc=\fIFILENAME\fP (Deprecated)
Read and parse additional GTK+ CSS styles from given file. This option is deprecated. Use \fB--css\fP instead.
.TP
.B \-\-hscroll-policy=\fITYPE\fP
......
......@@ -807,6 +807,7 @@ main (gint argc, gchar ** argv)
GTK_STYLE_PROVIDER_PRIORITY_USER);
g_object_unref (css);
}
#ifdef DEPRECATED
else if (options.gtkrc_file)
{
GtkCssProvider *css = gtk_css_provider_new ();
......@@ -819,6 +820,7 @@ main (gint argc, gchar ** argv)
GTK_STYLE_PROVIDER_PRIORITY_USER);
g_object_unref (css);
}
#endif
/* set default icons and icon theme */
if (options.data.icon_theme)
......
......@@ -733,8 +733,10 @@ static GOptionEntry misc_options[] = {
N_("Print version"), NULL },
{ "css", 0, 0, G_OPTION_ARG_STRING, &options.css,
N_("Load additional CSS settings from file or string"), N_("STRING") },
#ifdef DEPRECATED
{ "gtkrc", 0, 0, G_OPTION_ARG_FILENAME, &options.gtkrc_file,
N_("Load additional CSS settings from file"), N_("FILENAME") },
#endif
{ "hscroll-policy", 0, 0, G_OPTION_ARG_CALLBACK, set_scroll_policy,
N_("Set policy for horizontal scrollbars (auto, always, never)"), N_("TYPE") },
{ "vscroll-policy", 0, 0, G_OPTION_ARG_CALLBACK, set_scroll_policy,
......@@ -1568,7 +1570,9 @@ yad_options_init (void)
options.rest_file = NULL;
options.extra_data = NULL;
options.css = NULL;
#ifdef DEPRECATED
options.gtkrc_file = NULL;
#endif
#ifndef G_OS_WIN32
options.kill_parent = 0;
options.print_xid = FALSE;
......
......@@ -585,7 +585,9 @@ typedef struct {
#endif
gchar *css;
#ifdef DEPRECATED
gchar *gtkrc_file;
#endif
gchar *rest_file;
gchar **extra_data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment