[gdm: 9/70] Don't raise null windows.



commit b55b163bfab0738f2f9812a8cc3dfb31a513ed07
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Jan 15 00:47:15 2009 +0000

    Don't raise null windows.
    
    2009-01-14  William Jon McCann  <jmccann redhat com>
    
    	* gui/user-switch-applet/gdm-entry-menu-item.c
    	(gdm_entry_menu_item_button_press), (on_entry_show):
    	Don't raise null windows.
    
    
    svn path=/trunk/; revision=6664
---
 ChangeLog                                    |    6 ++++++
 gui/user-switch-applet/gdm-entry-menu-item.c |    8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5f8a93..6156b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-01-14  William Jon McCann  <jmccann redhat com>
 
+	* gui/user-switch-applet/gdm-entry-menu-item.c
+	(gdm_entry_menu_item_button_press), (on_entry_show):
+	Don't raise null windows.
+
+2009-01-14  William Jon McCann  <jmccann redhat com>
+
 	* gui/user-switch-applet/applet.c (gdm_applet_data_free),
 	(save_status), (on_status_available_activate),
 	(on_status_busy_activate), (on_status_invisible_activate),
diff --git a/gui/user-switch-applet/gdm-entry-menu-item.c b/gui/user-switch-applet/gdm-entry-menu-item.c
index 7535088..7a87a5a 100644
--- a/gui/user-switch-applet/gdm-entry-menu-item.c
+++ b/gui/user-switch-applet/gdm-entry-menu-item.c
@@ -136,7 +136,9 @@ gdm_entry_menu_item_button_press (GtkWidget      *widget,
 
         entry = GDM_ENTRY_MENU_ITEM (widget)->entry;
 
-        gdk_window_raise (entry->window);
+        if (entry->window != NULL) {
+                gdk_window_raise (entry->window);
+        }
 
         if (!GTK_WIDGET_HAS_FOCUS (entry)) {
                 gtk_widget_grab_focus (entry);
@@ -199,7 +201,9 @@ static void
 on_entry_show (GtkWidget        *widget,
                GdmEntryMenuItem *item)
 {
-        gdk_window_raise (widget->window);
+        if (widget->window != NULL) {
+                gdk_window_raise (widget->window);
+        }
         send_focus_change (widget, TRUE);
 }
 



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