[kdbus] Fix problem with receiving async messages

[platform/upstream/glib.git] / gobject / gobject.h

diff --git a/gobject/gobject.h b/gobject/gobject.h
index 9ca0ade..522011f 100644 (file)
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -12,9 +12,7 @@
  * 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/>.
  */
 #ifndef __G_OBJECT_H__
 #define __G_OBJECT_H__
@@ -64,7 +62,11 @@ G_BEGIN_DECLS
  * 
  * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_OBJECT.
  */
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_42
+#define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_FUNDAMENTAL_TYPE ((object), G_TYPE_OBJECT))
+#else
 #define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_OBJECT))
+#endif
 /**
  * G_IS_OBJECT_CLASS:
  * @class: a #GObjectClass
@@ -237,7 +239,7 @@ typedef void (*GWeakNotify)         (gpointer      data,
 /**
  * GObject:
  * 
- * All the fields in the <structname>GObject</structname> structure are private 
+ * All the fields in the GObject structure are private 
  * to the #GObject implementation and should never be accessed directly.
  */
 struct  _GObject
@@ -283,7 +285,7 @@ struct  _GObject
  *  should chain up to the @constructed call of their parent class to allow it
  *  to complete its initialisation.
  * 
- * The class structure for the <structname>GObject</structname> type.
+ * The class structure for the GObject type.
  * 
  * <example>
  * <title>Implementing singletons using a constructor</title>
@@ -356,7 +358,7 @@ struct  _GObjectClass
  * @pspec: the #GParamSpec of the construct parameter
  * @value: the value to set the parameter to
  * 
- * The <structname>GObjectConstructParam</structname> struct is an auxiliary 
+ * The GObjectConstructParam struct is an auxiliary 
  * structure used to hand #GParamSpec/#GValue pairs to the @constructor of
  * a #GObjectClass.
  */
@@ -369,14 +371,14 @@ struct _GObjectConstructParam
 /**
  * GInitiallyUnowned:
  * 
- * All the fields in the <structname>GInitiallyUnowned</structname> structure 
+ * All the fields in the GInitiallyUnowned structure 
  * are private to the #GInitiallyUnowned implementation and should never be 
  * accessed directly.
  */
 /**
  * GInitiallyUnownedClass:
  * 
- * The class structure for the <structname>GInitiallyUnowned</structname> type.
+ * The class structure for the GInitiallyUnowned type.
  */
 
 
@@ -625,7 +627,7 @@ G_STMT_START { \
   GObject *_glib__object = (GObject*) (object); \
   GParamSpec *_glib__pspec = (GParamSpec*) (pspec); \
   guint _glib__property_id = (property_id); \
-  g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
+  g_warning ("%s: invalid %s id %u for \"%s\" of type '%s' in '%s'", \
              G_STRLOC, \
              (pname), \
              _glib__property_id, \