From 22a83cc77991f315d781920694a4a9ad7545b552 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 9 Feb 2011 10:48:19 -0600 Subject: [PATCH] Move g_format_size_for_display to Global. * glib/Format.cs: moved to Global.cs * glib/Global.cs: moved from Format.cs * glib/Makefile.am: update sources. --- glib/Format.cs | 37 ------------------------------------- glib/Global.cs | 13 +++++++++++-- glib/Makefile.am | 1 - 3 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 glib/Format.cs diff --git a/glib/Format.cs b/glib/Format.cs deleted file mode 100644 index 59e89369f..000000000 --- a/glib/Format.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Format.cs: Wrapper for the g_format code in Glib -// -// Authors: -// Stephane Delcroix (stephane@delcroix.org) -// -// Copyright (c) 2008 Novell, Inc. -// -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of version 2 of the Lesser GNU General -// Public License as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. - -using System; -using System.Runtime.InteropServices; - -namespace GLib { - public class Format { - [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_format_size_for_display (long size); - - static public string SizeForDisplay (long size) - { - string result = Marshaller.PtrToStringGFree (g_format_size_for_display (size)); - return result; - } - } -} diff --git a/glib/Global.cs b/glib/Global.cs index 427fbe881..0476c85f6 100644 --- a/glib/Global.cs +++ b/glib/Global.cs @@ -1,8 +1,9 @@ // GLib.Global.cs - Global glib properties and methods. // -// Author: Andres G. Aragoneses +// Authors: Andres G. Aragoneses +// Stephane Delcroix (stephane@delcroix.org) // -// Copyright (c) 2008 Novell, Inc +// Copyright (c) 2008 Novell, Inc. // // This program is free software; you can redistribute it and/or // modify it under the terms of version 2 of the Lesser GNU General @@ -78,5 +79,13 @@ namespace GLib { [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_get_application_name (); + + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr g_format_size_for_display (long size); + + static public string FormatSizeForDisplay (long size) + { + return Marshaller.PtrToStringGFree (g_format_size_for_display (size)); + } } } diff --git a/glib/Makefile.am b/glib/Makefile.am index b8bdc41ea..5755f8586 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -28,7 +28,6 @@ sources = \ EnumWrapper.cs \ ExceptionManager.cs \ FileUtils.cs \ - Format.cs \ GException.cs \ GInterfaceAdapter.cs \ GInterfaceAttribute.cs \