[maemo-commits] [maemo-commits] r14719 - in projects/haf/branches/hildon-control-panel/refactoring: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-11-07 13:02:12 +0200 (Wed, 07 Nov 2007)
New Revision: 14719

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2007-10-07  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-window.c (hcp_window_app_list_updated_cb): do not try to
	focus previously selected item in case this is undefined. 
	Fixes: NB#74138.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-11-07 10:56:40 UTC (rev 14718)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-11-07 11:02:12 UTC (rev 14719)
@@ -1,3 +1,9 @@
+2007-10-07  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hcp-window.c (hcp_window_app_list_updated_cb): do not try to
+	focus previously selected item in case this is undefined. 
+	Fixes: NB#74138.
+
 2007-10-01  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hcp-app-view.c (hcp_app_view_selection_changed_cb): emit

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-11-07 10:56:40 UTC (rev 14718)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-11-07 11:02:12 UTC (rev 14719)
@@ -666,6 +666,14 @@
 
   priv = window->priv;
 
+  /* Update the view */
+  hcp_app_view_populate (HCP_APP_VIEW (priv->view), al);
+
+  gtk_widget_show_all (priv->view);
+
+  if (priv->focused_item == NULL)
+    return;
+	  
   g_object_get (G_OBJECT (priv->focused_item),
                 "plugin", &focused,
                 NULL);
@@ -677,11 +685,6 @@
                 "apps", &apps,
                 NULL);
 
-  /* Update the view */
-  hcp_app_view_populate (HCP_APP_VIEW (priv->view), al);
-
-  gtk_widget_show_all (priv->view);
-
   app = g_hash_table_lookup (apps,
                              focused);