* plugins/gtk+/glade-gtk-activatable.[ch]: code cleanup.

 * plugins/gtk+/glade-gtk-switch.c: added suport code for GtkSwitch

 * plugins/gtk+/glade-gtk.c:
   o removed GtkActivatable support code.
   o start using GtkActivatable common support code.

 * plugins/gtk+/gtk+.xml.in:
   o added GtkSwitch support
   o made GtkAction toplevel

9 files changed, 140 insertions, 179 deletions

diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 5810eeae..36e30a9c 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -46,6 +46,8 @@ libgladegtk_la_SOURCES = \
 	glade-gtk-grid.c \
 	glade-gtk-action-widgets.c \
 	glade-gtk-info-bar.c \
+	glade-gtk-activatable.c \
+	glade-gtk-switch.c \
 	glade-gtk-marshallers.c
 
 libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
diff --git a/plugins/gtk+/glade-gtk-activatable.c b/plugins/gtk+/glade-gtk-activatable.c
index e9b3bdb6..b2bfef26 100644
--- a/plugins/gtk+/glade-gtk-activatable.c
+++ b/plugins/gtk+/glade-gtk-activatable.c
@@ -23,26 +23,28 @@
  */
 
 #include <config.h>
-#include <gladeui/glade.h>
+#include "glade-gtk-activatable.h"
 
 /* ----------------------------- GtkActivatable ------------------------------ */
 void
 glade_gtk_activatable_parse_finished (GladeProject *project, 
                                       GladeWidget  *widget)
 {
-	GObject *related_action = NULL;
+  GObject *related_action = NULL;
 
-	glade_widget_property_get (widget, "related-action", &related_action);
-	if (related_action == NULL)
-		glade_widget_property_set (widget, "use-action-appearance", FALSE);
+  glade_widget_property_get (widget, "related-action", &related_action);
+  if (related_action == NULL)
+    glade_widget_property_set (widget, "use-action-appearance", FALSE);
 }
 
 void
-glade_gtk_evaluate_activatable_property_sensitivity (GObject *object,
+glade_gtk_activatable_evaluate_property_sensitivity (GObject *object,
                                                      const gchar *id,
                                                      const GValue *value)
 {
   GladeWidget *gwidget = glade_widget_get_from_gobject (object);
+  gboolean sensitivity;
+  gchar *msg;
 
   if (!strcmp (id, "related-action"))
     {
@@ -50,72 +52,42 @@ glade_gtk_evaluate_activatable_property_sensitivity (GObject *object,
       
       if (action)
         {
-          glade_widget_property_set_sensitive (gwidget, "visible", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "sensitive", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-
-          glade_widget_property_set_sensitive (gwidget, "accel-group", FALSE,
-                                               ACTION_APPEARANCE_MSG);
+          sensitivity = FALSE;
+          msg = ACTION_APPEARANCE_MSG;
         }
       else
         {
-          glade_widget_property_set_sensitive (gwidget, "visible", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "sensitive", TRUE,
-                                               NULL);
-
-          glade_widget_property_set_sensitive (gwidget, "accel-group", TRUE,
-                                               NULL);
+          sensitivity = TRUE;
+          msg = NULL;
         }
 
+      glade_widget_property_set_sensitive (gwidget, "visible", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "sensitive", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "accel-group", sensitivity, msg);
     }
   else if (!strcmp (id, "use-action-appearance"))
     {
-      gboolean use_appearance = g_value_get_boolean (value);
-
-
-      if (use_appearance)
+      if (g_value_get_boolean (value))
         {
-          glade_widget_property_set_sensitive (gwidget, "label", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "use-underline", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "stock", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          //glade_widget_property_set_sensitive (gwidget, "use-stock", FALSE, ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "image", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "custom-child", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "stock-id", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "label-widget", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "icon-name", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "icon-widget", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "icon", FALSE,
-                                               ACTION_APPEARANCE_MSG);
+          sensitivity = FALSE;
+          msg = ACTION_APPEARANCE_MSG;
         }
       else
         {
-          glade_widget_property_set_sensitive (gwidget, "label", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "use-underline", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "stock", TRUE, NULL);
-          //glade_widget_property_set_sensitive (gwidget, "use-stock", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "image", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "custom-child", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "stock-id", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "label-widget", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "icon-name", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "icon-widget", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "icon", TRUE, NULL);
+          sensitivity = TRUE;
+          msg = NULL;
         }
+      
+      glade_widget_property_set_sensitive (gwidget, "label", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "use-underline", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "stock", sensitivity, msg);
+      //glade_widget_property_set_sensitive (gwidget, "use-stock", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "image", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "custom-child", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "stock-id", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "label-widget", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "icon-name", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "icon-widget", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "icon", sensitivity, msg);
     }
 }
diff --git a/plugins/gtk+/glade-gtk-activatable.h b/plugins/gtk+/glade-gtk-activatable.h
index d825bc09..9333328f 100644
--- a/plugins/gtk+/glade-gtk-activatable.h
+++ b/plugins/gtk+/glade-gtk-activatable.h
@@ -26,6 +26,7 @@
 #define __GLADE_GTK_ACTIVATABLE_H__
 
 #include <gladeui/glade.h>
+#include "glade-gtk.h"
 
 G_BEGIN_DECLS
 
@@ -40,4 +41,4 @@ glade_gtk_activatable_evaluate_property_sensitivity (GObject *object,
 
 G_END_DECLS
 
-#endif __GLADE_GTK_ACTIVATABLE_H__
+#endif /* __GLADE_GTK_ACTIVATABLE_H__ */
diff --git a/plugins/gtk+/glade-gtk-switch.c b/plugins/gtk+/glade-gtk-switch.c
new file mode 100644
index 00000000..5dba4436
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-switch.c
@@ -0,0 +1,71 @@
+/*
+ * glade-gtk-switch.c
+ *
+ * Copyright (C) 2011 Juan Pablo Ugarte.
+ *
+ * Author:
+ *   Juan Pablo Ugarte <juanpablougarte@gmail.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-gtk-activatable.h"
+#include "glade-activatable-editor.h"
+
+GladeEditable *
+glade_gtk_switch_create_editable (GladeWidgetAdaptor *adaptor,
+                                  GladeEditorPageType type)
+{
+  GladeEditable *editable;
+
+  /* Get base editable */
+  editable = GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type);
+
+  if (type == GLADE_PAGE_GENERAL)
+    return (GladeEditable *) glade_activatable_editor_new (adaptor, editable);
+
+  return editable;
+}
+
+void
+glade_gtk_switch_post_create (GladeWidgetAdaptor *adaptor,
+                              GObject *widget,
+                              GladeCreateReason reason)
+{
+  GladeWidget *gwidget;
+  
+  if (reason != GLADE_CREATE_LOAD) return;
+
+  g_return_if_fail (GTK_IS_SWITCH (widget));
+  gwidget = glade_widget_get_from_gobject (widget);
+  g_return_if_fail (GLADE_IS_WIDGET (gwidget));
+
+  g_signal_connect (glade_widget_get_project (gwidget), "parse-finished",
+                    G_CALLBACK (glade_gtk_activatable_parse_finished),
+                    gwidget);
+}
+
+void
+glade_gtk_switch_set_property (GladeWidgetAdaptor *adaptor,
+                               GObject *object,
+                               const gchar *id,
+                               const GValue *value)
+{
+  glade_gtk_activatable_evaluate_property_sensitivity (object, id, value);
+
+  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
+}
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 43253f7e..96a55b40 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -24,6 +24,7 @@
 
 #include <config.h>
 
+#include "glade-gtk.h"
 #include "glade-accels.h"
 #include "glade-attributes.h"
 #include "glade-column-types.h"
@@ -39,6 +40,7 @@
 #include "glade-cell-renderer-editor.h"
 #include "glade-treeview-editor.h"
 #include "glade-entry-editor.h"
+#include "glade-gtk-activatable.h"
 #include "glade-activatable-editor.h"
 #include "glade-tool-item-group-editor.h"
 #include "glade-string-list.h"
@@ -51,21 +53,9 @@
 
 
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <stdlib.h>
 
-/* --------------------------------- Constants ------------------------------ */
-#define FIXED_DEFAULT_CHILD_WIDTH  100
-#define FIXED_DEFAULT_CHILD_HEIGHT 60
-
-#define MNEMONIC_INSENSITIVE_MSG   _("This property does not apply unless Use Underline is set.")
-#define NOT_SELECTED_MSG           _("Property not selected")
-#define RESPID_INSENSITIVE_MSG     _("This property is only for use in dialog action buttons")
-#define ACTION_APPEARANCE_MSG      _("This property is set to be controlled by an Action")
-
-#define ONLY_THIS_GOES_IN_THAT_MSG _("Only objects of type %s can be added to objects of type %s.")
-
 /* -------------------------------- ParamSpecs ------------------------------ */
 
 /* Fake GtkImage::icon-size since its an int pspec in the image */
@@ -4262,102 +4252,6 @@ glade_gtk_color_button_set_property (GladeWidgetAdaptor * adaptor,
     GWA_GET_CLASS (GTK_TYPE_BUTTON)->set_property (adaptor, object, id, value);
 }
 
-
-/* ----------------------------- GtkActivatable ------------------------------ */
-static void
-activatable_parse_finished (GladeProject *project, 
-			    GladeWidget  *widget)
-{
-	GObject *related_action = NULL;
-
-	glade_widget_property_get (widget, "related-action", &related_action);
-	if (related_action == NULL)
-		glade_widget_property_set (widget, "use-action-appearance", FALSE);
-}
-
-static void
-evaluate_activatable_property_sensitivity (GObject * object,
-                                           const gchar * id,
-                                           const GValue * value)
-{
-  GladeWidget *gwidget = glade_widget_get_from_gobject (object);
-
-  if (!strcmp (id, "related-action"))
-    {
-      GtkAction *action = g_value_get_object (value);
-      
-      if (action)
-        {
-          glade_widget_property_set_sensitive (gwidget, "visible", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "sensitive", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-
-          glade_widget_property_set_sensitive (gwidget, "accel-group", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-        }
-      else
-        {
-          glade_widget_property_set_sensitive (gwidget, "visible", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "sensitive", TRUE,
-                                               NULL);
-
-          glade_widget_property_set_sensitive (gwidget, "accel-group", TRUE,
-                                               NULL);
-        }
-
-    }
-  else if (!strcmp (id, "use-action-appearance"))
-    {
-      gboolean use_appearance = g_value_get_boolean (value);
-
-
-      if (use_appearance)
-        {
-          glade_widget_property_set_sensitive (gwidget, "label", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "use-underline", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "stock", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          //glade_widget_property_set_sensitive (gwidget, "use-stock", FALSE, ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "image", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "custom-child", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "stock-id", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "label-widget", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "icon-name", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "icon-widget", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-          glade_widget_property_set_sensitive (gwidget, "icon", FALSE,
-                                               ACTION_APPEARANCE_MSG);
-        }
-      else
-        {
-          glade_widget_property_set_sensitive (gwidget, "label", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "use-underline", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "stock", TRUE, NULL);
-          //glade_widget_property_set_sensitive (gwidget, "use-stock", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "image", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "custom-child", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "stock-id", TRUE, NULL);
-          glade_widget_property_set_sensitive (gwidget, "label-widget", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "icon-name", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "icon-widget", TRUE,
-                                               NULL);
-          glade_widget_property_set_sensitive (gwidget, "icon", TRUE, NULL);
-        }
-    }
-}
-
 /* ----------------------------- GtkButton ------------------------------ */
 static void 
 sync_use_appearance (GladeWidget *gwidget)
@@ -4439,7 +4333,7 @@ glade_gtk_button_post_create (GladeWidgetAdaptor * adaptor,
 
   if (reason == GLADE_CREATE_LOAD)
     g_signal_connect (glade_widget_get_project (gbutton), "parse-finished",
-		      G_CALLBACK (activatable_parse_finished),
+		      G_CALLBACK (glade_gtk_activatable_parse_finished),
 		      gbutton);
   else if (reason == GLADE_CREATE_USER)
     glade_gtk_button_update_stock (gbutton);
@@ -4453,7 +4347,7 @@ glade_gtk_button_set_property (GladeWidgetAdaptor * adaptor,
   GladeWidget *widget = glade_widget_get_from_gobject (object);
   GladeProperty *property = glade_widget_get_property (widget, id);
 
-  evaluate_activatable_property_sensitivity (object, id, value);
+  glade_gtk_activatable_evaluate_property_sensitivity (object, id, value);
 
   if (strcmp (id, "custom-child") == 0)
     {
@@ -4784,7 +4678,7 @@ glade_gtk_recent_chooser_menu_set_property (GladeWidgetAdaptor * adaptor,
   GladeWidget *widget = glade_widget_get_from_gobject (object);
   GladeProperty *property = glade_widget_get_property (widget, id);
 
-  evaluate_activatable_property_sensitivity (object, id, value);
+  glade_gtk_activatable_evaluate_property_sensitivity (object, id, value);
 
   if (GPC_VERSION_CHECK (glade_property_get_class (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_MENU)->set_property (adaptor, object, id, value);
@@ -5474,7 +5368,7 @@ glade_gtk_menu_item_post_create (GladeWidgetAdaptor * adaptor,
 
   if (reason == GLADE_CREATE_LOAD)
     g_signal_connect (G_OBJECT (glade_widget_get_project (gitem)), "parse-finished",
-		      G_CALLBACK (activatable_parse_finished),
+		      G_CALLBACK (glade_gtk_activatable_parse_finished),
 		      gitem);
 }
 
@@ -5597,7 +5491,7 @@ glade_gtk_menu_item_set_property (GladeWidgetAdaptor * adaptor,
   GladeWidget *gwidget = glade_widget_get_from_gobject (object);
   GladeProperty *property = glade_widget_get_property (gwidget, id);
 
-  evaluate_activatable_property_sensitivity (object, id, value);
+  glade_gtk_activatable_evaluate_property_sensitivity (object, id, value);
 
   if (!strcmp (id, "use-underline"))
     glade_gtk_menu_item_set_use_underline (object, value);
@@ -6591,7 +6485,7 @@ glade_gtk_tool_item_post_create (GladeWidgetAdaptor *adaptor,
 
   if (reason == GLADE_CREATE_LOAD)
     g_signal_connect (G_OBJECT (glade_widget_get_project (gitem)), "parse-finished",
-		      G_CALLBACK (activatable_parse_finished),
+		      G_CALLBACK (glade_gtk_activatable_parse_finished),
 		      gitem);
 }
 
@@ -6603,7 +6497,7 @@ glade_gtk_tool_item_set_property (GladeWidgetAdaptor * adaptor,
   GladeWidget *gwidget = glade_widget_get_from_gobject (object);
   GladeProperty *property = glade_widget_get_property (gwidget, id);
 
-  evaluate_activatable_property_sensitivity (object, id, value);
+  glade_gtk_activatable_evaluate_property_sensitivity (object, id, value);
   if (GPC_VERSION_CHECK
       (glade_property_get_class (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
diff --git a/plugins/gtk+/glade-gtk.h b/plugins/gtk+/glade-gtk.h
index d37496a8..0373f042 100644
--- a/plugins/gtk+/glade-gtk.h
+++ b/plugins/gtk+/glade-gtk.h
@@ -25,6 +25,8 @@
 #ifndef __GLADE_GTK_H__
 #define __GLADE_GTK_H__
 
+#include <glib/gi18n-lib.h>
+
 G_BEGIN_DECLS
 
 /* --------------------------------- Constants ------------------------------ */
@@ -41,4 +43,4 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-#endif __GLADE_GTK_H__
+#endif /* __GLADE_GTK_H__ */
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index cdeb8838..9f569de2 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1079,6 +1079,22 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
+    <glade-widget-class name="GtkSwitch" generic-name="switch" _title="Switch">
+      <post-create-function>glade_gtk_switch_post_create</post-create-function>
+      <set-property-function>glade_gtk_switch_set_property</set-property-function>
+      <create-editable-function>glade_gtk_switch_create_editable</create-editable-function>
+      <properties>
+        <!-- GtkActivatable -->
+        <property id="related-action" _name="Related Action" custom-layout="True">
+      	  <parameter-spec>
+	    <type>GParamObject</type>
+	    <value-type>GtkToggleAction</value-type>
+          </parameter-spec>
+        </property>
+        <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" default="False"></property>
+      </properties>
+    </glade-widget-class>
+
     <glade-widget-class name="GtkFileChooserButton" generic-name="filechooserbutton" _title="File Chooser Button">
       <set-property-function>glade_gtk_file_chooser_button_set_property</set-property-function>
 
@@ -2051,7 +2067,7 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkAction" generic-name="action" _title="Action">
+    <glade-widget-class name="GtkAction" generic-name="action" _title="Action" toplevel="True"  use-placeholders="False">
       <post-create-function>glade_gtk_action_post_create</post-create-function>
       <create-editor-property-function>glade_gtk_widget_create_eprop</create-editor-property-function>
       <string-from-value-function>glade_gtk_widget_string_from_value</string-from-value-function>
@@ -2086,7 +2102,7 @@ embedded in another object</_tooltip>
     <glade-widget-class name="GtkRadioAction" generic-name="radioaction" _title="Radio Action"></glade-widget-class>
     <glade-widget-class name="GtkRecentAction" generic-name="recentaction" _title="Recent Action" since="2.12"></glade-widget-class>
 
-    <glade-widget-class name="GtkActionGroup" generic-name="actiongroup" _title="Action Group" toplevel="True" use-placeholders="False">
+    <glade-widget-class name="GtkActionGroup" generic-name="actiongroup" _title="Action Group">
       <add-child-verify-function>glade_gtk_action_group_add_verify</add-child-verify-function>
       <add-child-function>glade_gtk_action_group_add_child</add-child-function>
       <remove-child-function>glade_gtk_action_group_remove_child</remove-child-function>
@@ -3696,6 +3712,7 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkToggleButton"></glade-widget-class-ref>
     <glade-widget-class-ref name="GtkCheckButton"></glade-widget-class-ref>
     <glade-widget-class-ref name="GtkRadioButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkSwitch"></glade-widget-class-ref>
 
     <glade-widget-class-ref name="GtkEntry"></glade-widget-class-ref>
     <glade-widget-class-ref name="GtkSpinButton"></glade-widget-class-ref>
diff --git a/plugins/gtk+/icons/16x16/Makefile.am b/plugins/gtk+/icons/16x16/Makefile.am
index 0434c5df..d91bfc34 100644
--- a/plugins/gtk+/icons/16x16/Makefile.am
+++ b/plugins/gtk+/icons/16x16/Makefile.am
@@ -104,6 +104,7 @@ icons_DATA = \
 	widget-gtk-texttagtable.png \
         widget-gtk-textview.png \
         widget-gtk-togglebutton.png \
+        widget-gtk-switch.png \
         widget-gtk-toggletoolbutton.png \
         widget-gtk-toolbar.png \
         widget-gtk-toolbutton.png \
diff --git a/plugins/gtk+/icons/22x22/Makefile.am b/plugins/gtk+/icons/22x22/Makefile.am
index 9eab9482..d8fbeffd 100644
--- a/plugins/gtk+/icons/22x22/Makefile.am
+++ b/plugins/gtk+/icons/22x22/Makefile.am
@@ -104,6 +104,7 @@ icons_DATA = \
 	widget-gtk-texttagtable.png \
         widget-gtk-textview.png \
         widget-gtk-togglebutton.png \
+	widget-gtk-switch.png \
         widget-gtk-toggletoolbutton.png \
         widget-gtk-toolbar.png \
         widget-gtk-toolbutton.png \