[maemo-commits] [maemo-commits] r12895 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-07-30 14:22:35 +0300 (Mon, 30 Jul 2007)
New Revision: 12895

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c
Log:

2007-07-30  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-plugin-loader-legacy.c:
	- added safegard against uninitialized widget in statusbar plugin
	initialization.
	Fixes: NB#64509



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-30 07:16:01 UTC (rev 12894)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-30 11:22:35 UTC (rev 12895)
@@ -1,3 +1,10 @@
+2007-07-30  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-plugin-loader-legacy.c:
+	- added safegard against uninitialized widget in statusbar plugin
+	initialization.
+	Fixes: NB#64509
+
 2007-07-27  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 0.0.26

Modified: projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c	2007-07-30 07:16:01 UTC (rev 12894)
+++ projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c	2007-07-30 11:22:35 UTC (rev 12895)
@@ -434,7 +434,7 @@
                                                   &state_data_length,
                                                   &module_widget);
 
-  if (!module_widget || !GTK_IS_WIDGET (module_widget))
+  if (!GTK_IS_WIDGET (module_widget))
   {
     g_set_error (error,
                  hd_plugin_loader_error_quark (),
@@ -556,7 +556,7 @@
 
   module_widget = ((NavigatorGetButtonFn)symbol) (priv->module_data);
   
-  if (!module_widget || !GTK_IS_WIDGET (module_widget))
+  if (!GTK_IS_WIDGET (module_widget))
   {
     g_set_error (error,
                  hd_plugin_loader_error_quark (),
@@ -644,7 +644,7 @@
   GKeyFile         *keyfile;
   struct SBSymbols symbols = {0};
   gpointer          module_data;
-  GtkWidget        *module_widget;
+  GtkWidget        *module_widget = NULL;
   GError           *local_error = NULL;
   
   priv = HD_PLUGIN_LOADER_LEGACY_GET_PRIVATE (loader);
@@ -711,7 +711,7 @@
 
   module_data = symbols.initialize (item, &module_widget);
 
-  if (module_widget)
+  if (GTK_IS_WIDGET (module_widget))
     {
       gtk_widget_show_all (module_widget);
       gtk_container_add (GTK_CONTAINER (item), module_widget);