Updating branch refs/heads/xfce-4.6
         to 5946a9e1ce71f6df323e9d26eca4240027fe4d9d (commit)
       from 535f03897af01a45d866d9ca5ad11934b6f4cab4 (commit)

commit 5946a9e1ce71f6df323e9d26eca4240027fe4d9d
Author: Jannis Pohlmann <jan...@xfce.org>
Date:   Sun Oct 18 15:21:57 2009 +0200

    Properly propagate the focus-in-event of the search entry (bug #5883).
    
    Reported, identified and patch provided by Jérôme Guelfucci.

 src/xfce-appfinder-window.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/xfce-appfinder-window.c b/src/xfce-appfinder-window.c
index d7acc5a..0e9293b 100644
--- a/src/xfce-appfinder-window.c
+++ b/src/xfce-appfinder-window.c
@@ -85,7 +85,7 @@ static void       _xfce_appfinder_window_entry_changed     
(GtkEditable
                                                             
XfceAppfinderWindow      *window);
 static void       _xfce_appfinder_window_entry_activated   (GtkEntry           
      *entry,
                                                             
XfceAppfinderWindow      *window);
-static void       _xfce_appfinder_window_entry_focused     (GtkWidget          
      *entry,
+static gboolean   _xfce_appfinder_window_entry_focused     (GtkWidget          
      *entry,
                                                             GdkEventFocus      
      *event,
                                                             
XfceAppfinderWindow      *window);
 static gboolean   _xfce_appfinder_window_entry_key_pressed (GtkWidget          
      *widget,
@@ -562,14 +562,14 @@ _xfce_appfinder_window_entry_activated (GtkEntry          
  *entry,
 
 
 
-static void
+static gboolean
 _xfce_appfinder_window_entry_focused (GtkWidget           *entry,
                                       GdkEventFocus       *event,
                                       XfceAppfinderWindow *window)
 {
   GtkTreeSelection *selection;
 
-  g_return_if_fail (XFCE_IS_APPFINDER_WINDOW (window));
+  g_return_val_if_fail (XFCE_IS_APPFINDER_WINDOW (window), FALSE);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (window->tree_view));
 
@@ -577,6 +577,8 @@ _xfce_appfinder_window_entry_focused (GtkWidget           
*entry,
     gtk_tree_selection_unselect_all (selection);
 
   gtk_widget_set_sensitive (window->execute_button, FALSE);
+
+  return FALSE;
 }
 
 
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to