[maemo-commits] [maemo-commits] r12896 - in projects/haf/tags/hildon-desktop: . 0.0.24.1-1 0.0.24.1-1/debian 0.0.24.1-1/src

[From: subversion at stage.maemo.org]

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

Added:
   projects/haf/tags/hildon-desktop/0.0.24.1-1/
Modified:
   projects/haf/tags/hildon-desktop/0.0.24.1-1/ChangeLog
   projects/haf/tags/hildon-desktop/0.0.24.1-1/configure.ac
   projects/haf/tags/hildon-desktop/0.0.24.1-1/debian/changelog
   projects/haf/tags/hildon-desktop/0.0.24.1-1/src/hd-plugin-loader-legacy.c
Log:
  Tagged emergency 0.0.24.1-1


Copied: projects/haf/tags/hildon-desktop/0.0.24.1-1 (from rev 12895, projects/haf/tags/hildon-desktop/0.0.24-1)

Modified: projects/haf/tags/hildon-desktop/0.0.24.1-1/ChangeLog
===================================================================
--- projects/haf/tags/hildon-desktop/0.0.24-1/ChangeLog	2007-07-30 11:22:35 UTC (rev 12895)
+++ projects/haf/tags/hildon-desktop/0.0.24.1-1/ChangeLog	2007-07-30 11:40:35 UTC (rev 12896)
@@ -1,3 +1,11 @@
+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
+	* configure.ac: 0.0.24.1
+
 2007-07-17  Moises Martinez  <moises.martinez at nokia.com>
 
 	* configure.ac: 0.0.24

Modified: projects/haf/tags/hildon-desktop/0.0.24.1-1/configure.ac
===================================================================
--- projects/haf/tags/hildon-desktop/0.0.24-1/configure.ac	2007-07-30 11:22:35 UTC (rev 12895)
+++ projects/haf/tags/hildon-desktop/0.0.24.1-1/configure.ac	2007-07-30 11:40:35 UTC (rev 12896)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 0.0.24)
+AM_INIT_AUTOMAKE(hildon-desktop, 0.0.24.1)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/tags/hildon-desktop/0.0.24.1-1/debian/changelog
===================================================================
--- projects/haf/tags/hildon-desktop/0.0.24-1/debian/changelog	2007-07-30 11:22:35 UTC (rev 12895)
+++ projects/haf/tags/hildon-desktop/0.0.24.1-1/debian/changelog	2007-07-30 11:40:35 UTC (rev 12896)
@@ -1,3 +1,12 @@
+hildon-desktop (1:0.0.24.1-1) sardine; urgency=low
+
+  * src/hd-plugin-loader-legacy.c:
+  - added safegard against uninitialized widget in statusbar plugin
+  initialization.
+  Fixes: NB#64509
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Mon, 30 Jul 2007 14:31:32 +0300
+
 hildon-desktop (1:0.0.24-1) sardine; urgency=low
 
   * libhildonwm/hd-keys.c: (hd_keys_action_power):

Modified: projects/haf/tags/hildon-desktop/0.0.24.1-1/src/hd-plugin-loader-legacy.c
===================================================================
--- projects/haf/tags/hildon-desktop/0.0.24-1/src/hd-plugin-loader-legacy.c	2007-07-30 11:22:35 UTC (rev 12895)
+++ projects/haf/tags/hildon-desktop/0.0.24.1-1/src/hd-plugin-loader-legacy.c	2007-07-30 11:40:35 UTC (rev 12896)
@@ -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);