[gvfs/wip/goa: 2/5] afcvolumemonitor: Remove unused variables and parameters



commit a1b7c80be9a44860360fc958709299f3ceeb3af8
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Oct 23 21:50:19 2012 +0200

    afcvolumemonitor: Remove unused variables and parameters

 monitor/afc/afcvolume.c        |    9 +--------
 monitor/afc/afcvolume.h        |    3 +--
 monitor/afc/afcvolumemonitor.c |    4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
index 9829077..9dfd01e 100644
--- a/monitor/afc/afcvolume.c
+++ b/monitor/afc/afcvolume.c
@@ -18,15 +18,12 @@
 struct _GVfsAfcVolume {
   GObject parent;
 
-  GVolumeMonitor *monitor;
-
   char *uuid;
   char *service;
 
   char *name;
   char *icon;
   char *symbolic_icon;
-  char *icon_fallback;
 };
 
 static void g_vfs_afc_volume_iface_init (GVolumeIface *iface);
@@ -47,7 +44,6 @@ g_vfs_afc_volume_finalize (GObject *object)
   g_free (self->name);
   g_free (self->icon);
   g_free (self->symbolic_icon);
-  g_free (self->icon_fallback);
 
   if (G_OBJECT_CLASS(g_vfs_afc_volume_parent_class)->finalize)
     (*G_OBJECT_CLASS(g_vfs_afc_volume_parent_class)->finalize) (G_OBJECT(self));
@@ -160,16 +156,13 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
 }
 
 GVfsAfcVolume *
-g_vfs_afc_volume_new (GVolumeMonitor *monitor,
-                      const char     *uuid,
-                      const char     *service)
+g_vfs_afc_volume_new (const char *uuid, const char *service)
 {
   GVfsAfcVolume *self;
   GFile *root;
   char *uri;
 
   self = G_VFS_AFC_VOLUME(g_object_new (G_VFS_TYPE_AFC_VOLUME, NULL));
-  self->monitor = monitor;
   self->uuid = g_strdup (uuid);
   self->service = g_strdup (service);
 
diff --git a/monitor/afc/afcvolume.h b/monitor/afc/afcvolume.h
index ba0aa3b..aaba8d0 100644
--- a/monitor/afc/afcvolume.h
+++ b/monitor/afc/afcvolume.h
@@ -32,8 +32,7 @@ struct _GVfsAfcVolumeClass {
 
 GType g_vfs_afc_volume_get_type (void) G_GNUC_CONST;
 
-GVfsAfcVolume *g_vfs_afc_volume_new (GVolumeMonitor *monitor,
-                                     const char     *uuid,
+GVfsAfcVolume *g_vfs_afc_volume_new (const char     *uuid,
                                      const char     *service);
 
 gboolean g_vfs_afc_volume_has_uuid (GVfsAfcVolume *volume, const char *uuid);
diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
index 9f24753..61f8885 100644
--- a/monitor/afc/afcvolumemonitor.c
+++ b/monitor/afc/afcvolumemonitor.c
@@ -29,7 +29,7 @@ g_vfs_afc_monitor_create_volume (GVfsAfcVolumeMonitor *self,
 
   g_print ("creating volume for device uuid '%s'\n", uuid);
 
-  volume = g_vfs_afc_volume_new (G_VOLUME_MONITOR (self), uuid, NULL);
+  volume = g_vfs_afc_volume_new (uuid, NULL);
   if (volume != NULL)
     {
       self->volumes = g_list_prepend (self->volumes, volume);
@@ -37,7 +37,7 @@ g_vfs_afc_monitor_create_volume (GVfsAfcVolumeMonitor *self,
     }
 
   /* The house arrest service */
-  volume = g_vfs_afc_volume_new (G_VOLUME_MONITOR (self), uuid, HOUSE_ARREST_SERVICE_PORT);
+  volume = g_vfs_afc_volume_new (uuid, HOUSE_ARREST_SERVICE_PORT);
   if (volume != NULL)
     {
       self->volumes = g_list_prepend (self->volumes, volume);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]