[Xfce4-commits] <glib-objc:no-foundation-dep> great renaming: GLIB prefix to GOC prefix. doesn't compile
Brian J. Tarricone
noreply at xfce.org
Sun Nov 22 04:02:07 CET 2009
Updating branch refs/heads/no-foundation-dep
to 241eb7a8ddeb35a25cebc5db3533c2845bab6e83 (commit)
from 058838de888fbdcfcace5547a7750a53a49fa346 (commit)
commit 241eb7a8ddeb35a25cebc5db3533c2845bab6e83
Author: Brian J. Tarricone <brian at tarricone.org>
Date: Mon Jul 6 15:30:15 2009 -0700
great renaming: GLIB prefix to GOC prefix. doesn't compile
gobject-objc/GLIBBoxedValue.h | 44 -----------------
.../GOCBoxedValue.h | 40 ++++++---------
gobject-objc/{GLIBBoxedValue.m => GOCBoxedValue.m} | 8 ++--
gobject-objc/{GLIBObject.h => GOCObject.h} | 8 ++--
gobject-objc/{GLIBObject.m => GOCObject.m} | 8 ++--
gobject-objc/{GLIBParamSpec.h => GOCParamSpec.h} | 8 ++--
gobject-objc/{GLIBValue.h => GOCValue.h} | 8 ++--
gobject-objc/{GLIBValue.m => GOCValue.m} | 8 ++--
gobject-objc/Makefile.am | 27 ++++------
gobject-objc/glib-objc.h | 33 ------------
...{glib-objc-private.h => gobject-objc-private.h} | 20 +++-----
...{glib-objc-private.m => gobject-objc-private.m} | 11 ++--
.../GOCHashable.h => gobject-objc/gobject-objc.h | 19 +++----
gobject-objc/ns-object-boxed.h | 37 --------------
gobject-objc/ns-object-boxed.m | 52 --------------------
15 files changed, 72 insertions(+), 259 deletions(-)
diff --git a/gobject-objc/GLIBBoxedValue.h b/gobject-objc/GLIBBoxedValue.h
deleted file mode 100644
index 34d1112..0000000
--- a/gobject-objc/GLIBBoxedValue.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * glib-objc - objective-c bindings for glib/gobject
- *
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
- *
- * 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GLIB_OBJC_BOXED_VALUE_H__
-#define __GLIB_OBJC_BOXED_VALUE_H__
-
-#if !defined(GLIB_OBJC_COMPILATION) && !defined(__IN_GLIB_OBJC_H)
-#error "Do not include GLIBBoxedValue.h directly, as this file may change or disappear in the future. Include <glib-objc/glib-objc.h> instead."
-#endif
-
-#import <Foundation/Foundation.h>
-
- at interface GLIBBoxedValue : NSValue
-{
- at private
- gpointer _boxedValue;
-}
-
-+ (id)valueWithBoxed:(gpointer)boxedValue;
-
-- (id)initWithBoxed:(gpointer)boxedValue;
-
-- (gpointer)boxedValue;
-
- at end
-
-#endif /* __GLIB_OBJC_BOXED_VALUE_H__ */
-
diff --git a/glib-objc/GOCObjectBase.m b/gobject-objc/GOCBoxedValue.h
similarity index 58%
copy from glib-objc/GOCObjectBase.m
copy to gobject-objc/GOCBoxedValue.h
index 263f527..d0e9647 100644
--- a/glib-objc/GOCObjectBase.m
+++ b/gobject-objc/GOCBoxedValue.h
@@ -1,7 +1,7 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2009 Brian Tarricone <brian at tarricone.org>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
@@ -17,37 +17,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
+#ifndef __GOC_BOXED_VALUE_H__
+#define __GOC_BOXED_VALUE_H__
-#import "GOCObjectBase.h"
+#if !defined(GLIB_OBJC_COMPILATION) && !defined(__IN_GOBJECT_OBJC_H)
+#error "Do not include GOCBoxedValue.h directly, as this file may change or disappear in the future. Include <gobject-objc.h> instead."
+#endif
- at implementation GOCObjectBase
-- (id)init
+ at interface GOCBoxedValue : NSValue
{
- self = [super init];
- if(self) {
- ref_count = 1;
- }
- return self;
+ at private
+ gpointer _boxedValue;
}
-- (id <GOCObject>)ref
-{
- g_atomic_int_inc(&ref_count);
- return self;
-}
++ (id)valueWithBoxed:(gpointer)boxedValue;
-- (void)unref
-{
- if(g_atomic_int_dec_and_test(&ref_count))
- return;
+- (id)initWithBoxed:(gpointer)boxedValue;
- [self free];
-}
+- (gpointer)boxedValue;
@end
+
+#endif /* __GLIB_OBJC_BOXED_VALUE_H__ */
+
diff --git a/gobject-objc/GLIBBoxedValue.m b/gobject-objc/GOCBoxedValue.m
similarity index 79%
rename from gobject-objc/GLIBBoxedValue.m
rename to gobject-objc/GOCBoxedValue.m
index a97574f..9fca143 100644
--- a/gobject-objc/GLIBBoxedValue.m
+++ b/gobject-objc/GOCBoxedValue.m
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
diff --git a/gobject-objc/GLIBObject.h b/gobject-objc/GOCObject.h
similarity index 96%
rename from gobject-objc/GLIBObject.h
rename to gobject-objc/GOCObject.h
index d1ab4c0..add4a8f 100644
--- a/gobject-objc/GLIBObject.h
+++ b/gobject-objc/GOCObject.h
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2007-2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
diff --git a/gobject-objc/GLIBObject.m b/gobject-objc/GOCObject.m
similarity index 99%
rename from gobject-objc/GLIBObject.m
rename to gobject-objc/GOCObject.m
index c23d2db..ff3af7c 100644
--- a/gobject-objc/GLIBObject.m
+++ b/gobject-objc/GOCObject.m
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2007-2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
diff --git a/gobject-objc/GLIBParamSpec.h b/gobject-objc/GOCParamSpec.h
similarity index 94%
rename from gobject-objc/GLIBParamSpec.h
rename to gobject-objc/GOCParamSpec.h
index 20d8990..2b6781c 100644
--- a/gobject-objc/GLIBParamSpec.h
+++ b/gobject-objc/GOCParamSpec.h
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2007 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
diff --git a/gobject-objc/GLIBValue.h b/gobject-objc/GOCValue.h
similarity index 81%
rename from gobject-objc/GLIBValue.h
rename to gobject-objc/GOCValue.h
index 4476b29..f5cbd55 100644
--- a/gobject-objc/GLIBValue.h
+++ b/gobject-objc/GOCValue.h
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
diff --git a/gobject-objc/GLIBValue.m b/gobject-objc/GOCValue.m
similarity index 86%
rename from gobject-objc/GLIBValue.m
rename to gobject-objc/GOCValue.m
index 33d14dd..c3002c2 100644
--- a/gobject-objc/GLIBValue.m
+++ b/gobject-objc/GOCValue.m
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
diff --git a/gobject-objc/Makefile.am b/gobject-objc/Makefile.am
index a762ce0..d61b930 100644
--- a/gobject-objc/Makefile.am
+++ b/gobject-objc/Makefile.am
@@ -5,38 +5,33 @@ glibobjcmaininclude_HEADERS = \
gobject-objc.h
gobjectobjcincludedir = $(glibobjcmainincludedir)/gobject-objc
gobjectobjcinclude_HEADERS = \
- GLIBBoxedValue.h \
- GLIBObject.h \
- GLIBValue.h \
- ns-object-boxed.h
+ GOCBoxedValue.h \
+ GOCObject.h \
+ GOCValue.h
libgobject_objc_2_0_la_SOURCES = \
$(gobjectobjcmaininclude_HEADERS) \
$(gobjectobjcinclude_HEADERS) \
- GLIBBoxedValue.m \
- GLIBObject.m \
- GLIBValue.m \
+ GOCBoxedValue.m \
+ GOCObject.m \
+ GOCValue.m \
glib-objc-private.m \
- glib-objc-private.h \
- ns-object-boxed.m
+ glib-objc-private.h
libgobject_objc_2_0_la_CFLAGS = \
-DGLIB_OBJC_COMPILATION \
- $(GOBJECT_CFLAGS) \
- $(FOUNDATION_CFLAGS) \
- $(FOUNDATION_HACK_CFLAGS)
+ $(GOBJECT_CFLAGS)
libgobject_objc_2_0_la_OBJCFLAGS = $(libgobject_objc_2_0_la_CFLAGS)
libgobject_objc_2_0_la_LDFLAGS = \
- -version-info $(LIBGOBJECT_OBJC_VERINFO)
+ -version-info $(GLIB_OBJC_VERINFO)
libgobject_objc_2_0_la_LIBADD = \
- $(GOBJECT_LIBS) \
- $(FOUNDATION_LIBS)
+ $(GOBJECT_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_in_files = gobject-objc-$(LIBGOBJECT_OBJC_API_VERSION).pc.in
+pkgconfig_in_files = gobject-objc-$(GLIB_OBJC_API_VERSION).pc.in
pkgconfig_DATA = $(pkgconfig_in_files:.in=)
DISTCLEANFILES = \
diff --git a/gobject-objc/glib-objc.h b/gobject-objc/glib-objc.h
deleted file mode 100644
index f4b0826..0000000
--- a/gobject-objc/glib-objc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * glib-objc - objective-c bindings for glib/gobject
- *
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
- *
- * 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GLIB_OBJC_H__
-#define __GLIB_OBJC_H__
-
-#define __IN_GLIB_OBJC_H
-
-#include <gobject-objc/GLIBObject.h>
-#include <gobject-objc/GLIBBoxedValue.h>
-#include <gobject-objc/GLIBValue.h>
-
-#include <gobject-objc/ns-object-boxed.h>
-
-#undef __IN_GLIB_OBJC_H
-
-#endif /* __GLIB_OBJC_H__ */
diff --git a/gobject-objc/glib-objc-private.h b/gobject-objc/gobject-objc-private.h
similarity index 73%
rename from gobject-objc/glib-objc-private.h
rename to gobject-objc/gobject-objc-private.h
index 82033b2..13444e5 100644
--- a/gobject-objc/glib-objc-private.h
+++ b/gobject-objc/gobject-objc-private.h
@@ -1,27 +1,26 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __GLIB_OBJC_PRIVATE_H__
-#define __GLIB_OBJC_PRIVATE_H__
+#ifndef __GOBJECT_OBJC_PRIVATE_H__
+#define __GOBJECT_OBJC_PRIVATE_H__
#include <glib-object.h>
-#import <Foundation/Foundation.h>
G_BEGIN_DECLS
@@ -67,12 +66,7 @@ GType _glib_objc_gtype_from_signature(const char *objc_signature);
BOOL _glib_objc_signatures_match(GType target_gtype,
const char *objc_signature);
#endif
-id <NSObject> _glib_objc_nsobject_from_gvalue(const GValue *value);
-BOOL _glib_objc_gvalue_from_nsobject(GValue *gvalue,
- const id <NSObject> nsobject,
- BOOL gvalue_needs_init);
-
G_END_DECLS
-#endif /* __GLIB_OBJC_PRIVATE_H__ */
+#endif /* __GOBJECT_OBJC_PRIVATE_H__ */
diff --git a/gobject-objc/glib-objc-private.m b/gobject-objc/gobject-objc-private.m
similarity index 97%
rename from gobject-objc/glib-objc-private.m
rename to gobject-objc/gobject-objc-private.m
index f65d356..e5df102 100644
--- a/gobject-objc/glib-objc-private.m
+++ b/gobject-objc/gobject-objc-private.m
@@ -1,18 +1,18 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2 of the License ONLY.
*
* 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 Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
@@ -83,6 +83,7 @@ _glib_objc_signatures_match(GType target_gtype,
}
#endif
+#if 0
/* returns an autoreleased object */
id <NSObject>
_glib_objc_nsobject_from_gvalue(const GValue *value)
@@ -274,4 +275,4 @@ _glib_objc_gvalue_from_nsobject(GValue *gvalue,
return YES;
#undef GV_SET
}
-
+#endif
diff --git a/glib-objc/GOCHashable.h b/gobject-objc/gobject-objc.h
similarity index 70%
copy from glib-objc/GOCHashable.h
copy to gobject-objc/gobject-objc.h
index 0f6d434..c2b89e7 100644
--- a/glib-objc/GOCHashable.h
+++ b/gobject-objc/gobject-objc.h
@@ -1,7 +1,7 @@
/*
* glib-objc - objective-c bindings for glib/gobject
*
- * Copyright (c) 2009 Brian Tarricone <brian at tarricone.org>
+ * Copyright (c) 2008-2009 Brian Tarricone <brian at tarricone.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
@@ -17,16 +17,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#ifndef __GOBJECT_OBJC_H__
+#define __GOBJECT_OBJC_H__
-#ifndef __GOC_HASHABLE_H__
-#define __GOC_HASHABLE_H__
+#define __IN_GOBJECT_OBJC_H
-#import <glib-objc/GOCComparable.h>
+#include <gobject-objc/GOCObject.h>
+#include <gobject-objc/GOCBoxedValue.h>
+#include <gobject-objc/GOCValue.h>
- at protocol GOCHashable<GOCComparable>
+#undef __IN_GOBJECT_OBJC_H
-- (unsigned int)hashCode;
-
- at end
-
-#endif /* __GOC_HASHABLE_H__ */
+#endif /* __GOBJECT_OBJC_H__ */
diff --git a/gobject-objc/ns-object-boxed.h b/gobject-objc/ns-object-boxed.h
deleted file mode 100644
index 6fd032c..0000000
--- a/gobject-objc/ns-object-boxed.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * glib-objc - objective-c bindings for glib/gobject
- *
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
- *
- * 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GLIB_OBJC_NSOBJECT_BOXED_H__
-#define __GLIB_OBJC_NSOBJECT_BOXED_H__
-
-#if !defined(GLIB_OBJC_COMPILATION) && !defined(__IN_GLIB_OBJC_H)
-#error "Do not include ns-object-boxed.h directly, as this file may change or disappear in the future. Include <glib-objc/glib-objc.h> instead."
-#endif
-
-#define GOBJC_TYPE_NSOBJECT (glib_objc_nsobject_get_type())
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-GType glib_objc_nsobject_get_type() G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GLIB_OBJC_NSOBJECT_BOXED_H__ */
diff --git a/gobject-objc/ns-object-boxed.m b/gobject-objc/ns-object-boxed.m
deleted file mode 100644
index b93a1c6..0000000
--- a/gobject-objc/ns-object-boxed.m
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * glib-objc - objective-c bindings for glib/gobject
- *
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License ONLY.
- *
- * 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#import <Foundation/Foundation.h>
-
-#include "ns-object-boxed.h"
-
-static gpointer
-ns_object_copy(gpointer boxed)
-{
- return [(NSObject *)boxed copy];
-}
-
-static void
-ns_object_free(gpointer boxed)
-{
- [(NSObject *)boxed release];
-}
-
-GType
-glib_objc_nsobject_get_type()
-{
- static GType ns_object_type = 0;
-
- if(!ns_object_type) {
- ns_object_type = g_boxed_type_register_static("NSObject",
- ns_object_copy,
- ns_object_free);
- }
-
- return ns_object_type;
-}
More information about the Xfce4-commits
mailing list