[maemo-commits] [maemo-commits] r10701 - in projects/haf/trunk/hail: . hail

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Mar 21 17:31:32 EET 2007
Author: fherrera
Date: 2007-03-21 17:31:29 +0200 (Wed, 21 Mar 2007)
New Revision: 10701

Modified:
   projects/haf/trunk/hail/ChangeLog
   projects/haf/trunk/hail/configure.in
   projects/haf/trunk/hail/hail/Makefile.am
   projects/haf/trunk/hail/hail/hail.c
   projects/haf/trunk/hail/hail/hail.h
   projects/haf/trunk/hail/hail/hailcaption.c
   projects/haf/trunk/hail/hail/hailcodedialog.c
   projects/haf/trunk/hail/hail/hailcolorbutton.c
   projects/haf/trunk/hail/hail/haildateeditor.c
   projects/haf/trunk/hail/hail/hailfileselection.c
   projects/haf/trunk/hail/hail/hailfindtoolbar.c
   projects/haf/trunk/hail/hail/hailgrid.c
   projects/haf/trunk/hail/hail/hailnumbereditor.c
   projects/haf/trunk/hail/hail/hailrangeeditor.c
   projects/haf/trunk/hail/hail/hailtimeeditor.c
   projects/haf/trunk/hail/hail/hailtimepicker.c
   projects/haf/trunk/hail/hail/hailvolumebar.c
   projects/haf/trunk/hail/hail/hailweekdaypicker.c
   projects/haf/trunk/hail/hail/hailwindow.c
Log:
        * configure.in:
        * hail/Makefile.am:
        * hail/hail.c: (hail_accessibility_module_init):
        * hail/hail.h:
        * hail/hailcaption.c:
        * hail/hailcodedialog.c:
        * hail/hailcolorbutton.c: (hail_color_button_update_text),
        (hail_color_button_get_current_value):
        * hail/haildateeditor.c:
        * hail/hailfileselection.c:
        * hail/hailfindtoolbar.c:
        * hail/hailgrid.c:
        * hail/hailnumbereditor.c:
        * hail/hailrangeeditor.c:
        * hail/hailtimeeditor.c:
        * hail/hailtimepicker.c:
        * hail/hailvolumebar.c:
        * hail/hailweekdaypicker.c:
        * hail/hailwindow.c: First bunch of changes to port to new hildon-libs
        and hildon-fm.




Modified: projects/haf/trunk/hail/ChangeLog
===================================================================
--- projects/haf/trunk/hail/ChangeLog	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/ChangeLog	2007-03-21 15:31:29 UTC (rev 10701)
@@ -1,3 +1,26 @@
+2007-03-21  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
+
+	* configure.in:
+	* hail/Makefile.am:
+	* hail/hail.c: (hail_accessibility_module_init):
+	* hail/hail.h:
+	* hail/hailcaption.c:
+	* hail/hailcodedialog.c:
+	* hail/hailcolorbutton.c: (hail_color_button_update_text),
+	(hail_color_button_get_current_value):
+	* hail/haildateeditor.c:
+	* hail/hailfileselection.c:
+	* hail/hailfindtoolbar.c:
+	* hail/hailgrid.c:
+	* hail/hailnumbereditor.c:
+	* hail/hailrangeeditor.c:
+	* hail/hailtimeeditor.c:
+	* hail/hailtimepicker.c:
+	* hail/hailvolumebar.c:
+	* hail/hailweekdaypicker.c:
+	* hail/hailwindow.c: First bunch of changes to port to new hildon-libs
+	and hildon-fm. 
+
 2007-03-21 15:45  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
 
 	* ut/hailapp*

Modified: projects/haf/trunk/hail/configure.in
===================================================================
--- projects/haf/trunk/hail/configure.in	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/configure.in	2007-03-21 15:31:29 UTC (rev 10701)
@@ -83,14 +83,14 @@
 
 ATK_PACKAGES="atk"
 GTK_PACKAGES="gtk+-2.0"
-HILDON_LIBS_PACKAGES="hildon-libs"
-HILDON_FM_PACKAGES="hildon-fm"
+HILDON_LIBS_PACKAGES="hildon-1"
+HILDON_FM_PACKAGES="hildon-fm-2"
 GAIL_PACKAGES="gail"
 OUTO_PACKAGES="outo"
 ATK_REQUIRED_VERSION=1.7.0
 GTK_REQUIRED_VERSION=2.6.10
-HILDON_LIBS_REQUIRED_VERSION=0.12.7
-HILDON_FM_REQUIRED_VERSION=0.15
+HILDON_LIBS_REQUIRED_VERSION=0.9.9
+HILDON_FM_REQUIRED_VERSION=1.9.13
 GAIL_REQUIRED_VERSION=1.8.11
 OUTO_REQUIRED_VERSION=0.1.0
 

Modified: projects/haf/trunk/hail/hail/Makefile.am
===================================================================
--- projects/haf/trunk/hail/hail/Makefile.am	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/Makefile.am	2007-03-21 15:31:29 UTC (rev 10701)
@@ -7,15 +7,11 @@
 hail_c_sources =			\
 	hail.c \
 	hailcaption.c \
-	hailappview.c \
 	hailvolumebar.c \
 	hailweekdaypicker.c \
 	hailtimepicker.c \
 	hailfileselection.c \
 	hailfindtoolbar.c \
-	hailcolorselector.c \
-	hailgriditem.c \
-	hailgrid.c \
 	haildialog.c \
 	hailnumbereditor.c \
 	hailtimeeditor.c \
@@ -24,22 +20,21 @@
 	hailcolorbutton.c \
 	hailwindow.c \
 	hailcodedialog.c
+	
+#TODO
+#	hailcolorchooser.c
 
 #libhailincludedir=$(includedir)/hail-1.0/hail
 
 hail_private_h_sources =		\
 	hail.h \
 	hailcaption.h \
-	hailappview.h \
 	hailfindtoolbar.h \
 	hailvolumebar.h \
 	hailweekdaypicker.h \
 	hailtimepicker.h \
 	hailfileselection.h \
 	haildialog.h \
-	hailcolorselector.h \
-	hailgriditem.h \
-	hailgrid.h \
 	haildateeditor.h \
 	hailnumbereditor.h \
 	hailtimeeditor.h \
@@ -49,6 +44,9 @@
 	hailcodedialog.h \
 	hailfactory.h
 
+
+#	hailcolorchooser.h 
+
 hail_public_h_sources =
 
 libhail_la_SOURCES = 			\

Modified: projects/haf/trunk/hail/hail/hail.c
===================================================================
--- projects/haf/trunk/hail/hail/hail.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hail.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -18,29 +18,25 @@
  */
 
 
-#include <hildon-widgets/hildon-app.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-code-dialog.h>
-#include <hildon-widgets/hildon-color-button.h>
-#include <hildon-widgets/hildon-color-selector.h>
-#include <hildon-widgets/hildon-date-editor.h>
-#include <hildon-widgets/hildon-file-selection.h>
-#include <hildon-widgets/hildon-find-toolbar.h>
-#include <hildon-widgets/hildon-grid.h>
-#include <hildon-widgets/hildon-grid-item.h>
-#include <hildon-widgets/hildon-number-editor.h>
-#include <hildon-widgets/hildon-range-editor.h>
-#include <hildon-widgets/hildon-time-editor.h>
-#include <hildon-widgets/hildon-time-picker.h>
-#include <hildon-widgets/hildon-volumebar.h>
-#include <hildon-widgets/hildon-weekday-picker.h>
-#include <hildon-widgets/hildon-window.h>
+#include <hildon/hildon-caption.h>
+#include <hildon/hildon-code-dialog.h>
+#include <hildon/hildon-color-button.h>
+#include <hildon/hildon-color-chooser.h>
+#include <hildon/hildon-date-editor.h>
+#include <hildon/hildon-file-selection.h>
+#include <hildon/hildon-find-toolbar.h>
+#include <hildon/hildon-number-editor.h>
+#include <hildon/hildon-range-editor.h>
+#include <hildon/hildon-time-editor.h>
+#include <hildon/hildon-time-picker.h>
+#include <hildon/hildon-volumebar.h>
+#include <hildon/hildon-weekday-picker.h>
+#include <hildon/hildon-window.h>
 #include "hailfactory.h"
 #include "hail.h"
 
 /* Hail factories class definition */
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_CAPTION, hail_caption, hail_caption_new)
-HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_APP_VIEW, hail_app_view, hail_app_view_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_FIND_TOOLBAR, hail_find_toolbar, hail_find_toolbar_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_VOLUME_BAR, hail_volume_bar, hail_volume_bar_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_FILE_SELECTION, hail_file_selection, hail_file_selection_new)
@@ -48,8 +44,6 @@
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_DIALOG, hail_dialog, hail_dialog_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_TIME_PICKER, hail_time_picker, hail_time_picker_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_COLOR_SELECTOR, hail_color_selector, hail_color_selector_new)
-HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_GRID_ITEM, hail_grid_item, hail_grid_item_new)
-HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_GRID, hail_grid, hail_grid_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_DATE_EDITOR, hail_date_editor, hail_date_editor_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_NUMBER_EDITOR, hail_number_editor, hail_number_editor_new)
 HAIL_ACCESSIBLE_FACTORY (HAIL_TYPE_TIME_EDITOR, hail_time_editor, hail_time_editor_new)
@@ -82,23 +76,19 @@
 
   HAIL_WIDGET_SET_FACTORY (GTK_TYPE_DIALOG, hail_dialog);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_CAPTION, hail_caption);
-  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_APPVIEW, hail_app_view);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_FIND_TOOLBAR, hail_find_toolbar);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_VOLUMEBAR, hail_volume_bar);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_FILE_SELECTION, hail_file_selection);
-  HAIL_WIDGET_SET_FACTORY (HILDON_WEEKDAY_PICKER_TYPE, hail_weekday_picker);
+  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_WEEKDAY_PICKER, hail_weekday_picker);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_TIME_PICKER, hail_time_picker);
-  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_COLOR_SELECTOR, hail_color_selector);
-  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_GRID_ITEM, hail_grid_item);
-  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_GRID, hail_grid);
-  HAIL_WIDGET_SET_FACTORY (HILDON_DATE_EDITOR_TYPE, hail_date_editor);
+  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_COLOR_CHOOSER, hail_color_chooser);
+  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_DATE_EDITOR, hail_date_editor);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_NUMBER_EDITOR, hail_number_editor);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_TIME_EDITOR, hail_time_editor);
-  HAIL_WIDGET_SET_FACTORY (HILDON_RANGE_EDITOR_TYPE, hail_range_editor);
+  HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_RANGE_EDITOR, hail_range_editor);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_COLOR_BUTTON, hail_color_button);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_WINDOW, hail_window);
   HAIL_WIDGET_SET_FACTORY (HILDON_TYPE_CODE_DIALOG, hail_code_dialog);
-  HAIL_WIDGET_SET_EXTERNAL_FACTORY (HILDON_TYPE_APP, "GailWindowFactory");
 
 }
 

Modified: projects/haf/trunk/hail/hail/hail.h
===================================================================
--- projects/haf/trunk/hail/hail/hail.h	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hail.h	2007-03-21 15:31:29 UTC (rev 10701)
@@ -30,7 +30,7 @@
 #include "hailcaption.h"
 #include "hailcodedialog.h"
 #include "hailcolorbutton.h"
-#include "hailcolorselector.h"
+#include "hailcolorchooser.h"
 #include "haildateeditor.h"
 #include "haildialog.h"
 #include "hailfileselection.h"

Modified: projects/haf/trunk/hail/hail/hailcaption.c
===================================================================
--- projects/haf/trunk/hail/hail/hailcaption.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailcaption.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -34,7 +34,7 @@
  */
 
 #include <gtk/gtkimage.h>
-#include <hildon-widgets/hildon-caption.h>
+#include <hildon/hildon-caption.h>
 #include "hailcaption.h"
 
 static void                  hail_caption_class_init       (HailCaptionClass *klass);

Modified: projects/haf/trunk/hail/hail/hailcodedialog.c
===================================================================
--- projects/haf/trunk/hail/hail/hailcodedialog.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailcodedialog.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -26,7 +26,7 @@
  * children (the buttons inside the widget). 
  */
 
-#include <hildon-widgets/hildon-code-dialog.h>
+#include <hildon/hildon-code-dialog.h>
 #include "hailcodedialog.h"
 
 

Modified: projects/haf/trunk/hail/hail/hailcolorbutton.c
===================================================================
--- projects/haf/trunk/hail/hail/hailcolorbutton.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailcolorbutton.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -29,7 +29,7 @@
  */
 
 #include <gtk/gtkdrawingarea.h>
-#include <hildon-widgets/hildon-color-button.h>
+#include <hildon/hildon-color-button.h>
 #include "hailcolorbutton.h"
 
 
@@ -225,18 +225,18 @@
 {
   HailColorButtonPrivate * priv = NULL;
   GtkWidget * widget = NULL;
-  GdkColor * color = NULL;
+  GdkColor color;
 
   g_return_if_fail (HAIL_COLOR_BUTTON(selector));
   widget = GTK_ACCESSIBLE(selector)->widget;
   g_return_if_fail (HILDON_COLOR_BUTTON(widget));
 
   priv = HAIL_COLOR_BUTTON_GET_PRIVATE(selector);
-  color = (GdkColor *) hildon_color_button_get_color(HILDON_COLOR_BUTTON(widget));
+  hildon_color_button_get_color(HILDON_COLOR_BUTTON(widget), &color);
   if (priv->exposed_text != NULL)
     g_free(priv->exposed_text);
   /* html format of color*/
-  priv->exposed_text = g_strdup_printf("Color #%02x%02x%02x", (color->red)&0xff, (color->green)&0xff, (color->blue)&0xff);
+  priv->exposed_text = g_strdup_printf("Color #%02x%02x%02x", (color.red)&0xff, (color.green)&0xff, (color.blue)&0xff);
 }
 
 /* Implementation of AtkObject method get_name() */
@@ -290,20 +290,20 @@
 				       GValue		*value)
 {
   HailColorButtonPrivate * priv = NULL;
-  GdkColor * color = NULL;
+  GdkColor color;
   GtkWidget * widget = NULL;
 
   g_return_if_fail (HAIL_IS_COLOR_BUTTON (obj));
   priv = HAIL_COLOR_BUTTON_GET_PRIVATE(obj);
   widget = GTK_ACCESSIBLE(obj)->widget;
 
-  color = (GdkColor *) hildon_color_button_get_color(HILDON_COLOR_BUTTON(widget));
+  hildon_color_button_get_color(HILDON_COLOR_BUTTON(widget), &color);
 
   g_value_init(value, G_TYPE_DOUBLE);
   /* compose the color as a 24 bits number */
-  g_value_set_double(value, (gdouble) (((color->red)/256)*65536) +
-		     (((color->green)/256)*256) +
-		     (((color->blue)/256)));
+  g_value_set_double(value, (gdouble) (((color.red)/256)*65536) +
+		     (((color.green)/256)*256) +
+		     (((color.blue)/256)));
 }
 
 /* Implementation of AtkValue method get_maximum_value() */

Modified: projects/haf/trunk/hail/hail/haildateeditor.c
===================================================================
--- projects/haf/trunk/hail/hail/haildateeditor.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/haildateeditor.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <langinfo.h>
 #include <gdk/gdkkeysyms.h>
-#include <hildon-widgets/hildon-date-editor.h>
+#include <hildon/hildon-date-editor.h>
 #include <libgail-util/gailtextutil.h>
 #include "haildateeditor.h"
 

Modified: projects/haf/trunk/hail/hail/hailfileselection.c
===================================================================
--- projects/haf/trunk/hail/hail/hailfileselection.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailfileselection.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -39,7 +39,7 @@
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkhpaned.h>
-#include <hildon-widgets/hildon-file-selection.h>
+#include <hildon/hildon-file-selection.h>
 #include "hailfileselection.h"
 
 #define HAIL_FILE_SELECTION_DEFAULT_NAME "File selection"

Modified: projects/haf/trunk/hail/hail/hailfindtoolbar.c
===================================================================
--- projects/haf/trunk/hail/hail/hailfindtoolbar.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailfindtoolbar.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtktoolbutton.h>
-#include <hildon-widgets/hildon-find-toolbar.h>
+#include <hildon/hildon-find-toolbar.h>
 #include "hailfindtoolbar.h"
 
 static void                  hail_find_toolbar_class_init       (HailFindToolbarClass *klass);

Modified: projects/haf/trunk/hail/hail/hailgrid.c
===================================================================
--- projects/haf/trunk/hail/hail/hailgrid.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailgrid.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -27,7 +27,7 @@
  * It reports the children from their position through #AtkComponent.
  */
 
-#include <hildon-widgets/hildon-grid.h>
+#include <hildon/hildon-grid.h>
 #include "hailgrid.h"
 
 #define HAIL_GRID_DEFAULT_NAME "Grid"

Modified: projects/haf/trunk/hail/hail/hailnumbereditor.c
===================================================================
--- projects/haf/trunk/hail/hail/hailnumbereditor.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailnumbereditor.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -30,7 +30,7 @@
 
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkentry.h>
-#include <hildon-widgets/hildon-number-editor.h>
+#include <hildon/hildon-number-editor.h>
 #include "hailnumbereditor.h"
 
 #define HAIL_NUMBER_EDITOR_DEFAULT_NAME "Number editor"

Modified: projects/haf/trunk/hail/hail/hailrangeeditor.c
===================================================================
--- projects/haf/trunk/hail/hail/hailrangeeditor.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailrangeeditor.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -29,7 +29,7 @@
 
 #include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>
-#include <hildon-widgets/hildon-range-editor.h>
+#include <hildon/hildon-range-editor.h>
 #include "hailrangeeditor.h"
 
 #define HAIL_RANGE_EDITOR_DEFAULT_NAME "Edit range"

Modified: projects/haf/trunk/hail/hail/hailtimeeditor.c
===================================================================
--- projects/haf/trunk/hail/hail/hailtimeeditor.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailtimeeditor.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -35,7 +35,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkentry.h>
-#include <hildon-widgets/hildon-time-editor.h>
+#include <hildon/hildon-time-editor.h>
 #include <libgail-util/gailtextutil.h>
 #include "hailtimeeditor.h"
 

Modified: projects/haf/trunk/hail/hail/hailtimepicker.c
===================================================================
--- projects/haf/trunk/hail/hail/hailtimepicker.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailtimepicker.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -35,7 +35,7 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtktable.h>
-#include <hildon-widgets/hildon-time-picker.h>
+#include <hildon/hildon-time-picker.h>
 #include "hailtimepicker.h"
 
 /* list of widgets holded inside the time picker */

Modified: projects/haf/trunk/hail/hail/hailvolumebar.c
===================================================================
--- projects/haf/trunk/hail/hail/hailvolumebar.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailvolumebar.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -36,8 +36,8 @@
 
 #include <gtk/gtkrange.h>
 #include <gtk/gtktogglebutton.h>
-#include <hildon-widgets/hildon-hvolumebar.h>
-#include <hildon-widgets/hildon-vvolumebar.h>
+#include <hildon/hildon-hvolumebar.h>
+#include <hildon/hildon-vvolumebar.h>
 #include "hailvolumebar.h"
 
 #define HAIL_VOLUME_BAR_DEFAULT_NAME "Volume bar"

Modified: projects/haf/trunk/hail/hail/hailweekdaypicker.c
===================================================================
--- projects/haf/trunk/hail/hail/hailweekdaypicker.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailweekdaypicker.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -30,7 +30,7 @@
  */
 
 #include <gtk/gtktogglebutton.h>
-#include <hildon-widgets/hildon-weekday-picker.h>
+#include <hildon/hildon-weekday-picker.h>
 #include "hailweekdaypicker.h"
 
 

Modified: projects/haf/trunk/hail/hail/hailwindow.c
===================================================================
--- projects/haf/trunk/hail/hail/hailwindow.c	2007-03-21 15:31:28 UTC (rev 10700)
+++ projects/haf/trunk/hail/hail/hailwindow.c	2007-03-21 15:31:29 UTC (rev 10701)
@@ -38,8 +38,8 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkbox.h>
-#include <hildon-widgets/hildon-window.h>
-#include <hildon-widgets/hildon-program.h>
+#include <hildon/hildon-window.h>
+#include <hildon/hildon-program.h>
 #include "hailwindow.h"
 
 typedef struct _HailWindowPrivate HailWindowPrivate;


More information about the maemo-commits mailing list