Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
girara
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Johannes Löthberg
girara
Commits
ce5ad806
Commit
ce5ad806
authored
Nov 11, 2016
by
Sebastian Ramacher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove old glib compat code
Signed-off-by:
Sebastian Ramacher
<
sebastian@ramacher.at
>
parent
61f33840
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
13 deletions
+2
-13
README
README
+1
-1
config.mk
config.mk
+1
-1
girara/utils.c
girara/utils.c
+0
-5
tests/test_utils.c
tests/test_utils.c
+0
-6
No files found.
README
View file @
ce5ad806
...
...
@@ -9,7 +9,7 @@ enhance the user interface that is used by zathura and jumanji.
Requirements
------------
glib (>= 2.
28
)
glib (>= 2.
36
)
gtk3 (>= 3.4)
intltool
libnotify (optional, for notification support)
...
...
config.mk
View file @
ce5ad806
...
...
@@ -50,7 +50,7 @@ GTK_MIN_VERSION = 3.4
GTK_PKG_CONFIG_NAME
=
gtk+-3.0
# glib
GLIB_VERSION_CHECK
?=
1
GLIB_MIN_VERSION
=
2.
28
GLIB_MIN_VERSION
=
2.
36
GLIB_PKG_CONFIG_NAME
=
glib-2.0
# libs
...
...
girara/utils.c
View file @
ce5ad806
...
...
@@ -90,12 +90,7 @@ char*
girara_get_home_directory
(
const
char
*
user
)
{
if
(
user
==
NULL
||
g_strcmp0
(
user
,
g_get_user_name
())
==
0
)
{
#if GLIB_CHECK_VERSION(2, 35, 3)
return
g_strdup
(
g_get_home_dir
());
#else
const
char
*
homedir
=
g_getenv
(
"HOME"
);
return
g_strdup
(
homedir
?
homedir
:
g_get_home_dir
());
#endif
}
// XXX: The following code is very unportable.
...
...
tests/test_utils.c
View file @
ce5ad806
...
...
@@ -116,7 +116,6 @@ static void
xdg_path_impl
(
girara_xdg_path_t
path
,
const
gchar
*
envvar
,
const
gchar
*
expected
)
{
#if GLIB_CHECK_VERSION(2, 35, 3)
const
gchar
*
home
=
g_getenv
(
"HOME"
);
gchar
*
home_env_var
=
NULL
;
gchar
**
envp
=
NULL
;
...
...
@@ -132,9 +131,6 @@ xdg_path_impl(girara_xdg_path_t path, const gchar* envvar,
}
envp
[
0
]
=
g_strdup_printf
(
"%s="
,
envvar
);
#else
gchar
*
envp
[]
=
{
g_strdup_printf
(
"%s="
,
envvar
),
NULL
};
#endif
gchar
*
argv
[]
=
{
XDG_TEST_HELPER
,
g_strdup_printf
(
"%d"
,
path
),
NULL
};
gchar
*
output
=
NULL
;
...
...
@@ -166,10 +162,8 @@ xdg_path_impl(girara_xdg_path_t path, const gchar* envvar,
g_free
(
envp
[
0
]);
g_free
(
argv
[
1
]);
#if GLIB_CHECK_VERSION(2, 35, 3)
g_free
(
home_env_var
);
g_free
(
envp
);
#endif
}
START_TEST
(
test_xdg_path
)
{
...
...
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