summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2017-10-27 10:14:20 +0200
committerOndrej Holy <oholy@redhat.com>2017-10-27 11:16:51 +0200
commit2abe31fbdfebac7cee3655f61656150a4094458b (patch)
tree4ea2e538509f66c219d0838d8d9d0d94cc62fa5e
parent9f8561de232332979bedfea94b1df927f271d070 (diff)
downloadgvfs-2abe31fbdfebac7cee3655f61656150a4094458b.tar.gz
gphoto2: Uncomment debug prints
It doesn't make sense to have commented g_debug prints, then they are totally unusable. Let's uncomment them, so they can be printed if G_MESSAGES_DEBUG is specified... https://bugzilla.gnome.org/show_bug.cgi?id=789491
-rw-r--r--monitor/gphoto2/ggphoto2volumemonitor.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/monitor/gphoto2/ggphoto2volumemonitor.c b/monitor/gphoto2/ggphoto2volumemonitor.c
index 06e07ab6..595512a3 100644
--- a/monitor/gphoto2/ggphoto2volumemonitor.c
+++ b/monitor/gphoto2/ggphoto2volumemonitor.c
@@ -144,8 +144,8 @@ gudev_add_camera (GGPhoto2VolumeMonitor *monitor, GUdevDevice *device, gboolean
#ifdef HAVE_LIBMTP
if (g_udev_device_get_property_as_boolean (device, "ID_MTP_DEVICE"))
{
- /* g_debug ("ignoring device, is MTP"); */
- return;
+ g_debug ("gudev_add_camera: ignoring device, is MTP");
+ return;
}
#endif /* HAVE_LIBMTP */
@@ -161,9 +161,9 @@ gudev_add_camera (GGPhoto2VolumeMonitor *monitor, GUdevDevice *device, gboolean
return;
}
- /* g_debug ("gudev_add_camera: camera device %s (bus: %i, device: %i)",
+ g_debug ("gudev_add_camera: camera device %s (bus: %i, device: %i)",
g_udev_device_get_device_file (device),
- usb_bus_num, usb_device_num); */
+ usb_bus_num, usb_device_num);
store_heads = get_stores_for_camera (usb_bus_num, usb_device_num);
num_store_heads = g_list_length (store_heads);
@@ -186,7 +186,7 @@ gudev_add_camera (GGPhoto2VolumeMonitor *monitor, GUdevDevice *device, gboolean
uri = g_strdup_printf ("gphoto2://[usb:%s,%s]/%s", usb_bus_num, usb_device_num,
store_path[0] == '/' ? store_path + 1 : store_path);
}
- /* g_debug ("gudev_add_camera: ... adding URI for storage head: %s", uri); */
+ g_debug ("gudev_add_camera: ... adding URI for storage head: %s", uri);
activation_mount_root = g_file_new_for_uri (uri);
g_free (uri);
@@ -216,7 +216,7 @@ gudev_remove_camera (GGPhoto2VolumeMonitor *monitor, GUdevDevice *device)
sysfs_path = g_udev_device_get_sysfs_path (device);
- /* g_debug ("gudev_remove_camera: %s", g_udev_device_get_device_file (device)); */
+ g_debug ("gudev_remove_camera: %s", g_udev_device_get_device_file (device));
for (l = monitor->camera_volumes; l != NULL; l = ll)
{
@@ -226,7 +226,7 @@ gudev_remove_camera (GGPhoto2VolumeMonitor *monitor, GUdevDevice *device)
if (g_gphoto2_volume_has_path (volume, sysfs_path))
{
- /* g_debug ("gudev_remove_camera: found volume %s, deleting", sysfs_path); */
+ g_debug ("gudev_remove_camera: found volume %s, deleting", sysfs_path);
g_signal_emit_by_name (monitor, "volume_removed", volume);
g_signal_emit_by_name (volume, "removed");
g_gphoto2_volume_removed (volume);
@@ -244,7 +244,7 @@ on_uevent (GUdevClient *client,
{
GGPhoto2VolumeMonitor *monitor = G_GPHOTO2_VOLUME_MONITOR (user_data);
- /* g_debug ("on_uevent: action=%s, device=%s", action, g_udev_device_get_device_file(device)); */
+ g_debug ("on_uevent: action=%s, device=%s", action, g_udev_device_get_device_file (device));
if (g_strcmp0 (action, "add") == 0 && g_udev_device_has_property (device, "ID_GPHOTO2"))
gudev_add_camera (monitor, device, TRUE);
@@ -289,8 +289,6 @@ g_gphoto2_volume_monitor_constructor (GType type,
}
G_UNLOCK (gphoto2_vm);
- /*g_warning ("creating hal vm");*/
-
object = NULL;
/* Invoke parent constructor. */
@@ -429,8 +427,6 @@ get_stores_for_camera (const char *bus_num, const char *device_num)
else
basedir = "/";
- /* g_debug ("capacitykbytes[%d] = %d", i, (gint) storage_info[i].capacitykbytes); */
-
l = g_list_prepend (l, g_strdup (basedir));
}