* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
* passed, see each method taking a #GMountOperation for details.
*/
-G_DEFINE_TYPE (GMountOperation, g_mount_operation, G_TYPE_OBJECT);
-
enum {
ASK_PASSWORD,
ASK_QUESTION,
PROP_CHOICE
};
+G_DEFINE_TYPE_WITH_PRIVATE (GMountOperation, g_mount_operation, G_TYPE_OBJECT)
+
static void
g_mount_operation_set_property (GObject *object,
guint prop_id,
static void
show_unmount_progress (GMountOperation *op,
const gchar *message,
- guint64 time_left,
- guint64 bytes_left)
+ gint64 time_left,
+ gint64 bytes_left)
{
/* nothing to do */
}
g_mount_operation_class_init (GMountOperationClass *klass)
{
GObjectClass *object_class;
-
- g_type_class_add_private (klass, sizeof (GMountOperationPrivate));
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = g_mount_operation_finalize;
* GMountOperation::show-unmount-progress:
* @op: a #GMountOperation:
* @message: string containing a mesage to display to the user
- * @time_left: the estimated time left before the operation completes, or -1
+ * @time_left: the estimated time left before the operation completes,
+ * in microseconds, or -1
* @bytes_left: the amount of bytes to be written before the operation
* completes (or -1 if such amount is not known), or zero if the operation
* is completed
G_STRUCT_OFFSET (GMountOperationClass, show_unmount_progress),
NULL, NULL, NULL,
G_TYPE_NONE, 3,
- G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_UINT64);
+ G_TYPE_STRING, G_TYPE_INT64, G_TYPE_INT64);
/**
* GMountOperation:username:
static void
g_mount_operation_init (GMountOperation *operation)
{
- operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
- G_TYPE_MOUNT_OPERATION,
- GMountOperationPrivate);
+ operation->priv = g_mount_operation_get_instance_private (operation);
}
/**