Imported Upstream version 3.2.0

[debian/amanda] / device-src / property.c

diff --git a/device-src/property.c b/device-src/property.c
index a2f4c57b98ca8e2e447678ae2456aad5215b9d0d..875e7e6066c043b3f5b5426e2413d47cb886c247 100644 (file)
--- a/device-src/property.c
+++ b/device-src/property.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007,2008,2009 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -96,23 +96,6 @@ GType media_access_mode_get_type (void) {
     return type;
 }
 
-/* Copy function for GBoxed QualifiedSize. */
-static gpointer qualified_size_copy(gpointer source) {
-    gpointer rval = g_new(QualifiedSize, 1);
-    memcpy(rval, source, sizeof(QualifiedSize));
-    return rval;
-}
-
-GType qualified_size_get_type (void) {
-    static GType type = 0;
-    if (G_UNLIKELY(type == 0)) {
-        type = g_boxed_type_register_static ("QualifiedSize",
-                                             qualified_size_copy,
-                                             free);
-    }
-    return type;
-}
-
 /******
  * Property registration and lookup
  */
@@ -248,9 +231,6 @@ void device_property_init(void) {
     device_property_fill_and_register(&device_property_full_deletion,
                                      G_TYPE_BOOLEAN, "full_deletion",
       "Does this device support recycling the entire volume?" );
-    device_property_fill_and_register(&device_property_free_space,
-                                      QUALIFIED_SIZE_TYPE, "free_space",
-      "Remaining capacity of the device.");
     device_property_fill_and_register(&device_property_max_volume_usage,
                                       G_TYPE_UINT64, "max_volume_usage",
       "Artificial limit to data written to volume.");
@@ -260,6 +240,9 @@ void device_property_init(void) {
     device_property_fill_and_register(&device_property_comment,
                                      G_TYPE_STRING, "comment",
        "User-specified comment for the device");
+    device_property_fill_and_register(&device_property_leom,
+                                     G_TYPE_BOOLEAN, "leom",
+       "Does this device support LEOM?");
 }
 
 DevicePropertyBase device_property_concurrency;
@@ -275,7 +258,7 @@ DevicePropertyBase device_property_canonical_name;
 DevicePropertyBase device_property_medium_access_type;
 DevicePropertyBase device_property_partial_deletion;
 DevicePropertyBase device_property_full_deletion;
-DevicePropertyBase device_property_free_space;
 DevicePropertyBase device_property_max_volume_usage;
-DevicePropertyBase device_property_verbose;
 DevicePropertyBase device_property_comment;
+DevicePropertyBase device_property_leom;
+DevicePropertyBase device_property_verbose;