gvfs/gvfs-1.4.2-remove-dead-code.patch
2009-11-12 17:32:43 +00:00

67 lines
2.1 KiB
Diff

From cd2afbd07bbcf4e7caee1dd0ca1c65d74974884d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 30 Oct 2009 17:03:35 +0000
Subject: Remove dead code
Signed-off-by: David Zeuthen <davidz@redhat.com>
---
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 83d8fc2..e81dce2 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -842,7 +842,6 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
GList *l;
ignored = FALSE;
- device = NULL;
enclosed = NULL;
device = gdu_presentable_get_device (GDU_PRESENTABLE (d));
@@ -1074,7 +1073,7 @@ find_disc_volume_for_device_file (GGduVolumeMonitor *monitor,
static GGduVolume *
find_volume_for_device_file (GGduVolumeMonitor *monitor,
- const gchar *device_file)
+ const gchar *device_file)
{
GList *l;
GGduVolume *ret;
@@ -1183,9 +1182,6 @@ update_drives (GGduVolumeMonitor *monitor,
for (l = removed; l != NULL; l = l->next)
{
GduPresentable *p = GDU_PRESENTABLE (l->data);
- GduDevice *d;
-
- d = gdu_presentable_get_device (p);
drive = find_drive_by_presentable (monitor, p);
if (drive != NULL)
@@ -1195,16 +1191,11 @@ update_drives (GGduVolumeMonitor *monitor,
monitor->drives = g_list_remove (monitor->drives, drive);
*removed_drives = g_list_prepend (*removed_drives, drive);
}
- if (d != NULL)
- g_object_unref (d);
}
for (l = added; l != NULL; l = l->next)
{
GduPresentable *p = GDU_PRESENTABLE (l->data);
- GduDevice *d;
-
- d = gdu_presentable_get_device (p);
drive = find_drive_by_presentable (monitor, p);
if (drive == NULL)
@@ -1217,8 +1208,6 @@ update_drives (GGduVolumeMonitor *monitor,
*added_drives = g_list_prepend (*added_drives, g_object_ref (drive));
}
}
- if (d != NULL)
- g_object_unref (d);
}
g_list_free (added);
--
cgit v0.8.2