[maemo-commits] [maemo-commits] r11920 - in projects/haf/trunk/hail: . hail/hail-hildon-desktop hail/hail-hildon-fm hail/hail-hildon-libs po ut

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon May 28 20:33:04 EEST 2007 
Author: fherrera
Date: 2007-05-28 20:33:02 +0300 (Mon, 28 May 2007)
New Revision: 11920

Modified:
   projects/haf/trunk/hail/ChangeLog
   projects/haf/trunk/hail/hail/hail-hildon-desktop/Makefile.am
   projects/haf/trunk/hail/hail/hail-hildon-desktop/hailhomewindow.c
   projects/haf/trunk/hail/hail/hail-hildon-fm/Makefile.am
   projects/haf/trunk/hail/hail/hail-hildon-libs/Makefile.am
   projects/haf/trunk/hail/po/POTFILES.in
   projects/haf/trunk/hail/ut/Makefile.am
Log:
        * hail/hail-hildon-desktop/Makefile.am:
        (hail_home_window_get_n_children), (hail_home_window_ref_child):
        * hail/hail-hildon-fm/Makefile.am:
        * hail/hail-hildon-libs/Makefile.am:
        * po/POTFILES.in:
        * ut/Makefile.am: Fix make distcheck. Notice that for running it under  
        sb you need:
        SBOX_REDIRECT_IGNORE=/usr/bin/pkg-config PKG_CONFIG=/usr/bin/pkg-config ./configure --enable-gtk-doc=yes
        SBOX_REDIRECT_IGNORE=/usr/bin/pkg-config PKG_CONFIG=/usr/bin/pkg-config make distcheck
        * hail/hail-hildon-desktop/hailhomewindow.c: Comment out some code
        because of API change in HildonHomeWindow. Need to be fixed as soon as
        the titlebar is exported as a property.



Modified: projects/haf/trunk/hail/ChangeLog
===================================================================
--- projects/haf/trunk/hail/ChangeLog	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/ChangeLog	2007-05-28 17:33:02 UTC (rev 11920)
@@ -1,3 +1,18 @@
+2007-05-28  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
+
+	* hail/hail-hildon-desktop/Makefile.am:
+	(hail_home_window_get_n_children), (hail_home_window_ref_child):
+	* hail/hail-hildon-fm/Makefile.am:
+	* hail/hail-hildon-libs/Makefile.am:
+	* po/POTFILES.in:
+	* ut/Makefile.am: Fix make distcheck. Notice that for running it under
+	sb you need:
+	SBOX_REDIRECT_IGNORE=/usr/bin/pkg-config PKG_CONFIG=/usr/bin/pkg-config ./configure --enable-gtk-doc=yes
+	SBOX_REDIRECT_IGNORE=/usr/bin/pkg-config PKG_CONFIG=/usr/bin/pkg-config make distcheck
+	* hail/hail-hildon-desktop/hailhomewindow.c: Comment out some code
+	because of API change in HildonHomeWindow. Need to be fixed as soon as
+	the titlebar is exported as a property.
+
 2007-04-25  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
 
 	* hail/hail-hildon-desktop/*:

Modified: projects/haf/trunk/hail/hail/hail-hildon-desktop/Makefile.am
===================================================================
--- projects/haf/trunk/hail/hail/hail-hildon-desktop/Makefile.am	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/hail/hail-hildon-desktop/Makefile.am	2007-05-28 17:33:02 UTC (rev 11920)
@@ -15,9 +15,7 @@
 	haildesktoppanelwindow.c		\
 	hailtogglebutton.c			\
 	hailhomearea.c				\
-	hailhometitlebar.c
-	
-libhail_hildondesktop_private_h_sources =	\
+	hailhometitlebar.c			\
 	hail-hildon-desktop.h			\
 	hailimagemenuitem.h			\
 	haildesktopitem.h			\

Modified: projects/haf/trunk/hail/hail/hail-hildon-desktop/hailhomewindow.c
===================================================================
--- projects/haf/trunk/hail/hail/hail-hildon-desktop/hailhomewindow.c	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/hail/hail-hildon-desktop/hailhomewindow.c	2007-05-28 17:33:02 UTC (rev 11920)
@@ -169,10 +169,14 @@
   /* any children from the parent */
   n_children = ATK_OBJECT_CLASS (parent_class)->get_n_children (obj);
 
+#if 0  /* FIXME: API Change on HildonHome */
   if (hildon_home_window_get_titlebar (HILDON_HOME_WINDOW (widget)))
     {
       n_children++;
     }
+#elseif
+  n_children++;
+#endif
 
   return n_children;
 }
@@ -211,6 +215,7 @@
     }
   else
     {
+#if 0  /* FIXME: API Change on HildonHome */
       /* the HildonHomeTitleBar widget */
       GtkWidget *titlebar =
         hildon_home_window_get_titlebar (HILDON_HOME_WINDOW (widget));
@@ -220,6 +225,7 @@
           accessible = gtk_widget_get_accessible (titlebar);
 	  g_object_ref (accessible);
         }
+#endif
     }
 
   return accessible;

Modified: projects/haf/trunk/hail/hail/hail-hildon-fm/Makefile.am
===================================================================
--- projects/haf/trunk/hail/hail/hail-hildon-fm/Makefile.am	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/hail/hail-hildon-fm/Makefile.am	2007-05-28 17:33:02 UTC (rev 11920)
@@ -6,14 +6,7 @@
 
 libhail_hildonfm_la_SOURCES =			\
 	hail-hildon-fm.c \
-	hailfileselection.c
-	
-#TODO
-#	hailcolorchooser.c
-
-#libhailincludedir=$(includedir)/hail-1.0/hail
-
-libhail_hildonfm_private_h_sources =		\
+	hailfileselection.c \
 	hail-hildon-fm.h \
 	hailfileselection.h
 

Modified: projects/haf/trunk/hail/hail/hail-hildon-libs/Makefile.am
===================================================================
--- projects/haf/trunk/hail/hail/hail-hildon-libs/Makefile.am	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/hail/hail-hildon-libs/Makefile.am	2007-05-28 17:33:02 UTC (rev 11920)
@@ -18,14 +18,7 @@
 	hailrangeeditor.c \
 	hailcolorbutton.c \
 	hailwindow.c \
-	hailcodedialog.c
-	
-#TODO
-#	hailcolorchooser.c
-
-#libhailincludedir=$(includedir)/hail-1.0/hail
-
-libhail_hildonlibs_private_h_sources =		\
+	hailcodedialog.c \
 	hail-hildon-libs.h \
 	hailcaption.h \
 	hailfindtoolbar.h \
@@ -39,9 +32,19 @@
 	hailrangeeditor.h \
 	hailcolorbutton.h \
 	hailwindow.h \
-	hailcodedialog.h
+	hailcodedialog.h \
+	hailappview.h \
+	hailcolorselector.h \
+	hailgrid.h \
+	hailgriditem.h
 
 
+#TODO
+#	hailcolorchooser.c
+
+#libhailincludedir=$(includedir)/hail-1.0/hail
+
+
 #	hailcolorchooser.h 
 
 hail_public_h_sources =
@@ -55,6 +58,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)		 \
+	-I$(top_srcdir)/hail/hail-hildon-libs \
 	-DVERSION=\"$(VERSION)\" \
 	@DEP_CFLAGS@
 

Modified: projects/haf/trunk/hail/po/POTFILES.in
===================================================================
--- projects/haf/trunk/hail/po/POTFILES.in	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/po/POTFILES.in	2007-05-28 17:33:02 UTC (rev 11920)
@@ -1,3 +1,2 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-hail/hailimage.c

Modified: projects/haf/trunk/hail/ut/Makefile.am
===================================================================
--- projects/haf/trunk/hail/ut/Makefile.am	2007-05-28 16:37:58 UTC (rev 11919)
+++ projects/haf/trunk/hail/ut/Makefile.am	2007-05-28 17:33:02 UTC (rev 11920)
@@ -1,6 +1,6 @@
 outomodule_LTLIBRARIES = libhail_unittests.la
 
-INCLUDES = @DEP_CFLAGS@ -I$(top_srcdir)/hail $(OUTO_CFLAGS) -I./
+INCLUDES = @DEP_CFLAGS@ -I$(top_srcdir)/hail $(OUTO_CFLAGS) -I$(top_srcdir) -I./
 AM_LDFLAGS = -module -avoid-version $(top_builddir)/hail/.libs/libhail.so
 
 libhail_unittests_la_SOURCES =  hailcaption_tests.c \
@@ -22,8 +22,33 @@
 				hailwizarddialog_tests.c \
 				hailcodedialog_tests.c \
 				hail_tests_utils.c \
-				hail_tests.c
+				hail_tests.c \
+				hail_tests_utils.h \
+				hailbanner_tests.h \
+				hail_tests.h \
+			 	hailcaption_tests.h \
+			   	hailcolorselector_tests.h \
+			       	haildialog_tests.h \
+				hailfindtoolbar_tests.h \
+			      	hailrangeeditor_tests.h \
+			       	hailtimepicker_tests.h \
+			    	hailwindow_tests.h \
+			       	hailcodedialog_tests.h \
+			      	hailcontrolbar_tests.h \
+			    	haildialogs_tests.h \
+			 	hailgrid_tests.h \
+		       		hailseekbar_tests.h \
+			   	hailvolumebar_tests.h \
+			   	hailwizarddialog_tests.h \
+				hailcolorbutton_tests.h  \
+				haildateeditor_tests.h \
+			    	hailfileselection_tests.h \
+			       	hailnumbereditor_tests.h \
+				hailtimeeditor_tests.h \
+			      	hailweekdaypicker_tests.h
+				
 
+
 #TODO
 #hailcolorselector_tests.c
More information about the maemo-commits mailing list