mirror of https://github.com/GNOME/gimp.git
lower minimum required version of libhal to 0.5.7.
2007-02-12 Sven Neumann <sven@gimp.org> * configure.in: lower minimum required version of libhal to 0.5.7. * modules/gimpinputdevicestore.c: don't list PC Speaker, even though the kernel claims that it would be an input device. svn path=/trunk/; revision=21894
This commit is contained in:
parent
6b23611169
commit
6b788ad186
|
@ -1,3 +1,10 @@
|
|||
2007-02-12 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* configure.in: lower minimum required version of libhal to 0.5.7.
|
||||
|
||||
* modules/gimpinputdevicestore.c: don't list PC Speaker, even
|
||||
though the kernel claims that it would be an input device.
|
||||
|
||||
2007-02-11 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* modules/gimpinputdevicestore.c: don't limit the store to
|
||||
|
|
|
@ -57,7 +57,7 @@ m4_define([gnomeui_required_version], [2.10.0])
|
|||
m4_define([gnome_keyring_required_version], [0.4.5])
|
||||
m4_define([libcurl_required_version], [7.15.1])
|
||||
m4_define([dbus_glib_required_version], [0.70])
|
||||
m4_define([libhal_required_version], [0.5.8])
|
||||
m4_define([libhal_required_version], [0.5.7])
|
||||
|
||||
|
||||
AC_INIT([GIMP], [gimp_version],
|
||||
|
|
|
@ -187,13 +187,27 @@ gimp_input_device_store_add (GimpInputDeviceStore *store,
|
|||
{
|
||||
char *str;
|
||||
|
||||
if (strcmp (caps[i], "input"))
|
||||
if (strcmp (caps[i], "input") != 0)
|
||||
continue;
|
||||
|
||||
/* skip "PC Speaker" (why is this an input device at all?) */
|
||||
str = libhal_device_get_property_string (store->context,
|
||||
udi, "input.physical_device",
|
||||
NULL);
|
||||
if (str)
|
||||
{
|
||||
gboolean speaker =
|
||||
strcmp (str, "/org/freedesktop/Hal/devices/platform_pcspkr") == 0;
|
||||
|
||||
libhal_free_string (str);
|
||||
|
||||
if (speaker)
|
||||
continue;
|
||||
}
|
||||
|
||||
str = libhal_device_get_property_string (store->context,
|
||||
udi, "input.product",
|
||||
NULL);
|
||||
|
||||
if (str)
|
||||
{
|
||||
GtkTreeIter iter;
|
||||
|
|
Loading…
Reference in New Issue