[geany/geany-plugins] ef88e5: Merge branch 'b4n-commander'

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Wed, 07 Dec 2016 19:27:42 UTC
Commit:      ef88e561450fa543bba52c769376c53ea2a2020e
             https://github.com/geany/geany-plugins/commit/ef88e561450fa543bba52c769376c53ea2a2020e

Log Message:
-----------
Merge branch 'b4n-commander'


Modified Paths:
--------------
    commander/src/commander-plugin.c

Modified: commander/src/commander-plugin.c
10 lines changed, 6 insertions(+), 4 deletions(-)
===================================================================
@@ -682,10 +682,6 @@ create_panel (void)
   gtk_container_add (GTK_CONTAINER (frame), box);
   
   plugin_data.entry = gtk_entry_new ();
-  g_signal_connect (plugin_data.entry, "notify::text",
-                    G_CALLBACK (on_entry_text_notify), NULL);
-  g_signal_connect (plugin_data.entry, "activate",
-                    G_CALLBACK (on_entry_activate), NULL);
   gtk_box_pack_start (GTK_BOX (box), plugin_data.entry, FALSE, TRUE, 0);
   
   plugin_data.store = gtk_list_store_new (COL_COUNT,
@@ -726,6 +722,12 @@ create_panel (void)
                     G_CALLBACK (on_view_row_activated), NULL);
   gtk_container_add (GTK_CONTAINER (scroll), plugin_data.view);
   
+  /* connect entry signals after the view is created as they use it */
+  g_signal_connect (plugin_data.entry, "notify::text",
+                    G_CALLBACK (on_entry_text_notify), NULL);
+  g_signal_connect (plugin_data.entry, "activate",
+                    G_CALLBACK (on_entry_activate), NULL);
+  
   gtk_widget_show_all (frame);
 }
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).