[maemo-commits] [maemo-commits] r12336 - in projects/haf/trunk/hildon-desktop: . libhildonwm

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-18 18:32:23 +0300 (Mon, 18 Jun 2007)
New Revision: 12336

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c
Log:

2007-06-18  Johan Bilien  <johan.bilien at nokia.com>

	* libhildonwm/hd-keys.c: Added a few safeguard when retrieving
	the active application. Fixes: NB#60495



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-18 15:27:27 UTC (rev 12335)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-18 15:32:23 UTC (rev 12336)
@@ -1,3 +1,8 @@
+2007-06-18  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildonwm/hd-keys.c: Added a few safeguard when retrieving
+	the active application. Fixes: NB#60495
+
 2007-06-18  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu.c: fixed handling of separators: only add

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c	2007-06-18 15:27:27 UTC (rev 12335)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c	2007-06-18 15:32:23 UTC (rev 12336)
@@ -122,16 +122,20 @@
     g_warning ("No active window set");
 }
 
-static void 
+static void
 hd_keys_action_application_close (HDKeysConfig *keys,
 				  gpointer     *user_data)
 {
-  HDWM *hdwm = hd_wm_get_singleton (); 
-	
-  HDWMWatchableApp *app = 
-    hd_wm_watched_window_get_app (hd_wm_get_active_window ());
+  HDWM *hdwm = hd_wm_get_singleton ();
+  HDWMWatchedWindow *window = hd_wm_get_active_window ();
 
-  hd_wm_close_application (hdwm, hd_wm_watchable_app_get_info (app));
+  if (window)
+  {
+    HDWMWatchableApp *app = hd_wm_watched_window_get_app (window);
+
+    if (app)
+      hd_wm_close_application (hdwm, hd_wm_watchable_app_get_info (app));
+  }
 }
 
 static void