Commit d34b7c1a authored by Tristan Van Berkom's avatar Tristan Van Berkom
Browse files

Fixing action editor to disallow actions children of actions.

Conflicts:

	plugins/gtk+/glade-gtk.c
parent bd16621d
......@@ -11032,8 +11032,6 @@ glade_gtk_action_child_selected (GladeBaseEditor *editor,
GladeWidget *gchild,
gpointer data)
{
GObject *child = glade_widget_get_object (gchild);
glade_base_editor_add_label (editor, _("Action"));
glade_base_editor_add_default_properties (editor, gchild);
......@@ -11042,6 +11040,15 @@ glade_gtk_action_child_selected (GladeBaseEditor *editor,
glade_base_editor_add_editable (editor, gchild, GLADE_PAGE_GENERAL);
}
static gboolean
glade_gtk_action_move_child (GladeBaseEditor *editor,
GladeWidget *gparent,
GladeWidget *gchild,
gpointer data)
{
return FALSE;
}
static void
glade_gtk_action_launch_editor (GObject *action)
{
......@@ -11064,6 +11071,7 @@ glade_gtk_action_launch_editor (GObject *action)
NULL);
g_signal_connect (editor, "child-selected", G_CALLBACK (glade_gtk_action_child_selected), NULL);
g_signal_connect (editor, "move-child", G_CALLBACK (glade_gtk_action_move_child), NULL);
gtk_widget_show (GTK_WIDGET (editor));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment