Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav
yad
Commits
d2d7619d
Commit
d2d7619d
authored
Mar 13, 2019
by
Victor Ananjevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove optional gio. now this is always on
parent
26c27b46
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
28 deletions
+0
-28
configure.ac
configure.ac
+0
-18
icons.c
src/icons.c
+0
-4
option.c
src/option.c
+0
-4
yad.h
src/yad.h
+0
-2
No files found.
configure.ac
View file @
d2d7619d
...
@@ -44,23 +44,6 @@ if test x$have_html = xyes; then
...
@@ -44,23 +44,6 @@ if test x$have_html = xyes; then
AC_DEFINE([HAVE_HTML], [1], [Define this if you have webkit2gt library])
AC_DEFINE([HAVE_HTML], [1], [Define this if you have webkit2gt library])
fi
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
dnl spell check
AC_ARG_ENABLE([spell],
AC_ARG_ENABLE([spell],
[AS_HELP_STRING([--enable-spell],
[AS_HELP_STRING([--enable-spell],
...
@@ -155,7 +138,6 @@ echo "Build configuratioh:"
...
@@ -155,7 +138,6 @@ echo "Build configuratioh:"
echo " HTML widget - $have_html"
echo " HTML widget - $have_html"
echo " GtkSourceView - $have_sourceview"
echo " GtkSourceView - $have_sourceview"
echo " Spell checking - $have_spell"
echo " Spell checking - $have_spell"
echo " GIO support - $have_gio"
echo " Path to rgb.txt - $with_rgb"
echo " Path to rgb.txt - $with_rgb"
echo " pfd - $build_pfd"
echo " pfd - $build_pfd"
echo " Icon browser - $build_ib"
echo " Icon browser - $build_ib"
...
...
src/icons.c
View file @
d2d7619d
...
@@ -428,14 +428,12 @@ read_dir ()
...
@@ -428,14 +428,12 @@ read_dir ()
g_dir_close
(
dir
);
g_dir_close
(
dir
);
}
}
#ifdef HAVE_GIO
static
void
static
void
dir_changed_cb
(
GFileMonitor
*
mon
,
GFile
*
file
,
GFile
*
ofile
,
GFileMonitorEvent
ev
,
gpointer
data
)
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
)
if
(
ev
==
G_FILE_MONITOR_EVENT_DELETED
||
ev
==
G_FILE_MONITOR_EVENT_CREATED
)
read_dir
();
read_dir
();
}
}
#endif
GtkWidget
*
GtkWidget
*
icons_create_widget
(
GtkWidget
*
dlg
)
icons_create_widget
(
GtkWidget
*
dlg
)
...
@@ -516,7 +514,6 @@ icons_create_widget (GtkWidget * dlg)
...
@@ -516,7 +514,6 @@ icons_create_widget (GtkWidget * dlg)
else
else
g_signal_connect
(
G_OBJECT
(
icon_view
),
"row-activated"
,
G_CALLBACK
(
activate_cb
),
NULL
);
g_signal_connect
(
G_OBJECT
(
icon_view
),
"row-activated"
,
G_CALLBACK
(
activate_cb
),
NULL
);
#ifdef HAVE_GIO
/* start file monitor */
/* start file monitor */
if
(
options
.
icons_data
.
monitor
&&
options
.
icons_data
.
directory
)
if
(
options
.
icons_data
.
monitor
&&
options
.
icons_data
.
directory
)
{
{
...
@@ -528,7 +525,6 @@ icons_create_widget (GtkWidget * dlg)
...
@@ -528,7 +525,6 @@ icons_create_widget (GtkWidget * dlg)
g_object_unref
(
file
);
g_object_unref
(
file
);
}
}
}
}
#endif
gtk_container_add
(
GTK_CONTAINER
(
w
),
icon_view
);
gtk_container_add
(
GTK_CONTAINER
(
w
),
icon_view
);
...
...
src/option.c
View file @
d2d7619d
...
@@ -391,10 +391,8 @@ static GOptionEntry icons_options[] = {
...
@@ -391,10 +391,8 @@ static GOptionEntry icons_options[] = {
N_
(
"Sort items in descending order"
),
NULL
},
N_
(
"Sort items in descending order"
),
NULL
},
{
"single-click"
,
0
,
0
,
G_OPTION_ARG_NONE
,
&
options
.
icons_data
.
single_click
,
{
"single-click"
,
0
,
0
,
G_OPTION_ARG_NONE
,
&
options
.
icons_data
.
single_click
,
N_
(
"Activate items by single click"
),
NULL
},
N_
(
"Activate items by single click"
),
NULL
},
#ifdef HAVE_GIO
{
"monitor"
,
0
,
0
,
G_OPTION_ARG_NONE
,
&
options
.
icons_data
.
monitor
,
{
"monitor"
,
0
,
0
,
G_OPTION_ARG_NONE
,
&
options
.
icons_data
.
monitor
,
N_
(
"Watch fot changes in directory"
),
NULL
},
N_
(
"Watch fot changes in directory"
),
NULL
},
#endif
{
NULL
}
{
NULL
}
};
};
...
@@ -1587,9 +1585,7 @@ yad_options_init (void)
...
@@ -1587,9 +1585,7 @@ yad_options_init (void)
options
.
icons_data
.
sort_by_name
=
FALSE
;
options
.
icons_data
.
sort_by_name
=
FALSE
;
options
.
icons_data
.
descend
=
FALSE
;
options
.
icons_data
.
descend
=
FALSE
;
options
.
icons_data
.
single_click
=
FALSE
;
options
.
icons_data
.
single_click
=
FALSE
;
#ifdef HAVE_GIO
options
.
icons_data
.
monitor
=
FALSE
;
options
.
icons_data
.
monitor
=
FALSE
;
#endif
/* Initialize list data */
/* Initialize list data */
options
.
list_data
.
columns
=
NULL
;
options
.
list_data
.
columns
=
NULL
;
...
...
src/yad.h
View file @
d2d7619d
...
@@ -319,9 +319,7 @@ typedef struct {
...
@@ -319,9 +319,7 @@ typedef struct {
gboolean
single_click
;
gboolean
single_click
;
guint
width
;
guint
width
;
gchar
*
term
;
gchar
*
term
;
#ifdef HAVE_GIO
gboolean
monitor
;
gboolean
monitor
;
#endif
}
YadIconsData
;
}
YadIconsData
;
typedef
struct
{
typedef
struct
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment