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

[From: subversion at stage.maemo.org]

Author: klattimer
Date: 2008-06-06 15:40:01 +0300 (Fri, 06 Jun 2008)
New Revision: 15633

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:
2008-06-06  Karl Lattimer <karl.lattimer at nokia.com>
       * src/hd-applications-menu.c: Applied patch to ensure that memory is
       free in case of a return value of TRUE in
       hd_applications_menu_has_focus NB#86282
`       * configure.ac 2.0.18



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-06-05 12:15:43 UTC (rev 15632)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-06-06 12:40:01 UTC (rev 15633)
@@ -1,3 +1,9 @@
+2008-06-06  Karl Lattimer <karl.lattimer at nokia.com>
+	* src/hd-applications-menu.c: Applied patch to ensure that memory is
+	free in case of a return value of TRUE in
+	hd_applications_menu_has_focus NB#86282
+	* configure.ac 2.0.18
+
 2008-05-19  Karl Lattimer <karl.lattimer at nokia.com>
 	* libhildondesktop/hildon-desktop-popup-window.c: Reversed patch provided by
 	adrian bunk regarding bug NB#78610 others menu not closing when cursor is

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2008-06-05 12:15:43 UTC (rev 15632)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-06-06 12:40:01 UTC (rev 15633)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.17)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.18)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2008-06-05 12:15:43 UTC (rev 15632)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2008-06-06 12:40:01 UTC (rev 15633)
@@ -1,3 +1,12 @@
+hildon-desktop (1:2.0.18-1) sardine; urgency=low
+
+  * src/hd-applications-menu.c: Applied patch to ensure that memory is
+    free in case of a return value of TRUE in
+    hd_applications_menu_has_focus NB#86282
+  * configure.ac 2.0.18
+
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Fri, 6 Jun 2008 12:22:00 +0300
+
 hildon-desktop (1:2.0.17-1) sardine; urgency=low
 
   * libhildondesktop/hildon-desktop-popup-window.c: Reversed patch provided by
@@ -170,7 +179,7 @@
 
  -- Johan Bilien <johan.bilien at nokia.com>  Tue, 18 Dec 2007 17:33:17 +0200
 
-hildon-desktop (1:2.0.6-1) sardine; urgency=low
+hildon-desktop (1:2.0.6-1) sardine; urgency=low 
 
   * libhildonwm/hd-keys.c: check if a fn + keycode gives keysym,
   but also if keycode only does not give keysym.

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2008-06-05 12:15:43 UTC (rev 15632)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2008-06-06 12:40:01 UTC (rev 15633)
@@ -243,6 +243,7 @@
 hd_applications_menu_has_focus (HildonDesktopPopupMenu *menu)
 {
   GList *items, *i;
+  gboolean rv = FALSE;
 
   items = hildon_desktop_popup_menu_get_children (menu);
 
@@ -250,13 +251,15 @@
   {
     GtkWidget *item = (GtkWidget *) i->data;
 
-    if (gtk_widget_is_focus (item))
-      return TRUE;
+    if (gtk_widget_is_focus (item)) {
+      rv = TRUE;
+      break;
+    }
   }
 
   g_list_free (items);
   
-  return FALSE;
+  return rv;
 }
 
 static void