Commit d2d7619d authored by Victor Ananjevsky's avatar Victor Ananjevsky

remove optional gio. now this is always on

parent 26c27b46
......@@ -44,23 +44,6 @@ if test x$have_html = xyes; then
AC_DEFINE([HAVE_HTML], [1], [Define this if you have webkit2gt library])
fi
dnl gio support
AC_ARG_ENABLE([gio],
[AS_HELP_STRING([--enable-gio],
[Build YAD with GIO support])],
[build_gio=$enableval], [build_gio=yes])
if test x$build_gio = xyes; then
PKG_CHECK_MODULES([GIO], [gio-2.0], [have_gio=yes], [have_gio=no])
else
have_gio=no
fi
AC_SUBST([GIO_CFLAGS])
AC_SUBST([GIO_LIBS])
if test x$have_gio = xyes; then
AC_DEFINE([HAVE_GIO], [1], [Define this if you have glib gio framework])
fi
dnl spell check
AC_ARG_ENABLE([spell],
[AS_HELP_STRING([--enable-spell],
......@@ -155,7 +138,6 @@ echo "Build configuratioh:"
echo " HTML widget - $have_html"
echo " GtkSourceView - $have_sourceview"
echo " Spell checking - $have_spell"
echo " GIO support - $have_gio"
echo " Path to rgb.txt - $with_rgb"
echo " pfd - $build_pfd"
echo " Icon browser - $build_ib"
......
......@@ -428,14 +428,12 @@ read_dir ()
g_dir_close (dir);
}
#ifdef HAVE_GIO
static void
dir_changed_cb (GFileMonitor *mon, GFile *file, GFile *ofile, GFileMonitorEvent ev, gpointer data)
{
if (ev == G_FILE_MONITOR_EVENT_DELETED || ev == G_FILE_MONITOR_EVENT_CREATED)
read_dir ();
}
#endif
GtkWidget *
icons_create_widget (GtkWidget * dlg)
......@@ -516,7 +514,6 @@ icons_create_widget (GtkWidget * dlg)
else
g_signal_connect (G_OBJECT (icon_view), "row-activated", G_CALLBACK (activate_cb), NULL);
#ifdef HAVE_GIO
/* start file monitor */
if (options.icons_data.monitor && options.icons_data.directory)
{
......@@ -528,7 +525,6 @@ icons_create_widget (GtkWidget * dlg)
g_object_unref (file);
}
}
#endif
gtk_container_add (GTK_CONTAINER (w), icon_view);
......
......@@ -391,10 +391,8 @@ static GOptionEntry icons_options[] = {
N_("Sort items in descending order"), NULL },
{ "single-click", 0, 0, G_OPTION_ARG_NONE, &options.icons_data.single_click,
N_("Activate items by single click"), NULL },
#ifdef HAVE_GIO
{ "monitor", 0, 0, G_OPTION_ARG_NONE, &options.icons_data.monitor,
N_("Watch fot changes in directory"), NULL },
#endif
{ NULL }
};
......@@ -1587,9 +1585,7 @@ yad_options_init (void)
options.icons_data.sort_by_name = FALSE;
options.icons_data.descend = FALSE;
options.icons_data.single_click = FALSE;
#ifdef HAVE_GIO
options.icons_data.monitor = FALSE;
#endif
/* Initialize list data */
options.list_data.columns = NULL;
......
......@@ -319,9 +319,7 @@ typedef struct {
gboolean single_click;
guint width;
gchar *term;
#ifdef HAVE_GIO
gboolean monitor;
#endif
} YadIconsData;
typedef struct {
......
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