applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

query and monitor the xcursor icon dir for cursor themes, too (bug

Browse source 
2007-10-14  Jens Granseuer  <jensgr@gmx.net>

	* configure.in:
	* capplets/common/gnome-theme-info.c (gnome_theme_init): query and
	monitor the xcursor icon dir for cursor themes, too (bug #469882)

svn path=/trunk/; revision=8166
This commit is contained in:
Jens Granseuer 2007-10-14 09:52:28 +00:00 • committed by Jens Granseuer
parent 5ed22b4a3a
commit afbc8c9ba8
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-14 Jens Granseuer <jensgr@gmx.net>
* configure.in:
* capplets/common/gnome-theme-info.c (gnome_theme_init): query and
monitor the xcursor icon dir for cursor themes, too (bug #469882)
2007-10-09 Bastien Nocera <hadess@hadess.net> 2007-10-09 Bastien Nocera <hadess@hadess.net>
* schemas/apps_gnome_settings_daemon_keybindings.schemas.in: * schemas/apps_gnome_settings_daemon_keybindings.schemas.in:

11
capplets/common/gnome-theme-info.c
View file

@ -1991,6 +1991,17 @@ gnome_theme_init (gboolean *monitor_not_added)
top_theme_dir_string = g_build_filename (INSTALL_PREFIX, "share", "icons", NULL); top_theme_dir_string = g_build_filename (INSTALL_PREFIX, "share", "icons", NULL);
} }
top_theme_dir_uri = gnome_vfs_uri_new (top_theme_dir_string); top_theme_dir_uri = gnome_vfs_uri_new (top_theme_dir_string);
#ifdef XCURSOR_ICONDIR
/* if there's a separate xcursors dir, add that as well */
if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
top_theme_dir_uri = gnome_vfs_uri_new (XCURSOR_ICONDIR);
if (gnome_vfs_uri_exists (top_theme_dir_uri))
result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 1, NULL);
gnome_vfs_uri_unref (top_theme_dir_uri);
}
#endif
g_free (top_theme_dir_string); g_free (top_theme_dir_string);
if (!gnome_vfs_uri_exists (top_theme_dir_uri)) if (!gnome_vfs_uri_exists (top_theme_dir_uri))

11
configure.in
View file

@ -177,6 +177,17 @@ AM_CONDITIONAL(HAVE_XCURSOR, [test $have_xcursor=yes])
AC_SUBST(XCURSOR_CFLAGS) AC_SUBST(XCURSOR_CFLAGS)
AC_SUBST(XCURSOR_LIBS) AC_SUBST(XCURSOR_LIBS)
if test x$have_xcursor = xyes; then
AC_MSG_CHECKING([for XCURSOR cursor location])
XCURSOR_ICONDIR=$($PKG_CONFIG --variable=icondir xcursor)
if test "x$XCURSOR_ICONDIR" != x; then
AC_DEFINE_UNQUOTED(XCURSOR_ICONDIR, "${XCURSOR_ICONDIR}", [Define to the xcursor icon path])
else
XCURSOR_ICONDIR=none
fi
AC_MSG_RESULT([${XCURSOR_ICONDIR}])
fi
CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS" CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
dnl ============== dnl ==============