[maemo-commits] [maemo-commits] r14945 - in projects/haf/trunk/hail: . debian hail/hail-hildon-desktop

[From: subversion at stage.maemo.org]

Author: atdomoko
Date: 2007-12-11 14:59:19 +0200 (Tue, 11 Dec 2007)
New Revision: 14945

Modified:
   projects/haf/trunk/hail/ChangeLog
   projects/haf/trunk/hail/debian/changelog
   projects/haf/trunk/hail/hail/hail-hildon-desktop/hailtogglebutton.c
Log:
applied patch from NB#70723



Modified: projects/haf/trunk/hail/ChangeLog
===================================================================
--- projects/haf/trunk/hail/ChangeLog	2007-12-11 09:52:57 UTC (rev 14944)
+++ projects/haf/trunk/hail/ChangeLog	2007-12-11 12:59:19 UTC (rev 14945)
@@ -1,3 +1,11 @@
+2007-12-11 Attila Domokos <attila.domokos at nokia.com>
+
+	* hail/hildon-desktop/hailtogglebutton.c
+	(hail_toggle_button_get_name): added a check to avoid a crash if
+	there is no toggle_button available
+
+	Fixes NB#70723, NB#75169
+
 2007-11-07  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* configure.in:

Modified: projects/haf/trunk/hail/debian/changelog
===================================================================
--- projects/haf/trunk/hail/debian/changelog	2007-12-11 09:52:57 UTC (rev 14944)
+++ projects/haf/trunk/hail/debian/changelog	2007-12-11 12:59:19 UTC (rev 14945)
@@ -1,3 +1,11 @@
+hail (1.2.4-2) unstable; urgency=low
+
+  * patched hail/hildon-desktop/hildontogglebutton.c from bug 70723
+  * Fixes: NB#70723
+  * Fixes: NB#75169
+
+ -- Attila Domokos <attila.domokos at nokia.com>  Tue, 11 Dec 2007 14:36:00 +0200
+
 hail (1.2.4-1) unstable; urgency=low
 
   * Fixes: NB#73797

Modified: projects/haf/trunk/hail/hail/hail-hildon-desktop/hailtogglebutton.c
===================================================================
--- projects/haf/trunk/hail/hail/hail-hildon-desktop/hailtogglebutton.c	2007-12-11 09:52:57 UTC (rev 14944)
+++ projects/haf/trunk/hail/hail/hail-hildon-desktop/hailtogglebutton.c	2007-12-11 12:59:19 UTC (rev 14945)
@@ -213,7 +213,7 @@
   /* parent name */
   name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
 
-  if (name == NULL)
+  if ((name == NULL)&&(toggle_button != NULL))
     {
       /* concrete implementation for HNAppButton */
       if (g_type_is_a (G_TYPE_FROM_INSTANCE(toggle_button), hn_app_button_type))