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.
This commit is contained in:
Mike Kestner 2011-02-09 10:48:19 -06:00
parent 53fdda0f51
commit 22a83cc779
3 changed files with 11 additions and 40 deletions

View file

@ -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;
}
}
}

View file

@ -1,8 +1,9 @@
// GLib.Global.cs - Global glib properties and methods. // GLib.Global.cs - Global glib properties and methods.
// //
// Author: Andres G. Aragoneses <aaragoneses@novell.com> // Authors: Andres G. Aragoneses <aaragoneses@novell.com>
// 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 // This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General // 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)] [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_get_application_name (); 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));
}
} }
} }

View file

@ -28,7 +28,6 @@ sources = \
EnumWrapper.cs \ EnumWrapper.cs \
ExceptionManager.cs \ ExceptionManager.cs \
FileUtils.cs \ FileUtils.cs \
Format.cs \
GException.cs \ GException.cs \
GInterfaceAdapter.cs \ GInterfaceAdapter.cs \
GInterfaceAttribute.cs \ GInterfaceAttribute.cs \