Rename GladeSignalClass to GladeSignalDef and declare it as boxed

19 files changed, 538 insertions, 510 deletions

diff --git a/doc/gladeui-docs.xml b/doc/gladeui-docs.xml
index 36ebb1dc..04ea42fa 100644
--- a/doc/gladeui-docs.xml
+++ b/doc/gladeui-docs.xml
@@ -47,7 +47,7 @@
     <xi:include href="xml/glade-base-editor.xml"/>
     <xi:include href="xml/glade-placeholder.xml"/>
     <xi:include href="xml/glade-signal.xml"/>
-    <xi:include href="xml/glade-signal-class.xml"/>
+    <xi:include href="xml/glade-signal-def.xml"/>
     <xi:include href="xml/glade-name-context.xml"/>
     <xi:include href="xml/glade-xml-utils.xml"/>
   </part>
diff --git a/doc/gladeui-sections.txt b/doc/gladeui-sections.txt
index c4685248..2ca9d60d 100644
--- a/doc/gladeui-sections.txt
+++ b/doc/gladeui-sections.txt
@@ -303,7 +303,7 @@ glade_widget_adaptor_get_object_type
 glade_widget_adaptor_get_packing_props
 glade_widget_adaptor_get_parent_adaptor
 glade_widget_adaptor_get_properties
-glade_widget_adaptor_get_signal_class
+glade_widget_adaptor_get_signal_def
 glade_widget_adaptor_get_signals
 glade_widget_adaptor_get_title
 glade_widget_adaptor_has_internal_children
@@ -491,7 +491,7 @@ glade_signal_read
 glade_signal_write
 glade_signal_editor_enable_dnd
 glade_signal_get_after
-glade_signal_get_class
+glade_signal_get_def
 glade_signal_get_detail
 glade_signal_get_handler
 glade_signal_get_name
@@ -517,23 +517,24 @@ glade_signal_get_type
 </SECTION>
 
 <SECTION>
-<FILE>glade-signal-class</FILE>
-<TITLE>GladeSignalClass</TITLE>
-GladeSignalClass
-glade_signal_class_new
-glade_signal_class_free
-glade_signal_class_update_from_node
-glade_signal_class_get_adaptor
-glade_signal_class_get_flags
-glade_signal_class_get_name
-glade_signal_class_get_type
-glade_signal_class_set_deprecated
-glade_signal_class_deprecated
-glade_signal_class_set_since
-glade_signal_class_since_major
-glade_signal_class_since_minor
+<FILE>glade-signal-def</FILE>
+<TITLE>GladeSignalDef</TITLE>
+GladeSignalDef
+glade_signal_def_new
+glade_signal_def_free
+glade_signal_def_update_from_node
+glade_signal_def_get_adaptor
+glade_signal_def_get_flags
+glade_signal_def_get_name
+glade_signal_def_set_deprecated
+glade_signal_def_deprecated
+glade_signal_def_set_since
+glade_signal_def_since_major
+glade_signal_def_since_minor
 <SUBSECTION Standard>
-GLADE_SIGNAL_CLASS
+GLADE_SIGNAL_DEF
+GLADE_TYPE_SIGNAL_DEF
+glade_signal_def_get_type
 </SECTION>
 
 <SECTION>
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index a9788760..55a240bc 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -122,7 +122,7 @@ libgladeui_2_la_SOURCES = \
 	glade-property-label.c \
 	glade-property-shell.c \
 	glade-signal.c \
-	glade-signal-class.c \
+	glade-signal-def.c \
 	glade-signal-editor.c \
 	glade-signal-model.c \
 	glade-template.c \
@@ -182,7 +182,7 @@ libgladeuiinclude_HEADERS = \
 	glade-property-label.h \
 	glade-property-shell.h \
 	glade-signal.h \
-	glade-signal-class.h \
+	glade-signal-def.h \
 	glade-signal-editor.h \
 	glade-signal-model.h \
 	glade-utils.h \
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 4f6db6d9..323360ba 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -1788,20 +1788,20 @@ static void
 glade_project_introspect_signal_versions (GladeSignal *signal, 
                                           VersionData *data)
 {
-  GladeSignalClass   *signal_class;
+  GladeSignalDef     *signal_def;
   GladeWidgetAdaptor *adaptor;
   gchar              *catalog = NULL;
   gboolean            is_gtk_adaptor = FALSE;
 
-  signal_class =
-    glade_widget_adaptor_get_signal_class (glade_widget_get_adaptor (data->widget), 
-                                           glade_signal_get_name (signal));
+  signal_def =
+    glade_widget_adaptor_get_signal_def (glade_widget_get_adaptor (data->widget), 
+                                         glade_signal_get_name (signal));
 
   /*  unknown signal... can it happen ? */
-  if (!signal_class) 
+  if (!signal_def) 
     return;
 
-  adaptor = glade_signal_class_get_adaptor (signal_class);
+  adaptor = glade_signal_def_get_adaptor (signal_def);
 
   /* Check if the signal comes from a GTK+ widget class */
   g_object_get (adaptor, "catalog", &catalog, NULL);
@@ -1810,10 +1810,10 @@ glade_project_introspect_signal_versions (GladeSignal *signal,
   g_free (catalog);
 
   if (is_gtk_adaptor && 
-      !GSC_VERSION_CHECK (signal_class, data->major, data->minor))
+      !GSC_VERSION_CHECK (signal_def, data->major, data->minor))
     {
-      data->major = glade_signal_class_since_major (signal_class);
-      data->minor = glade_signal_class_since_minor (signal_class);
+      data->major = glade_signal_def_since_major (signal_def);
+      data->minor = glade_signal_def_since_minor (signal_def);
     }
 }
 
@@ -3258,20 +3258,20 @@ glade_project_verify_signal_internal (GladeWidget     *widget,
                                       gboolean         forwidget,
                                       GladeVerifyFlags flags)
 {
-  GladeSignalClass   *signal_class;
+  GladeSignalDef     *signal_def;
   GladeWidgetAdaptor *adaptor;
   gint                target_major, target_minor;
   gchar              *catalog;
   GladeProject       *project;
 
-  signal_class =
-      glade_widget_adaptor_get_signal_class (glade_widget_get_adaptor (widget),
-                                             glade_signal_get_name (signal));
+  signal_def =
+      glade_widget_adaptor_get_signal_def (glade_widget_get_adaptor (widget),
+                                           glade_signal_get_name (signal));
 
-  if (!signal_class)
+  if (!signal_def)
     return;
 
-  adaptor = glade_signal_class_get_adaptor (signal_class);
+  adaptor = glade_signal_def_get_adaptor (signal_def);
   project = glade_widget_get_project (widget);
 
   if (!project)
@@ -3282,7 +3282,7 @@ glade_project_verify_signal_internal (GladeWidget     *widget,
                                             &target_major, &target_minor);
 
   if ((flags & GLADE_VERIFY_VERSIONS) != 0 &&
-      !GSC_VERSION_CHECK (signal_class, target_major, target_minor))
+      !GSC_VERSION_CHECK (signal_def, target_major, target_minor))
     {
       GLADE_NOTE (VERIFY, g_print ("VERIFY: Signal '%s' of adaptor %s not avalable in version %d.%d\n",
                                    glade_signal_get_name (signal),
@@ -3295,8 +3295,8 @@ glade_project_verify_signal_internal (GladeWidget     *widget,
 
           warning = g_strdup_printf (SIGNAL_VERSION_CONFLICT_MSGFMT,
                                      catalog,
-                                     glade_signal_class_since_major (signal_class),
-                                     glade_signal_class_since_minor (signal_class),
+                                     glade_signal_def_since_major (signal_def),
+                                     glade_signal_def_since_minor (signal_def),
                                      catalog, target_major, target_minor);
           glade_signal_set_support_warning (signal, warning);
           g_free (warning);
@@ -3308,11 +3308,11 @@ glade_project_verify_signal_internal (GladeWidget     *widget,
                                 glade_signal_get_name (signal),
                                 glade_widget_adaptor_get_title (adaptor),
                                 catalog,
-                                glade_signal_class_since_major (signal_class),
-                                glade_signal_class_since_minor (signal_class));
+                                glade_signal_def_since_major (signal_def),
+                                glade_signal_def_since_minor (signal_def));
     }
   else if ((flags & GLADE_VERIFY_DEPRECATIONS) != 0 &&
-           glade_signal_class_deprecated (signal_class))
+           glade_signal_def_deprecated (signal_def))
     {
       GLADE_NOTE (VERIFY, g_print ("VERIFY: Signal '%s' of adaptor %s is deprecated\n",
                                    glade_signal_get_name (signal),
diff --git a/gladeui/glade-signal-class.c b/gladeui/glade-signal-class.c
deleted file mode 100644
index 99a811f9..00000000
--- a/gladeui/glade-signal-class.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* glade-signal-class.c
- *
- * Copyright (C) 2011 Openismus GmbH
- *
- * Authors:
- *      Tristan Van Berkom <tristanvb@openismus.com>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-
-#include <config.h>
-#include "glade-signal-class.h"
-#include "glade-widget-adaptor.h"
-
-struct _GladeSignalClass
-{
-  GladeWidgetAdaptor *adaptor; /* The adaptor that originated this signal.
-                                */
-  GSignalQuery        query;
-
-  guint16             version_since_major; /* Version in which this signal was */
-  guint16             version_since_minor; /* introduced
-                                            */
-
-  const gchar        *name;                /* Name of the signal, eg clicked */
-  const gchar        *type;                /* Name of the object class that this signal 
-                                            * belongs to eg GtkButton */
-
-  guint deprecated : 1;                    /* True if this signal is deprecated */
-};
-
-/**
- * glade_signal_class_new:
- * @adaptor: a #GladeWidgetAdaptor
- * @for_type: a #GType
- * @signal_id: the signal id
- *
- * Creates a new #GladeSignalClass
- *
- * Returns: (transfer full): a new #GladeSignalClass
- */
-GladeSignalClass *
-glade_signal_class_new  (GladeWidgetAdaptor *adaptor,
-                         GType               for_type,
-                         guint               signal_id)
-{
-  GladeSignalClass *class;
-
-  class = g_slice_new0 (GladeSignalClass);
-
-  class->adaptor = adaptor;
-
-  /* Since glib gave us this signal id... it should
-   * exist no matter what.
-   */
-  g_signal_query (signal_id, &(class->query));
-  if (class->query.signal_id == 0)
-    {
-      g_critical ("glade_signal_class_new() called with an invalid signal id");
-
-      glade_signal_class_free (class);
-      return NULL;
-    }
-
-  class->name = (class->query.signal_name);
-  class->type = g_type_name (for_type);
-
-  /* Initialize signal versions & deprecated to adaptor version */
-  class->version_since_major = GWA_VERSION_SINCE_MAJOR (adaptor);
-  class->version_since_minor = GWA_VERSION_SINCE_MINOR (adaptor);
-  class->deprecated          = GWA_DEPRECATED (adaptor);
-
-  return class;
-}
-
-
-/**
- * glade_signal_class_free:
- * @signal_class: a #GladeSignalClass
- *
- * Frees a #GladeSignalClass
- */
-void
-glade_signal_class_free (GladeSignalClass *signal_class)
-{
-  g_slice_free (GladeSignalClass, signal_class);
-}
-
-void
-glade_signal_class_update_from_node (GladeSignalClass *signal_class,
-                                     GladeXmlNode     *node,
-                                     const gchar      *domain)
-{
-  g_return_if_fail (signal_class != NULL);
-  g_return_if_fail (node != NULL);
-
-  glade_xml_get_property_version (node, GLADE_TAG_VERSION_SINCE,
-                                  &signal_class->version_since_major, 
-                                  &signal_class->version_since_minor);
-
-  signal_class->deprecated =
-    glade_xml_get_property_boolean (node,
-                                    GLADE_TAG_DEPRECATED,
-                                    signal_class->deprecated);
-}
-
-/**
- * glade_signal_class_get_adaptor:
- * @signal_class: a #GladeSignalClass
- *
- * Get #GladeWidgetAdaptor associated with the signal.
- *
- * Returns: (transfer none): a #GladeWidgetAdaptor
- */
-GladeWidgetAdaptor *
-glade_signal_class_get_adaptor (const GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, NULL);
-
-  return signal_class->adaptor;
-}
-
-/**
- * glade_signal_class_get_name:
- * @signal_class: a #GladeSignalClass
- *
- * Get the name of the signal.
- *
- * Returns: the name of the signal
- */
-G_CONST_RETURN gchar *
-glade_signal_class_get_name (const GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, NULL);
-
-  return signal_class->name;
-}
-
-/**
- * glade_signal_class_get_object_type_name:
- * @signal_class: a #GladeSignalClass
- *
- * Get the name of the object class that this signal belongs to.
- *
- * Returns: the type name of the signal
- */
-G_CONST_RETURN gchar *
-glade_signal_class_get_object_type_name (const GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, NULL);
-
-  return signal_class->type;
-}
-
-/**
- * glade_signal_class_get_flags:
- * @signal_class: a #GladeSignalClass
- *
- * Get the combination of GSignalFlags specifying detail of when the default
- * handler is to be invoked.
- *
- * Returns: the #GSignalFlags
- */
-GSignalFlags
-glade_signal_class_get_flags (const GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, 0);
-
-  return signal_class->query.signal_flags;
-}
-
-/**
- * glade_signal_class_set_since:
- * @signal_class: a #GladeSignalClass
- * @since_major: the major version.
- * @since_minor: the minor version.
- *
- * Set the major and minor version that introduced this signal.
- */
-void
-glade_signal_class_set_since (GladeSignalClass *signal_class,
-                              guint16           since_major,
-                              guint16           since_minor)
-{
-  g_return_if_fail (signal_class != NULL);
-
-  signal_class->version_since_major = since_major;
-  signal_class->version_since_minor = since_minor;
-}
-
-/**
- * glade_signal_class_since_major:
- * @signal_class: a #GladeSignalClass
- *
- * Get the major version that introduced this signal.
- *
- * Returns: the major version
- */
-guint16
-glade_signal_class_since_major (GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, 0);
-
-  return signal_class->version_since_major;
-}
-
-/**
- * glade_signal_class_since_minor:
- * @signal_class: a #GladeSignalClass
- *
- * Get the minor version that introduced this signal.
- *
- * Returns: the minor version
- */
-guint16
-glade_signal_class_since_minor (GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, 0);
-
-  return signal_class->version_since_minor;
-}
-
-/**
- * glade_signal_class_deprecated:
- * @signal_class: a #GladeSignalClass
- * @deprecated: %TRUE if the signal is deprecated
- *
- * Set if the signal is deprecated.
- */
-void
-glade_signal_class_set_deprecated (GladeSignalClass *signal_class,
-                                   gboolean          deprecated)
-{
-  g_return_if_fail (signal_class != NULL);
-
-  signal_class->deprecated = deprecated;
-}
-
-/**
- * glade_signal_class_deprecated:
- * @signal_class: a #GladeSignalClass
- *
- * Get if the signal is flagged as deprecated.
- *
- * Returns: %TRUE if the class is deprecated
- */
-gboolean
-glade_signal_class_deprecated (GladeSignalClass *signal_class)
-{
-  g_return_val_if_fail (signal_class != NULL, FALSE);
-
-  return signal_class->deprecated;
-}
diff --git a/gladeui/glade-signal-class.h b/gladeui/glade-signal-class.h
deleted file mode 100644
index 4b909d8b..00000000
--- a/gladeui/glade-signal-class.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* glade-signal-class.h
- *
- * Copyright (C) 2011 Openismus GmbH
- *
- * Authors:
- *      Tristan Van Berkom <tristanvb@openismus.com>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _GLADE_SIGNAL_CLASS_H_
-#define _GLADE_SIGNAL_CLASS_H_
-
-#include <glib-object.h>
-#include <gladeui/glade-xml-utils.h>
-
-G_BEGIN_DECLS
-
-/**
- * GSC_VERSION_CHECK:
- * @klass: A #GladeSignalClass
- * @major_version: The major version to check
- * @minor_version: The minor version to check
- *
- * Evaluates to %TRUE if @klass is available in its owning library version-@major_verion.@minor_version.
- *
- */
-#define GSC_VERSION_CHECK(klass, major_version, minor_version)                      \
-  ((glade_signal_class_since_major (GLADE_SIGNAL_CLASS (klass)) == major_version) ? \
-   (glade_signal_class_since_minor (GLADE_SIGNAL_CLASS (klass)) <= minor_version) : \
-   (glade_signal_class_since_major (GLADE_SIGNAL_CLASS (klass)) <= major_version))
-
-
-#define GLADE_SIGNAL_CLASS(klass) ((GladeSignalClass *)(klass))
-
-typedef struct _GladeSignalClass GladeSignalClass;
-
-GladeSignalClass     *glade_signal_class_new                      (GladeWidgetAdaptor *adaptor,
-                                                                   GType               for_type,
-                                                                   guint               signal_id);
-void                  glade_signal_class_free                     (GladeSignalClass   *signal_class);
-void                  glade_signal_class_update_from_node         (GladeSignalClass   *signal_class,
-                                                                   GladeXmlNode       *node,
-                                                                   const gchar        *domain);
-
-GladeWidgetAdaptor   *glade_signal_class_get_adaptor              (const GladeSignalClass   *signal_class);
-G_CONST_RETURN gchar *glade_signal_class_get_name                 (const GladeSignalClass   *signal_class);
-G_CONST_RETURN gchar *glade_signal_class_get_object_type_name     (const GladeSignalClass   *signal_class);
-GSignalFlags          glade_signal_class_get_flags                (const GladeSignalClass   *signal_class);
-
-void                  glade_signal_class_set_since                (GladeSignalClass   *signal_class,
-                                                                   guint16             since_major,
-                                                                   guint16             since_minor);
-guint16               glade_signal_class_since_major              (GladeSignalClass   *signal_class);
-guint16               glade_signal_class_since_minor              (GladeSignalClass   *signal_class);
-
-void                  glade_signal_class_set_deprecated           (GladeSignalClass   *signal_class,
-                                                                   gboolean            deprecated);
-gboolean              glade_signal_class_deprecated               (GladeSignalClass   *signal_class);
-
-
-G_END_DECLS
-
-#endif /* _GLADE_SIGNAL_CLASS_H_ */
diff --git a/gladeui/glade-signal-def.c b/gladeui/glade-signal-def.c
new file mode 100644
index 00000000..bb506a9c
--- /dev/null
+++ b/gladeui/glade-signal-def.c
@@ -0,0 +1,289 @@
+/* glade-signal-def.c
+ *
+ * Copyright (C) 2011 Openismus GmbH
+ *
+ * Authors:
+ *      Tristan Van Berkom <tristanvb@openismus.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+#include <config.h>
+#include "glade-signal-def.h"
+#include "glade-widget-adaptor.h"
+
+struct _GladeSignalDef
+{
+  GladeWidgetAdaptor *adaptor; /* The adaptor that originated this signal.
+                                */
+  GSignalQuery        query;
+
+  guint16             version_since_major; /* Version in which this signal was */
+  guint16             version_since_minor; /* introduced
+                                            */
+
+  const gchar        *name;                /* Name of the signal, eg clicked */
+  const gchar        *type;                /* Name of the object class that this signal 
+                                            * belongs to eg GtkButton */
+
+  guint deprecated : 1;                    /* True if this signal is deprecated */
+};
+
+G_DEFINE_BOXED_TYPE(GladeSignalDef, glade_signal_def, glade_signal_def_clone, glade_signal_def_free)
+
+/**
+ * glade_signal_def_new:
+ * @adaptor: a #GladeWidgetAdaptor
+ * @for_type: a #GType
+ * @signal_id: the signal id
+ *
+ * Creates a new #GladeSignalDef
+ *
+ * Returns: (transfer full): a new #GladeSignalDef
+ */
+GladeSignalDef *
+glade_signal_def_new  (GladeWidgetAdaptor *adaptor,
+                       GType               for_type,
+                       guint               signal_id)
+{
+  GladeSignalDef *def;
+
+  def = g_slice_new0 (GladeSignalDef);
+
+  def->adaptor = adaptor;
+
+  /* Since glib gave us this signal id... it should
+   * exist no matter what.
+   */
+  g_signal_query (signal_id, &(def->query));
+  if (def->query.signal_id == 0)
+    {
+      g_critical ("glade_signal_def_new() called with an invalid signal id");
+
+      glade_signal_def_free (def);
+      return NULL;
+    }
+
+  def->name = (def->query.signal_name);
+  def->type = g_type_name (for_type);
+
+  /* Initialize signal versions & deprecated to adaptor version */
+  def->version_since_major = GWA_VERSION_SINCE_MAJOR (adaptor);
+  def->version_since_minor = GWA_VERSION_SINCE_MINOR (adaptor);
+  def->deprecated          = GWA_DEPRECATED (adaptor);
+
+  return def;
+}
+
+/**
+ * glade_signal_def_clone:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Clones a #GladeSignalDef
+ *
+ * Returns: (transfer full): a new copy of @signal_def
+ */
+GladeSignalDef *
+glade_signal_def_clone (GladeSignalDef *signal_def)
+{
+  GladeSignalDef *clone;
+
+  clone = g_slice_new0 (GladeSignalDef);
+
+  memcpy (clone, signal_def, sizeof (GladeSignalDef));
+  return clone;
+}
+
+/**
+ * glade_signal_def_free:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Frees a #GladeSignalDef
+ */
+void
+glade_signal_def_free (GladeSignalDef *signal_def)
+{
+  if (signal_def == NULL)
+    return;
+
+  g_slice_free (GladeSignalDef, signal_def);
+}
+
+void
+glade_signal_def_update_from_node (GladeSignalDef *signal_def,
+                                   GladeXmlNode     *node,
+                                   const gchar      *domain)
+{
+  g_return_if_fail (signal_def != NULL);
+  g_return_if_fail (node != NULL);
+
+  glade_xml_get_property_version (node, GLADE_TAG_VERSION_SINCE,
+                                  &signal_def->version_since_major, 
+                                  &signal_def->version_since_minor);
+
+  signal_def->deprecated =
+    glade_xml_get_property_boolean (node,
+                                    GLADE_TAG_DEPRECATED,
+                                    signal_def->deprecated);
+}
+
+/**
+ * glade_signal_def_get_adaptor:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get #GladeWidgetAdaptor associated with the signal.
+ *
+ * Returns: (transfer none): a #GladeWidgetAdaptor
+ */
+GladeWidgetAdaptor *
+glade_signal_def_get_adaptor (const GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, NULL);
+
+  return signal_def->adaptor;
+}
+
+/**
+ * glade_signal_def_get_name:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get the name of the signal.
+ *
+ * Returns: the name of the signal
+ */
+G_CONST_RETURN gchar *
+glade_signal_def_get_name (const GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, NULL);
+
+  return signal_def->name;
+}
+
+/**
+ * glade_signal_def_get_object_type_name:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get the name of the object class that this signal belongs to.
+ *
+ * Returns: the type name of the signal
+ */
+G_CONST_RETURN gchar *
+glade_signal_def_get_object_type_name (const GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, NULL);
+
+  return signal_def->type;
+}
+
+/**
+ * glade_signal_def_get_flags:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get the combination of GSignalFlags specifying detail of when the default
+ * handler is to be invoked.
+ *
+ * Returns: the #GSignalFlags
+ */
+GSignalFlags
+glade_signal_def_get_flags (const GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, 0);
+
+  return signal_def->query.signal_flags;
+}
+
+/**
+ * glade_signal_def_set_since:
+ * @signal_def: a #GladeSignalDef
+ * @since_major: the major version.
+ * @since_minor: the minor version.
+ *
+ * Set the major and minor version that introduced this signal.
+ */
+void
+glade_signal_def_set_since (GladeSignalDef *signal_def,
+                            guint16           since_major,
+                            guint16           since_minor)
+{
+  g_return_if_fail (signal_def != NULL);
+
+  signal_def->version_since_major = since_major;
+  signal_def->version_since_minor = since_minor;
+}
+
+/**
+ * glade_signal_def_since_major:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get the major version that introduced this signal.
+ *
+ * Returns: the major version
+ */
+guint16
+glade_signal_def_since_major (GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, 0);
+
+  return signal_def->version_since_major;
+}
+
+/**
+ * glade_signal_def_since_minor:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get the minor version that introduced this signal.
+ *
+ * Returns: the minor version
+ */
+guint16
+glade_signal_def_since_minor (GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, 0);
+
+  return signal_def->version_since_minor;
+}
+
+/**
+ * glade_signal_def_deprecated:
+ * @signal_def: a #GladeSignalDef
+ * @deprecated: %TRUE if the signal is deprecated
+ *
+ * Set if the signal is deprecated.
+ */
+void
+glade_signal_def_set_deprecated (GladeSignalDef *signal_def,
+                                 gboolean          deprecated)
+{
+  g_return_if_fail (signal_def != NULL);
+
+  signal_def->deprecated = deprecated;
+}
+
+/**
+ * glade_signal_def_deprecated:
+ * @signal_def: a #GladeSignalDef
+ *
+ * Get if the signal is flagged as deprecated.
+ *
+ * Returns: %TRUE if the signal is deprecated
+ */
+gboolean
+glade_signal_def_deprecated (GladeSignalDef *signal_def)
+{
+  g_return_val_if_fail (signal_def != NULL, FALSE);
+
+  return signal_def->deprecated;
+}
diff --git a/gladeui/glade-signal-def.h b/gladeui/glade-signal-def.h
new file mode 100644
index 00000000..de674e25
--- /dev/null
+++ b/gladeui/glade-signal-def.h
@@ -0,0 +1,80 @@
+/* glade-signal-def.h
+ *
+ * Copyright (C) 2011 Openismus GmbH
+ *
+ * Authors:
+ *      Tristan Van Berkom <tristanvb@openismus.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GLADE_SIGNAL_DEF_H_
+#define _GLADE_SIGNAL_DEF_H_
+
+#include <glib-object.h>
+#include <gladeui/glade-xml-utils.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GSC_VERSION_CHECK:
+ * @klass: A #GladeSignalDef
+ * @major_version: The major version to check
+ * @minor_version: The minor version to check
+ *
+ * Evaluates to %TRUE if @klass is available in its owning library version-@major_verion.@minor_version.
+ *
+ */
+#define GSC_VERSION_CHECK(klass, major_version, minor_version)                      \
+  ((glade_signal_def_since_major (GLADE_SIGNAL_DEF (klass)) == major_version) ? \
+   (glade_signal_def_since_minor (GLADE_SIGNAL_DEF (klass)) <= minor_version) : \
+   (glade_signal_def_since_major (GLADE_SIGNAL_DEF (klass)) <= major_version))
+
+
+#define GLADE_SIGNAL_DEF(klass) ((GladeSignalDef *)(klass))
+
+#define GLADE_TYPE_SIGNAL_DEF glade_signal_def_get_type ()
+
+typedef struct _GladeSignalDef GladeSignalDef;
+
+GType                 glade_signal_def_get_type                 (void) G_GNUC_CONST;
+GladeSignalDef       *glade_signal_def_new                      (GladeWidgetAdaptor   *adaptor,
+                                                                 GType                 for_type,
+                                                                 guint                 signal_id);
+GladeSignalDef       *glade_signal_def_clone                    (GladeSignalDef       *signal_def);
+void                  glade_signal_def_free                     (GladeSignalDef       *signal_def);
+void                  glade_signal_def_update_from_node         (GladeSignalDef       *signal_def,
+                                                                 GladeXmlNode         *node,
+                                                                 const gchar          *domain);
+
+GladeWidgetAdaptor   *glade_signal_def_get_adaptor              (const GladeSignalDef *signal_def);
+G_CONST_RETURN gchar *glade_signal_def_get_name                 (const GladeSignalDef *signal_def);
+G_CONST_RETURN gchar *glade_signal_def_get_object_type_name     (const GladeSignalDef *signal_def);
+GSignalFlags          glade_signal_def_get_flags                (const GladeSignalDef *signal_def);
+
+void                  glade_signal_def_set_since                (GladeSignalDef       *signal_def,
+                                                                 guint16               since_major,
+                                                                 guint16               since_minor);
+guint16               glade_signal_def_since_major              (GladeSignalDef       *signal_def);
+guint16               glade_signal_def_since_minor              (GladeSignalDef       *signal_def);
+
+void                  glade_signal_def_set_deprecated           (GladeSignalDef       *signal_def,
+                                                                 gboolean              deprecated);
+gboolean              glade_signal_def_deprecated               (GladeSignalDef       *signal_def);
+
+
+G_END_DECLS
+
+#endif /* _GLADE_SIGNAL_DEF_H_ */
diff --git a/gladeui/glade-signal-editor.c b/gladeui/glade-signal-editor.c
index b02907f1..2c220d3a 100644
--- a/gladeui/glade-signal-editor.c
+++ b/gladeui/glade-signal-editor.c
@@ -226,7 +226,7 @@ on_handler_edited (GtkCellRendererText *renderer,
                               -1);
                         
           /* Add a new signal handler */
-          new_signal = glade_signal_new (glade_signal_get_class (signal),
+          new_signal = glade_signal_new (glade_signal_get_def (signal),
                                          handler, NULL, FALSE, FALSE);
           glade_signal_set_detail (new_signal, glade_signal_get_detail (signal));
           glade_command_add_signal (self->priv->widget, new_signal);
@@ -612,7 +612,7 @@ glade_signal_editor_devhelp (GtkCellRenderer *cell,
   GtkTreeModel             *model = priv->model;
   GtkTreeIter               iter;
   GladeWidgetAdaptor       *adaptor;
-  const GladeSignalClass   *signal_class;
+  const GladeSignalDef     *signal_def;
   GladeSignal              *signal;
   gchar                    *book;
   gchar                    *search;
@@ -623,8 +623,8 @@ glade_signal_editor_devhelp (GtkCellRenderer *cell,
   gtk_tree_model_get (model, &iter,
                       GLADE_SIGNAL_COLUMN_SIGNAL, &signal,
                       -1);
-  signal_class = glade_signal_get_class (signal);
-  adaptor = glade_signal_class_get_adaptor (signal_class);
+  signal_def = glade_signal_get_def (signal);
+  adaptor = glade_signal_def_get_adaptor (signal_def);
   g_object_get (adaptor, "book", &book, NULL);
 
   search = g_strdup_printf ("The %s signal", glade_signal_get_name (signal));
@@ -747,12 +747,12 @@ glade_signal_editor_load_widget (GladeSignalEditor *editor,
   signals = glade_widget_get_signal_list (widget);
   for (l = signals; l; l = l->next)
     {
-      GladeSignal            *signal = l->data;
-      const GladeSignalClass *signal_class;
-      GladeWidgetAdaptor     *adaptor;
+      GladeSignal          *signal = l->data;
+      const GladeSignalDef *signal_def;
+      GladeWidgetAdaptor   *adaptor;
 
-      signal_class = glade_signal_get_class (signal);
-      adaptor = glade_signal_class_get_adaptor (signal_class);
+      signal_def = glade_signal_get_def (signal);
+      adaptor = glade_signal_def_get_adaptor (signal_def);
 
       if (!g_list_find (adaptors, adaptor))
         adaptors = g_list_prepend (adaptors, adaptor);
@@ -1024,7 +1024,7 @@ glade_signal_editor_detail_cell_data_func (GtkTreeViewColumn *column,
                       GLADE_SIGNAL_COLUMN_SIGNAL, &signal,
                       -1);
   if (signal &&
-      (glade_signal_class_get_flags (glade_signal_get_class (signal)) & G_SIGNAL_DETAILED))
+      (glade_signal_def_get_flags (glade_signal_get_def (signal)) & G_SIGNAL_DETAILED))
     {
       GdkRGBA color;
       gboolean dummy;
@@ -1179,8 +1179,8 @@ glade_signal_editor_devhelp_cell_data_func (GtkTreeViewColumn *column,
                       -1);
   if (signal)
     {
-      const GladeSignalClass *class = glade_signal_get_class (signal);
-      GladeWidgetAdaptor *adaptor = glade_signal_class_get_adaptor (class);
+      const GladeSignalDef *def = glade_signal_get_def (signal);
+      GladeWidgetAdaptor *adaptor = glade_signal_def_get_adaptor (def);
       gchar *book;
 
       g_object_get (adaptor, "book", &book, NULL);
diff --git a/gladeui/glade-signal-model.c b/gladeui/glade-signal-model.c
index 6e9e2189..598747eb 100644
--- a/gladeui/glade-signal-model.c
+++ b/gladeui/glade-signal-model.c
@@ -83,13 +83,13 @@ glade_signal_model_create_widget_list (GladeSignalModel *sig_model)
   for (list = glade_widget_adaptor_get_signals (adaptor);
        list != NULL; list = g_list_next (list))
     {
-      GladeSignalClass *signal = (GladeSignalClass *) list->data;
+      GladeSignalDef *signal = (GladeSignalDef *) list->data;
 
       if (!g_list_find_custom (sig_model->priv->widgets, 
-                               (gpointer) glade_signal_class_get_object_type_name (signal), (GCompareFunc) strcmp))
+                               (gpointer) glade_signal_def_get_object_type_name (signal), (GCompareFunc) strcmp))
         {
           sig_model->priv->widgets = 
-            g_list_prepend (sig_model->priv->widgets, (gpointer) glade_signal_class_get_object_type_name (signal));
+            g_list_prepend (sig_model->priv->widgets, (gpointer) glade_signal_def_get_object_type_name (signal));
         }
     }
   sig_model->priv->widgets = g_list_reverse (sig_model->priv->widgets);
@@ -265,23 +265,23 @@ glade_signal_model_is_dummy_handler (GladeSignalModel *model,
 }
 
 static GladeSignal *
-glade_signal_model_get_dummy_handler (GladeSignalModel       *model, 
-                                      const GladeSignalClass *sig_class)
+glade_signal_model_get_dummy_handler (GladeSignalModel     *model, 
+                                      const GladeSignalDef *sig_def)
 {
   GladeSignal *signal;
 
   signal = g_hash_table_lookup (model->priv->dummy_signals, 
-                                glade_signal_class_get_name (sig_class));
+                                glade_signal_def_get_name (sig_def));
 
   if (!signal)
     {
-      signal = glade_signal_new (sig_class,
+      signal = glade_signal_new (sig_def,
                                  NULL,
                                  NULL,
                                  FALSE,
                                  FALSE);
       g_hash_table_insert (model->priv->dummy_signals, 
-                           (gpointer) glade_signal_class_get_name (sig_class), 
+                           (gpointer) glade_signal_def_get_name (sig_def), 
                            signal);
 
       glade_project_verify_signal (model->priv->widget, signal);
@@ -323,10 +323,10 @@ glade_signal_model_create_signal_list (GladeSignalModel *sig_model,
        signals != NULL;
        signals = g_list_next (signals))
     {
-      GladeSignalClass *sig_class = signals->data;
-      if (g_str_equal (glade_signal_class_get_object_type_name (sig_class), widget_type))
+      GladeSignalDef *sig_def = signals->data;
+      if (g_str_equal (glade_signal_def_get_object_type_name (sig_def), widget_type))
         {
-          widget_signals = g_list_append (widget_signals, sig_class);
+          widget_signals = g_list_append (widget_signals, sig_def);
         }
     }
   return widget_signals;
@@ -339,10 +339,10 @@ on_glade_signal_model_added (GladeWidget       *widget,
 {
   GtkTreeIter iter;
   GtkTreePath *path;
-  const GladeSignalClass *sig_class = glade_signal_get_class (signal);
+  const GladeSignalDef *sig_def = glade_signal_get_def (signal);
 
   glade_signal_model_create_signal_iter (model,
-                                         glade_signal_class_get_object_type_name (sig_class),
+                                         glade_signal_def_get_object_type_name (sig_def),
                                          signal, 
                                          &iter);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
@@ -359,10 +359,10 @@ on_glade_signal_model_removed (GladeWidget       *widget,
 {
   GtkTreeIter iter;
   GtkTreePath *path;
-  const GladeSignalClass *sig_class = glade_signal_get_class (signal);
+  const GladeSignalDef *sig_def = glade_signal_get_def (signal);
   
   glade_signal_model_create_signal_iter (model,
-                                         glade_signal_class_get_object_type_name (sig_class),
+                                         glade_signal_def_get_object_type_name (sig_def),
                                          signal, 
                                          &iter);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
@@ -378,10 +378,10 @@ on_glade_signal_model_changed (GladeWidget *widget,
 {
   GtkTreeIter iter;
   GtkTreePath *path;
-  const GladeSignalClass *sig_class = glade_signal_get_class (signal);
+  const GladeSignalDef *sig_def = glade_signal_get_def (signal);
   
   glade_signal_model_create_signal_iter (model,
-                                         glade_signal_class_get_object_type_name (sig_class),
+                                         glade_signal_def_get_object_type_name (sig_def),
                                          signal, 
                                          &iter);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
@@ -490,7 +490,7 @@ glade_signal_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
   if (handler)
     {
       /* Signal */
-      const GladeSignalClass *sig_class = glade_signal_get_class (handler);
+      const GladeSignalDef *sig_def = glade_signal_get_def (handler);
       gint index0, index1 = 0;
       GList *signal;
       GList *signals = glade_signal_model_create_signal_list (sig_model,
@@ -502,9 +502,9 @@ glade_signal_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
       for (signal = signals; signal != NULL; signal = g_list_next (signal))
         {
           GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals,
-                                                     glade_signal_class_get_name (signal->data));
+                                                     glade_signal_def_get_name (signal->data));
 
-          if (signal->data != sig_class)
+          if (signal->data != sig_def)
             {
               if (handlers) 
                 index1 += handlers->len;
@@ -651,7 +651,7 @@ glade_signal_model_iter_next_signal (GladeSignalModel *sig_model,
       GladeSignal *next_handler;
       GPtrArray *next_handlers = 
         g_hash_table_lookup (sig_model->priv->signals,
-                             glade_signal_class_get_name (signal->data));
+                             glade_signal_def_get_name (signal->data));
       if (next_handlers && next_handlers->len)
         {
           next_handler = g_ptr_array_index (next_handlers, 0);
@@ -694,13 +694,13 @@ glade_signal_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
 
   if (handler)
     {
-      const GladeSignalClass *sig_class = glade_signal_get_class (handler);
+      const GladeSignalDef *sig_def = glade_signal_get_def (handler);
       GList *signals = 
         glade_signal_model_create_signal_list (sig_model,
                                                widget);
-      GList* signal = g_list_find (signals, sig_class);
+      GList* signal = g_list_find (signals, sig_def);
       GPtrArray* handlers = g_hash_table_lookup (sig_model->priv->signals,
-                                                 glade_signal_class_get_name (sig_class));
+                                                 glade_signal_def_get_name (sig_def));
       if (glade_signal_model_is_dummy_handler (sig_model, handler))
         {
           gboolean ret = glade_signal_model_iter_next_signal (sig_model, widget, iter, signal);
@@ -725,7 +725,7 @@ glade_signal_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
             {
               glade_signal_model_create_signal_iter (sig_model, widget,
                                                      glade_signal_model_get_dummy_handler (sig_model,
-                                                                                           sig_class),
+                                                                                           sig_def),
                                                      iter);
               g_list_free (signals);
               return TRUE;
@@ -786,7 +786,7 @@ glade_signal_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
       for (signal = signals; signal != NULL; signal = g_list_next (signal))
         {
           GPtrArray* handlers = g_hash_table_lookup (sig_model->priv->signals,
-                                                     glade_signal_class_get_name (signal->data));
+                                                     glade_signal_def_get_name (signal->data));
           if (handlers)
             retval += handlers->len;
           retval++; 
@@ -836,7 +836,7 @@ glade_signal_model_iter_nth_child (GtkTreeModel *model,
       for (signal = signals; signal != NULL; signal = g_list_next (signal))
         {
           GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals,
-                                                     glade_signal_class_get_name (signal->data));
+                                                     glade_signal_def_get_name (signal->data));
           if (handlers)
             {
               if (n >= handlers->len)
diff --git a/gladeui/glade-signal.c b/gladeui/glade-signal.c
index 19d0c62c..fee32bca 100644
--- a/gladeui/glade-signal.c
+++ b/gladeui/glade-signal.c
@@ -32,7 +32,7 @@
 
 struct _GladeSignalPrivate
 {
-  const GladeSignalClass *class;   /* Pointer to the signal class */
+  const GladeSignalDef *def;   /* Pointer to the signal definition */
   gchar    *detail;       /* Signal detail */
   gchar    *handler;      /* Handler function eg "gtk_main_quit" */
   gchar    *userdata;     /* User data signal handler argument   */
@@ -92,7 +92,7 @@ glade_signal_get_property (GObject    *object,
   switch (prop_id)
     {
       case PROP_CLASS:
-        g_value_set_pointer (value, (gpointer) signal->priv->class);
+        g_value_set_pointer (value, (gpointer) signal->priv->def);
         break;
       case PROP_DETAIL:
         g_value_set_string (value, signal->priv->detail);
@@ -129,7 +129,7 @@ glade_signal_set_property (GObject      *object,
   switch (prop_id)
     {
       case PROP_CLASS:
-        signal->priv->class = g_value_get_pointer (value);
+        signal->priv->def = g_value_get_pointer (value);
         break;
       case PROP_DETAIL:
         glade_signal_set_detail (signal, g_value_get_string (value));
@@ -222,7 +222,7 @@ glade_signal_klass_init (GladeSignalKlass *klass)
 
 /**
  * glade_signal_new:
- * @sig_class: a #GladeSignalClass
+ * @sig_def: a #GladeSignalDef
  * @handler: a handler function for the signal
  * @userdata: the userdata for this signal
  * @after: whether this handler should be called after the default emission phase
@@ -233,16 +233,16 @@ glade_signal_klass_init (GladeSignalKlass *klass)
  * Returns: the new #GladeSignal
  */
 GladeSignal *
-glade_signal_new (const GladeSignalClass *sig_class,
-                  const gchar            *handler,
-                  const gchar            *userdata, 
-                  gboolean                after, 
-                  gboolean                swapped)
+glade_signal_new (const GladeSignalDef *sig_def,
+                  const gchar          *handler,
+                  const gchar          *userdata, 
+                  gboolean              after, 
+                  gboolean              swapped)
 {
-  g_return_val_if_fail (sig_class != NULL, NULL);
+  g_return_val_if_fail (sig_def != NULL, NULL);
 
   return GLADE_SIGNAL (g_object_new (GLADE_TYPE_SIGNAL,
-                                     "class", sig_class,
+                                     "class", sig_def,
                                      "handler", handler,
                                      "userdata", userdata,
                                      "after", after,
@@ -293,7 +293,7 @@ glade_signal_clone (const GladeSignal *signal)
 
   g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
 
-  dup = glade_signal_new (signal->priv->class,
+  dup = glade_signal_new (signal->priv->def,
                           signal->priv->handler,
                           signal->priv->userdata, 
                           signal->priv->after, 
@@ -375,7 +375,7 @@ GladeSignal *
 glade_signal_read (GladeXmlNode *node, GladeWidgetAdaptor *adaptor)
 {
   GladeSignal *signal = NULL;
-  GladeSignalClass *signal_class;
+  GladeSignalDef *signal_def;
   gchar *name, *handler, *userdata, *detail;
 
   g_return_val_if_fail (glade_xml_node_verify_silent
@@ -398,12 +398,12 @@ glade_signal_read (GladeXmlNode *node, GladeWidgetAdaptor *adaptor)
       return NULL;
     }
 
-  userdata     = glade_xml_get_property_string (node, GLADE_XML_TAG_OBJECT);
-  signal_class = glade_widget_adaptor_get_signal_class (adaptor, name);
+  userdata   = glade_xml_get_property_string (node, GLADE_XML_TAG_OBJECT);
+  signal_def = glade_widget_adaptor_get_signal_def (adaptor, name);
 
-  if (signal_class)
+  if (signal_def)
     {
-      signal = glade_signal_new (signal_class,
+      signal = glade_signal_new (signal_def,
                                  handler, userdata,
                                  glade_xml_get_property_boolean (node, GLADE_XML_TAG_AFTER, FALSE),
                                  glade_xml_get_property_boolean (node, GLADE_XML_TAG_SWAPPED,
@@ -430,13 +430,13 @@ glade_signal_get_name (const GladeSignal *signal)
 {
   g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
 
-  return glade_signal_class_get_name (signal->priv->class);
+  return glade_signal_def_get_name (signal->priv->def);
 }
 
-G_CONST_RETURN GladeSignalClass *
-glade_signal_get_class (const GladeSignal *signal)
+G_CONST_RETURN GladeSignalDef *
+glade_signal_get_def (const GladeSignal *signal)
 {
-        return signal->priv->class;
+        return signal->priv->def;
 }
 
 void
@@ -444,7 +444,7 @@ glade_signal_set_detail (GladeSignal *signal, const gchar *detail)
 {
   g_return_if_fail (GLADE_IS_SIGNAL (signal));
   
-  if (glade_signal_class_get_flags (signal->priv->class) & G_SIGNAL_DETAILED &&
+  if (glade_signal_def_get_flags (signal->priv->def) & G_SIGNAL_DETAILED &&
       g_strcmp0 (signal->priv->detail, detail))
     {
       g_free (signal->priv->detail);
diff --git a/gladeui/glade-signal.h b/gladeui/glade-signal.h
index 2698d2a9..9e0ef955 100644
--- a/gladeui/glade-signal.h
+++ b/gladeui/glade-signal.h
@@ -2,7 +2,7 @@
 #define __GLADE_SIGNAL_H__
 
 #include <glib.h>
-#include <gladeui/glade-signal-class.h>
+#include <gladeui/glade-signal-def.h>
 #include <gladeui/glade-widget-adaptor.h>
 
 G_BEGIN_DECLS
@@ -36,7 +36,7 @@ struct _GladeSignalKlass {
 
 GType                 glade_signal_get_type            (void) G_GNUC_CONST;
 
-GladeSignal          *glade_signal_new                 (const GladeSignalClass *sig_class,
+GladeSignal          *glade_signal_new                 (const GladeSignalDef *sig_def,
                                                         const gchar        *handler,
                                                         const gchar        *userdata,
                                                         gboolean            after,
@@ -51,7 +51,7 @@ void                  glade_signal_write               (GladeSignal        *sign
                                                         GladeXmlNode       *node);
 
 G_CONST_RETURN gchar *glade_signal_get_name            (const GladeSignal  *signal);
-G_CONST_RETURN GladeSignalClass *glade_signal_get_class (const GladeSignal * signal);
+G_CONST_RETURN GladeSignalDef *glade_signal_get_def    (const GladeSignal * signal);
 void                  glade_signal_set_detail          (GladeSignal        *signal,
                                                         const gchar        *detail);
 G_CONST_RETURN gchar *glade_signal_get_detail          (const GladeSignal  *signal);
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index 1b610bfb..d0a471ba 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -83,7 +83,7 @@ struct _GladeWidgetAdaptorPrivate
                                      * of properties for each type - this association is
                                      * managed on the GladePropertyClass proper.
                                      */
-  GList       *signals;              /* List of GladeSignalClass objects */
+  GList       *signals;              /* List of GladeSignalDef objects */
   GList       *child_packings;       /* Default packing property values */
   GList       *actions;              /* A list of GWActionClass */
   GList       *packing_actions;      /* A list of GWActionClass for child objects */
@@ -314,18 +314,18 @@ glade_widget_adaptor_has_internal_children (GladeWidgetAdaptor *adaptor)
 static gint
 gwa_signal_comp (gpointer a, gpointer b)
 {
-  GladeSignalClass *signal_a = a, *signal_b = b;
+  GladeSignalDef *signal_a = a, *signal_b = b;
 
-  return strcmp (glade_signal_class_get_name (signal_b), 
-                 glade_signal_class_get_name (signal_a));
+  return strcmp (glade_signal_def_get_name (signal_b), 
+                 glade_signal_def_get_name (signal_a));
 }
 
 static gint
 gwa_signal_find_comp (gpointer a, gpointer b)
 {
-  GladeSignalClass *signal = a;
+  GladeSignalDef *signal = a;
   gchar *name = b;
-  return strcmp (name, glade_signal_class_get_name (signal));
+  return strcmp (name, glade_signal_def_get_name (signal));
 }
 
 static void
@@ -333,7 +333,7 @@ gwa_add_signals (GladeWidgetAdaptor *adaptor, GList **signals, GType type)
 {
   guint               count, *sig_ids, num_signals;
   GladeWidgetAdaptor *type_adaptor;
-  GladeSignalClass   *signal;
+  GladeSignalDef     *signal;
   GList              *list = NULL;
 
   type_adaptor = glade_widget_adaptor_get_by_type (type);
@@ -342,7 +342,7 @@ gwa_add_signals (GladeWidgetAdaptor *adaptor, GList **signals, GType type)
 
   for (count = 0; count < num_signals; count++)
     {
-      signal = glade_signal_class_new (type_adaptor ? 
+      signal = glade_signal_def_new (type_adaptor ? 
                                        type_adaptor : adaptor,
                                        type, sig_ids[count]);
 
@@ -534,7 +534,7 @@ gwa_inherit_signals (GladeWidgetAdaptor *adaptor)
 {
   GladeWidgetAdaptor *parent_adaptor;
   GList *list, *node;
-  GladeSignalClass *signal, *parent_signal;
+  GladeSignalDef *signal, *parent_signal;
 
   if ((parent_adaptor = gwa_get_parent_adaptor (adaptor)) != NULL)
     {
@@ -543,7 +543,7 @@ gwa_inherit_signals (GladeWidgetAdaptor *adaptor)
           signal = list->data;
 
           if ((node = g_list_find_custom (parent_adaptor->priv->signals, 
-                                          glade_signal_class_get_name (signal),
+                                          glade_signal_def_get_name (signal),
                                           (GCompareFunc) gwa_signal_find_comp)) != NULL)
             {
               parent_signal = node->data;
@@ -555,13 +555,13 @@ gwa_inherit_signals (GladeWidgetAdaptor *adaptor)
                */
               if (strcmp (adaptor->priv->catalog,
                           parent_adaptor->priv->catalog))
-                glade_signal_class_set_since (signal, 0, 0);
+                glade_signal_def_set_since (signal, 0, 0);
               else
-                glade_signal_class_set_since (signal, 
-                                              glade_signal_class_since_major (parent_signal),
-                                              glade_signal_class_since_minor (parent_signal));
+                glade_signal_def_set_since (signal, 
+                                            glade_signal_def_since_major (parent_signal),
+                                            glade_signal_def_since_minor (parent_signal));
 
-              glade_signal_class_set_deprecated (signal, glade_signal_class_deprecated (parent_signal));
+              glade_signal_def_set_deprecated (signal, glade_signal_def_deprecated (parent_signal));
             }
         }
     }
@@ -734,7 +734,7 @@ glade_widget_adaptor_finalize (GObject *object)
   adaptor->priv->packing_props = NULL;
 
   g_list_free_full (adaptor->priv->signals,
-                    (GDestroyNotify) glade_signal_class_free);
+                    (GDestroyNotify) glade_signal_def_free);
   adaptor->priv->signals = NULL;
 
   /* Free child packings */
@@ -1871,7 +1871,7 @@ glade_widget_adaptor_get_packing_props (GladeWidgetAdaptor *adaptor)
  * glade_widget_adaptor_get_signals:
  * @adaptor: A #GladeWidgetAdaptor
  *
- * Returns: (transfer none) (element-type GladeSignalClass): a list of #GladeSignalClass
+ * Returns: (transfer none) (element-type GladeSignalDef): a list of #GladeSignalDef
  */
 G_CONST_RETURN GList *
 glade_widget_adaptor_get_signals (GladeWidgetAdaptor *adaptor)
@@ -2380,10 +2380,10 @@ gwa_set_signals_from_node (GladeWidgetAdaptor *adaptor,
                            GladeXmlNode       *node,
                            const gchar        *domain)
 {
-  GladeXmlNode     *child;
-  GladeSignalClass *signal;
-  GList            *list;
-  gchar            *id;
+  GladeXmlNode   *child;
+  GladeSignalDef *signal;
+  GList          *list;
+  gchar          *id;
 
   for (child = glade_xml_node_get_children (node);
        child; child = glade_xml_node_next (child))
@@ -2400,7 +2400,7 @@ gwa_set_signals_from_node (GladeWidgetAdaptor *adaptor,
         {
           signal = list->data;
 
-          glade_signal_class_update_from_node (signal, child, domain);
+          glade_signal_def_update_from_node (signal, child, domain);
         }
       g_free (id);
     }
@@ -2902,7 +2902,7 @@ glade_widget_adaptor_from_catalog (GladeCatalog *catalog,
     {
       if (adaptor->priv->signals)
         g_list_free_full (adaptor->priv->signals,
-                          (GDestroyNotify) glade_signal_class_free);
+                          (GDestroyNotify) glade_signal_def_free);
 
       adaptor->priv->signals = gwa_list_signals (adaptor, adaptor->priv->real_type);
 
@@ -4446,20 +4446,20 @@ glade_widget_adaptor_string_from_value (GladeWidgetAdaptor *adaptor,
 
 
 /**
- * glade_widget_adaptor_get_signal_class:
+ * glade_widget_adaptor_get_signal_def:
  * @adaptor: A #GladeWidgetAdaptor
  * @name: the name of the signal class.
  * 
  * Looks up signal class @name on @adaptor.
  *
- * Returns: (nullable) (transfer none): a #GladeSignalClass or %NULL
+ * Returns: (nullable) (transfer none): a #GladeSignalDef or %NULL
  */
-GladeSignalClass *
-glade_widget_adaptor_get_signal_class (GladeWidgetAdaptor *adaptor,
-                                       const gchar        *name)
+GladeSignalDef *
+glade_widget_adaptor_get_signal_def (GladeWidgetAdaptor *adaptor,
+                                     const gchar        *name)
 {
   GList *list;
-  GladeSignalClass *signal;
+  GladeSignalDef *signal;
 
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
   g_return_val_if_fail (name != NULL, NULL);
@@ -4467,7 +4467,7 @@ glade_widget_adaptor_get_signal_class (GladeWidgetAdaptor *adaptor,
   for (list = adaptor->priv->signals; list; list = list->next)
     {
       signal = list->data;
-      if (!strcmp (glade_signal_class_get_name (signal), name))
+      if (!strcmp (glade_signal_def_get_name (signal), name))
         return signal;
     }
 
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h
index f42d071e..490de1eb 100644
--- a/gladeui/glade-widget-adaptor.h
+++ b/gladeui/glade-widget-adaptor.h
@@ -4,7 +4,7 @@
 #include <gladeui/glade-xml-utils.h>
 #include <gladeui/glade-property-class.h>
 #include <gladeui/glade-editor-property.h>
-#include <gladeui/glade-signal-class.h>
+#include <gladeui/glade-signal-def.h>
 #include <gladeui/glade-catalog.h>
 #include <gladeui/glade-editable.h>
 #include <glib-object.h>
@@ -913,7 +913,7 @@ gchar                *glade_widget_adaptor_string_from_value  (GladeWidgetAdapto
                                                                const GValue       *value);
 GladeEditable        *glade_widget_adaptor_create_editable    (GladeWidgetAdaptor *adaptor,
                                                                GladeEditorPageType type);
-GladeSignalClass     *glade_widget_adaptor_get_signal_class   (GladeWidgetAdaptor *adaptor,
+GladeSignalDef       *glade_widget_adaptor_get_signal_def     (GladeWidgetAdaptor *adaptor,
                                                                const gchar        *name);
 GladeWidgetAdaptor   *glade_widget_adaptor_get_parent_adaptor (GladeWidgetAdaptor *adaptor);
 
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 00079f18..af904484 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -4262,10 +4262,10 @@ signal_compare (GladeSignal *signal_a, GladeSignal *signal_b)
 {
   const gchar *handler_a;
   const gchar *handler_b;
-  const GladeSignalClass *class_a;
-  const GladeSignalClass *class_b;
-  const gchar *class_name_a;
-  const gchar *class_name_b;
+  const GladeSignalDef *def_a;
+  const GladeSignalDef *def_b;
+  const gchar *def_name_a;
+  const gchar *def_name_b;
   const gchar *detail_a;
   const gchar *detail_b;
   const gchar *data_a;
@@ -4279,13 +4279,13 @@ signal_compare (GladeSignal *signal_a, GladeSignal *signal_b)
   data_a    = glade_signal_get_userdata (signal_a);
   data_b    = glade_signal_get_userdata (signal_b);
 
-  class_a   = glade_signal_get_class (signal_a);
-  class_b   = glade_signal_get_class (signal_b);
-  class_name_a = glade_signal_class_get_name (class_a);
-  class_name_b = glade_signal_class_get_name (class_b);
+  def_a   = glade_signal_get_def (signal_a);
+  def_b   = glade_signal_get_def (signal_b);
+  def_name_a = glade_signal_def_get_name (def_a);
+  def_name_b = glade_signal_def_get_name (def_b);
 
   /* By signal name ... */
-  comparison = g_strcmp0 (class_name_a, class_name_b);
+  comparison = g_strcmp0 (def_name_a, def_name_b);
   if (comparison != 0)
     return comparison;
 
diff --git a/gladeui/glade.h b/gladeui/glade.h
index 27b01811..1846e9d2 100644
--- a/gladeui/glade.h
+++ b/gladeui/glade.h
@@ -27,7 +27,7 @@
 #include <gladeui/glade-property-class.h>
 #include <gladeui/glade-property-shell.h>
 #include <gladeui/glade-property.h>
-#include <gladeui/glade-signal-class.h>
+#include <gladeui/glade-signal-def.h>
 #include <gladeui/glade-signal-model.h>
 #include <gladeui/glade-signal.h>
 #include <gladeui/glade-project.h>
diff --git a/gladeui/meson.build b/gladeui/meson.build
index 8cddcec0..3df9cdee 100644
--- a/gladeui/meson.build
+++ b/gladeui/meson.build
@@ -46,7 +46,7 @@ headers = files(
   'glade-property-label.h',
   'glade-property-shell.h',
   'glade-signal.h',
-  'glade-signal-class.h',
+  'glade-signal-def.h',
   'glade-signal-editor.h',
   'glade-signal-model.h',
   'glade-utils.h',
@@ -120,7 +120,7 @@ sources = files(
   'glade-property-label.c',
   'glade-property-shell.c',
   'glade-signal.c',
-  'glade-signal-class.c',
+  'glade-signal-def.c',
   'glade-signal-editor.c',
   'glade-signal-model.c',
   'glade-template.c',
diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c
index 989c1ff8..71bfc4d7 100644
--- a/plugins/gtk+/glade-accels.c
+++ b/plugins/gtk+/glade-accels.c
@@ -201,7 +201,7 @@ glade_eprop_accel_populate_view (GladeEditorProperty * eprop,
                                  GtkTreeView * view)
 {
   GladeEPropAccel *eprop_accel = GLADE_EPROP_ACCEL (eprop);
-  GladeSignalClass *sclass;
+  GladeSignalDef *sdef;
   GladePropertyClass *pclass = glade_editor_property_get_pclass (eprop);
   GladeProperty      *property = glade_editor_property_get_property (eprop);
   GladeWidgetAdaptor *adaptor = glade_property_class_get_adaptor (pclass);
@@ -222,32 +222,32 @@ G_GNUC_END_IGNORE_DEPRECATIONS
    */
   for (list = glade_widget_adaptor_get_signals (adaptor); list; list = list->next)
     {
-      sclass = list->data;
+      sdef = list->data;
 
       /* Special case for GtkAction accelerators  */
       if (glade_widget_adaptor_get_object_type (adaptor) == type_action ||
           g_type_is_a (glade_widget_adaptor_get_object_type (adaptor), type_action))
         {
-          if (g_strcmp0 (glade_signal_class_get_object_type_name (sclass), "GtkAction") != 0 ||
-              g_strcmp0 (glade_signal_class_get_name (sclass), "activate") != 0)
+          if (g_strcmp0 (glade_signal_def_get_object_type_name (sdef), "GtkAction") != 0 ||
+              g_strcmp0 (glade_signal_def_get_name (sdef), "activate") != 0)
             continue;
         }
       /* Only action signals have accelerators. */
-      else if ((glade_signal_class_get_flags (sclass) & G_SIGNAL_ACTION) == 0)
+      else if ((glade_signal_def_get_flags (sdef) & G_SIGNAL_ACTION) == 0)
         continue;
 
       if (g_list_find_custom (eprop_accel->parent_iters,
-                              glade_signal_class_get_object_type_name (sclass),
+                              glade_signal_def_get_object_type_name (sdef),
                               (GCompareFunc) eprop_find_iter) == NULL)
         {
           gtk_tree_store_append (model, &iter, NULL);
           gtk_tree_store_set (model, &iter,
-                              ACCEL_COLUMN_SIGNAL, glade_signal_class_get_object_type_name (sclass),
+                              ACCEL_COLUMN_SIGNAL, glade_signal_def_get_object_type_name (sdef),
                               ACCEL_COLUMN_WEIGHT, PANGO_WEIGHT_BOLD,
                               ACCEL_COLUMN_VISIBLE, FALSE, -1);
 
           parent_tab = g_new0 (GladeEpropIterTab, 1);
-          parent_tab->name = glade_signal_class_get_object_type_name (sclass);
+          parent_tab->name = glade_signal_def_get_object_type_name (sdef);
           parent_tab->iter = gtk_tree_iter_copy (&iter);
 
           eprop_accel->parent_iters =
@@ -259,26 +259,26 @@ G_GNUC_END_IGNORE_DEPRECATIONS
    */
   for (list = glade_widget_adaptor_get_signals (adaptor); list; list = list->next)
     {
-      sclass = list->data;
+      sdef = list->data;
 
       /* Special case for GtkAction accelerators  */
       if (glade_widget_adaptor_get_object_type (adaptor) == type_action ||
           g_type_is_a (glade_widget_adaptor_get_object_type (adaptor), type_action))
         {
-          if (g_strcmp0 (glade_signal_class_get_object_type_name (sclass), "GtkAction") != 0 ||
-              g_strcmp0 (glade_signal_class_get_name (sclass), "activate") != 0)
+          if (g_strcmp0 (glade_signal_def_get_object_type_name (sdef), "GtkAction") != 0 ||
+              g_strcmp0 (glade_signal_def_get_name (sdef), "activate") != 0)
             continue;
         }
       /* Only action signals have accelerators. */
-      else if ((glade_signal_class_get_flags (sclass) & G_SIGNAL_ACTION) == 0)
+      else if ((glade_signal_def_get_flags (sdef) & G_SIGNAL_ACTION) == 0)
         continue;
 
       if ((found = g_list_find_custom (eprop_accel->parent_iters,
-                                       glade_signal_class_get_object_type_name (sclass),
+                                       glade_signal_def_get_object_type_name (sdef),
                                        (GCompareFunc) eprop_find_iter)) != NULL)
         {
           parent_tab = found->data;
-          name = g_strdup_printf ("    %s", glade_signal_class_get_name (sclass));
+          name = g_strdup_printf ("    %s", glade_signal_def_get_name (sdef));
 
           /* Populate from accelerator list
            */
@@ -286,7 +286,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
             {
               info = l->data;
 
-              if (g_strcmp0 (info->signal, glade_signal_class_get_name (sclass)))
+              if (g_strcmp0 (info->signal, glade_signal_def_get_name (sdef)))
                 continue;
 
               accel_text = gtk_accelerator_name (info->key, info->modifiers);
@@ -295,7 +295,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
               gtk_tree_store_set
                   (model, &iter,
                    ACCEL_COLUMN_SIGNAL, name,
-                   ACCEL_COLUMN_REAL_SIGNAL, glade_signal_class_get_name (sclass),
+                   ACCEL_COLUMN_REAL_SIGNAL, glade_signal_def_get_name (sdef),
                    ACCEL_COLUMN_TEXT, accel_text,
                    ACCEL_COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL,
                    ACCEL_COLUMN_STYLE, PANGO_STYLE_NORMAL,
@@ -319,7 +319,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
           gtk_tree_store_set
               (model, &iter,
                ACCEL_COLUMN_SIGNAL, name,
-               ACCEL_COLUMN_REAL_SIGNAL, glade_signal_class_get_name (sclass),
+               ACCEL_COLUMN_REAL_SIGNAL, glade_signal_def_get_name (sdef),
                ACCEL_COLUMN_TEXT, _("<choose a key>"),
                ACCEL_COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL,
                ACCEL_COLUMN_STYLE, PANGO_STYLE_ITALIC,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a6be3162..40f29bd6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,7 +41,7 @@ gladeui/glade-property-class.c
 gladeui/glade-property-label.c
 gladeui/glade-property-shell.c
 gladeui/glade-signal.c
-gladeui/glade-signal-class.c
+gladeui/glade-signal-def.c
 gladeui/glade-signal-editor.c
 gladeui/glade-utils.c
 gladeui/glade-widget-action.c