[anjuta] am-project: bgo #681051 - Folder properties dialog can't be close with ESC

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 835951885ec6fcb9360a06c22c365d73edd3ac97
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Mon Oct 15 21:29:30 2012 +0200

    am-project: bgo #681051 - Folder properties dialog can't be close with ESC

 libanjuta/anjuta-tree-combo.c         |   17 ++++++++--
 plugins/project-manager/pm_dialogs.ui |   56 +++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)
---
diff --git a/libanjuta/anjuta-tree-combo.c b/libanjuta/anjuta-tree-combo.c
index a8dcea3..fd1a303 100644
--- a/libanjuta/anjuta-tree-combo.c
+++ b/libanjuta/anjuta-tree-combo.c
@@ -289,6 +289,8 @@ static void
 anjuta_tree_combo_box_popup (AnjutaTreeComboBox *combo)
 {
 	GdkDevice *device;
+	GtkWidgetClass *widget_class;
+	GtkBindingSet *binding_set;
 
 	device = gtk_get_current_event_device ();
 
@@ -306,17 +308,28 @@ anjuta_tree_combo_box_popup (AnjutaTreeComboBox *combo)
 		device = devices->data;
 		g_list_free (devices);
 	}
-
+	
 	anjuta_tree_combo_box_popup_for_device (combo, device);
+
+	widget_class = GTK_WIDGET_GET_CLASS(combo);
+	binding_set = gtk_binding_set_by_class (widget_class);
+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
+	                              "popdown", 0);
 }
 
 static void
 anjuta_tree_combo_box_popdown (AnjutaTreeComboBox *combo)
 {
 	AnjutaTreeComboBoxPrivate *priv = combo->priv;
+	GtkWidgetClass *widget_class;
+	GtkBindingSet *binding_set;
 
 	g_return_if_fail (ANJUTA_IS_TREE_COMBO_BOX (combo));
 
+	widget_class = GTK_WIDGET_GET_CLASS(combo);
+	binding_set = gtk_binding_set_by_class (widget_class);
+	gtk_binding_entry_remove (binding_set, GDK_KEY_Escape, 0);
+	
 	if (!gtk_widget_get_realized (GTK_WIDGET (combo)))
 		return;
 
@@ -1209,8 +1222,6 @@ anjuta_tree_combo_box_class_init (AnjutaTreeComboBoxClass * class)
 	                              "popdown", 0);
 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, GDK_MOD1_MASK,
 	                              "popdown", 0);
-	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
-	                              "popdown", 0);
 
 	g_type_class_add_private (class, sizeof (AnjutaTreeComboBoxPrivate));
 }
diff --git a/plugins/project-manager/pm_dialogs.ui b/plugins/project-manager/pm_dialogs.ui
index 59e907c..208dc29 100644
--- a/plugins/project-manager/pm_dialogs.ui
+++ b/plugins/project-manager/pm_dialogs.ui
@@ -1197,6 +1197,8 @@
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox9">
         <property name="can_focus">False</property>
@@ -1248,6 +1250,24 @@
                 <child>
                   <placeholder/>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1294,6 +1314,24 @@
                             <child>
                               <placeholder/>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1332,6 +1370,24 @@
                                 <child>
                                   <placeholder/>
                                 </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                             </child>
                             <child type="label">