[glade3] Fixing action editor to disallow actions children of actions.



commit d34b7c1ad4795579a3a2db4c79e7e1046e016292
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Dec 30 23:50:49 2010 +0900

    Fixing action editor to disallow actions children of actions.
    
    Conflicts:
    
    	plugins/gtk+/glade-gtk.c

 plugins/gtk+/glade-gtk.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 6d94249..f6c3157 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -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));
 	



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]