Skip to content

Commit

Permalink
modules: gimp_input_device_store_add(): bail out if the device has no…
Browse files Browse the repository at this point in the history
… parent
  • Loading branch information
mitchfoo committed Jun 26, 2011
1 parent df448eb commit ce4ab71
Showing 1 changed file with 20 additions and 15 deletions.
35 changes: 20 additions & 15 deletions modules/gimpinputdevicestore-gudev.c
Expand Up @@ -293,29 +293,34 @@ gimp_input_device_store_add (GimpInputDeviceStore *store,
else
{
GUdevDevice *parent = g_udev_device_get_parent (device);
const gchar *parent_name;

parent_name = g_udev_device_get_sysfs_attr (parent, "name");

if (parent_name)
if (parent)
{
GtkTreeIter unused;
const gchar *parent_name;

parent_name = g_udev_device_get_sysfs_attr (parent, "name");

if (! gimp_input_device_store_lookup (store, parent_name, &unused))
if (parent_name)
{
gimp_input_device_store_insert (store, parent_name, parent_name,
device_file);
GtkTreeIter unused;

if (! gimp_input_device_store_lookup (store, parent_name,
&unused))
{
gimp_input_device_store_insert (store,
parent_name, parent_name,
device_file);

g_signal_emit (store, store_signals[DEVICE_ADDED], 0,
parent_name);
g_signal_emit (store, store_signals[DEVICE_ADDED], 0,
parent_name);

g_object_unref (parent);
return TRUE;
g_object_unref (parent);
return TRUE;
}
}
}

g_object_unref (parent);
return FALSE;
g_object_unref (parent);
}
}
}

Expand Down

0 comments on commit ce4ab71

Please sign in to comment.