Changing from hildon-widgets.h to hildon.h. Fixing the examples license header. Fixin...
authorMichael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Wed, 17 Jan 2007 14:31:01 +0000 (14:31 +0000)
committerMichael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Wed, 17 Jan 2007 14:31:01 +0000 (14:31 +0000)
14 files changed:
ChangeLog
examples/hildon-banner/hildon-banner-example.c
examples/hildon-caption/hildon-caption-example.c
examples/hildon-color-button/hildon-color-button-example.c
examples/hildon-color-chooser/hildon-color-chooser-example.c
examples/hildon-controlbar/hildon-controlbar-example.c
examples/hildon-note/hildon-note-example.c
examples/hildon-sort-dialog/hildon-sort-dialog-example.c
examples/hildon-time-picker/hildon-time-picker-example.c
examples/hildon-weekday-picker/hildon-weekday-picker-example.c
examples/hildon-window/hildon-window-example.c
src/Makefile.am
src/hildon-widgets.h [deleted file]
src/hildon.h [new file with mode: 0644]

index 5f06173..d7d165f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2007-01-17  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * src/hildon.h: Changing from hildon-widgets.h
+
+       * examples/hildon-banner/hildon-banner-example.c:
+       * examples/hildon-caption/hildon-caption-example.c:
+       * examples/hildon-color-button/hildon-color-button-example.c:
+       * examples/hildon-color-chooser/hildon-color-chooser-example.c:
+       * examples/hildon-controlbar/hildon-controlbar-example.c:
+       * examples/hildon-note/hildon-note-example.c:
+       * examples/hildon-sort-dialog/hildon-sort-dialog-example.c:
+       * examples/hildon-time-picker/hildon-time-picker-example.c:
+       * examples/hildon-weekday-picker/hildon-weekday-picker-example.c:
+       * examples/hildon-window/hildon-window-example.c: Fixing the example
+       license header. 
+
+       * src/Makefile.am: Fixing the noinst headers.
+
+2007-01-17  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * ./: Upgrading the license headers, moving package name to "hildon"
        etc. 
        
index d79a53d..c722c49 100644 (file)
@@ -1,34 +1,56 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-widgets/hildon-window.h"
-#include "hildon-widgets/hildon-program.h"
-#include "hildon-widgets/hildon-banner.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 static gboolean
-on_animation_idle (GtkWidget *banner)
+on_animation_idle                               (GtkWidget *banner)
 {
     gtk_widget_destroy (banner);
     return FALSE;
 }
 
 static gboolean
-on_progress_idle (GtkWidget *banner)
+on_progress_idle                                (GtkWidget *banner)
 {
     gtk_widget_destroy (banner);
     return FALSE;
 }
 
 static gboolean
-on_information_clicked (GtkWidget *widget)
+on_information_clicked                          (GtkWidget *widget)
 {
     hildon_banner_show_information (widget, NULL, "Information banner"); 
     return TRUE;
 }
 
 static gboolean
-on_animation_clicked (GtkWidget *widget)
+on_animation_clicked                            (GtkWidget *widget)
 {
     GtkWidget *banner = hildon_banner_show_animation (widget, NULL, "Animation banner"); 
     g_timeout_add (2000, (gpointer) on_animation_idle, banner);
@@ -36,7 +58,7 @@ on_animation_clicked (GtkWidget *widget)
 }
 
 static gboolean
-on_progress_clicked (GtkWidget *widget)
+on_progress_clicked                             (GtkWidget *widget)
 {
     GtkWidget *banner = hildon_banner_show_progress (widget, NULL, "Progress banner"); 
     g_timeout_add (2000, (gpointer) on_progress_idle, banner);
@@ -44,7 +66,8 @@ on_progress_clicked (GtkWidget *widget)
 }
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index e8f607c..2d8b5b8 100644 (file)
@@ -1,13 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-widgets/hildon-window.h"
-#include "hildon-widgets/hildon-caption.h"
-#include "hildon-widgets/hildon-program.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index dd751ea..e534934 100644 (file)
@@ -1,13 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-color-button.h"
-#include "hildon-program.h"
-#include "hildon-window.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index d300225..a343790 100644 (file)
@@ -1,13 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-color-chooser.h"
-#include "hildon-program.h"
-#include "hildon-window.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index bb615dc..1b6a378 100644 (file)
@@ -1,13 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-widgets/hildon-window.h"
-#include "hildon-widgets/hildon-program.h"
-#include "hildon-widgets/hildon-controlbar.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index b71eb5a..398bc50 100644 (file)
@@ -1,13 +1,35 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-widgets/hildon-window.h"
-#include "hildon-widgets/hildon-program.h"
-#include "hildon-widgets/hildon-note.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 static gboolean
-on_information_clicked (GtkWidget *widget)
+on_information_clicked                          (GtkWidget *widget)
 {
     HildonNote* note = HILDON_NOTE (hildon_note_new_information (NULL, 
             "This is a really really really long text that should " 
@@ -21,7 +43,7 @@ on_information_clicked (GtkWidget *widget)
 }
 
 static gboolean
-on_confirmation_clicked (GtkWidget *widget)
+on_confirmation_clicked                         (GtkWidget *widget)
 {
     HildonNote* note = HILDON_NOTE (hildon_note_new_confirmation (NULL, 
             "Do you want to confirm?!"));
@@ -33,7 +55,7 @@ on_confirmation_clicked (GtkWidget *widget)
 }
 
 static gboolean
-on_progress_clicked (GtkWidget *widget)
+on_progress_clicked                             (GtkWidget *widget)
 {
     GtkProgressBar *bar = GTK_PROGRESS_BAR (gtk_progress_bar_new ());
     HildonNote *note = HILDON_NOTE (hildon_note_new_cancel_with_progress_bar (NULL, 
@@ -46,7 +68,8 @@ on_progress_clicked (GtkWidget *widget)
 }
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index 26aa965..e80b82b 100644 (file)
@@ -1,8 +1,32 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <hildon-sort-dialog.h>
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
 main (int argc, char **args)
index 590eaf4..a2d512b 100644 (file)
@@ -1,13 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-window.h"
-#include "hildon-time-picker.h"
-#include "hildon-program.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index c0b6019..754bcb2 100644 (file)
@@ -1,13 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-widgets/hildon-window.h"
-#include "hildon-widgets/hildon-weekday-picker.h"
-#include "hildon-widgets/hildon-program.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index e980820..25dc9bd 100644 (file)
@@ -1,12 +1,36 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "hildon-widgets/hildon-window.h"
-#include "hildon-widgets/hildon-program.h"
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
 
 int
-main (int argc, char **args)
+main                                            (int argc, 
+                                                 char **args)
 {
     gtk_init (&argc, &args);
     
index 276b05d..2147014 100644 (file)
@@ -1,10 +1,10 @@
 INCLUDES                                               = -DG_LOG_DOMAIN=\"hildon-@PACKAGE_VERSION_MAJOR@\" \
                                                          -DLOCALEDIR=\"$(localedir)\"
 
-MAINTAINERCLEANFILES                                   = Makefile.in                   \
-                                                         hildon-enum-types.c   \
-                                                         hildon-enum-types.h   \
-                                                         hildon-marshalers.h   \
+MAINTAINERCLEANFILES                                   = Makefile.in                                   \
+                                                         hildon-enum-types.c                           \
+                                                         hildon-enum-types.h                           \
+                                                         hildon-marshalers.h                           \
                                                          hildon-marshalers.c
 
 EXTRA_DIST                                             = hildon-marshalers.list
@@ -13,93 +13,122 @@ lib_LTLIBRARIES                                    = libhildon_@PACKAGE_VERSION_MAJOR@.la
 
 libhildon_@PACKAGE_VERSION_MAJOR@_la_LDFLAGS           = $(HILDON_WIDGETS_LT_LDFLAGS)
 
-libhildon_@PACKAGE_VERSION_MAJOR@_la_LIBADD            = $(GTK_LIBS)                   \
-                                                         $(GCONF_LIBS)                 \
+libhildon_@PACKAGE_VERSION_MAJOR@_la_LIBADD            = $(GTK_LIBS)                                   \
+                                                         $(GCONF_LIBS)                                 \
                                                          $(ESD_LIBS)                   
 
-libhildon_@PACKAGE_VERSION_MAJOR@_la_CFLAGS            = $(GTK_CFLAGS)                 \
-                                                         $(GCONF_CFLAGS)               \
+libhildon_@PACKAGE_VERSION_MAJOR@_la_CFLAGS            = $(GTK_CFLAGS)                                 \
+                                                         $(GCONF_CFLAGS)                               \
                                                          $(ESD_CFLAGS) 
 
-libhildon_@PACKAGE_VERSION_MAJOR@_la_SOURCES           = hildon-composite-widget.c \
-                                                         hildon-controlbar.c \
-                                                         hildon-seekbar.c \
-                                                         hildon-note.c \
-                                                         hildon-volumebar.c \
-                                                         hildon-sound.c \
-                                                         hildon-volumebar-range.c \
-                                                         hildon-hvolumebar.c \
-                                                         hildon-vvolumebar.c \
-                                                         hildon-calendar-popup.c \
-                                                         hildon-date-editor.c \
-                                                         hildon-time-editor.c \
-                                                         hildon-time-picker.c \
-                                                         hildon-weekday-picker.c \
-                                                         hildon-number-editor.c \
-                                                         hildon-range-editor.c \
-                                                         hildon-get-password-dialog.c \
-                                                         hildon-set-password-dialog.c \
-                                                         hildon-sort-dialog.c \
-                                                         hildon-font-selection-dialog.c \
-                                                         hildon-login-dialog.c \
-                                                         hildon-wizard-dialog.c \
-                                                         hildon-color-chooser.c \
-                                                         hildon-color-button.c \
-                                                         hildon-color-chooser-dialog.c \
-                                                         hildon-defines.c \
-                                                         hildon-find-toolbar.c \
-                                                         hildon-banner.c \
-                                                         hildon-caption.c \
-                                                         hildon-window.c \
-                                                         hildon-program.c \
-                                                         hildon-code-dialog.c \
-                                                         hildon-enum-types.c \
+libhildon_@PACKAGE_VERSION_MAJOR@_la_SOURCES           = hildon-composite-widget.c                     \
+                                                         hildon-controlbar.c                           \
+                                                         hildon-seekbar.c                              \
+                                                         hildon-note.c                                 \
+                                                         hildon-volumebar.c                            \
+                                                         hildon-sound.c                                \
+                                                         hildon-volumebar-range.c                      \
+                                                         hildon-hvolumebar.c                           \
+                                                         hildon-vvolumebar.c                           \
+                                                         hildon-calendar-popup.c                       \
+                                                         hildon-date-editor.c                          \
+                                                         hildon-time-editor.c                          \
+                                                         hildon-time-picker.c                          \
+                                                         hildon-weekday-picker.c                       \
+                                                         hildon-number-editor.c                        \
+                                                         hildon-range-editor.c                         \
+                                                         hildon-get-password-dialog.c                  \
+                                                         hildon-set-password-dialog.c                  \
+                                                         hildon-sort-dialog.c                          \
+                                                         hildon-font-selection-dialog.c                \
+                                                         hildon-login-dialog.c                         \
+                                                         hildon-wizard-dialog.c                        \
+                                                         hildon-color-chooser.c                        \
+                                                         hildon-color-button.c                         \
+                                                         hildon-color-chooser-dialog.c                 \
+                                                         hildon-defines.c                              \
+                                                         hildon-find-toolbar.c                         \
+                                                         hildon-banner.c                               \
+                                                         hildon-caption.c                              \
+                                                         hildon-window.c                               \
+                                                         hildon-program.c                              \
+                                                         hildon-code-dialog.c                          \
+                                                         hildon-enum-types.c                           \
                                                          hildon-marshalers.c
 
 libhildon_@PACKAGE_VERSION_MAJOR@_includedir           = $(includedir)/$(PACKAGE)-$(PACKAGE_VERSION_MAJOR)/$(PACKAGE)
 
-libhildon_@PACKAGE_VERSION_MAJOR@_include_HEADERS      = hildon-controlbar.h \
-                                                         hildon-note.h \
-                                                         hildon-sound.h \
-                                                         hildon-seekbar.h \
-                                                         hildon-volumebar.h \
-                                                         hildon-hvolumebar.h \
-                                                         hildon-vvolumebar.h \
-                                                         hildon-calendar-popup.h \
-                                                         hildon-date-editor.h \
-                                                         hildon-time-editor.h \
-                                                         hildon-time-picker.h \
-                                                         hildon-weekday-picker.h \
-                                                         hildon-number-editor.h \
-                                                         hildon-range-editor.h \
-                                                         hildon-get-password-dialog.h \
-                                                         hildon-set-password-dialog.h \
-                                                         hildon-sort-dialog.h \
-                                                         hildon-font-selection-dialog.h \
-                                                         hildon-login-dialog.h \
-                                                         hildon-wizard-dialog.h \
-                                                         hildon-color-chooser.h \
-                                                         hildon-color-button.h \
-                                                         hildon-color-chooser-dialog.h \
-                                                         hildon-defines.h \
-                                                         hildon-find-toolbar.h \
-                                                         hildon-banner.h \
-                                                         hildon-input-mode-hint.h \
-                                                         hildon-caption.h \
-                                                         hildon-window.h \
-                                                         hildon-program.h \
-                                                         hildon-window-private.h \
-                                                         hildon-code-dialog.h \
-                                                         hildon-enum-types.h \
-                                                         hildon-marshalers.h
+libhildon_@PACKAGE_VERSION_MAJOR@_include_HEADERS      = hildon-banner.h                               \
+                                                         hildon-calendar-popup.h                       \
+                                                         hildon-caption.h                              \
+                                                         hildon-code-dialog.h                          \
+                                                         hildon-color-button.h                         \
+                                                         hildon-color-chooser-dialog.h                 \
+                                                         hildon-color-chooser.h                        \
+                                                         hildon-composite-widget.h                     \
+                                                         hildon-controlbar.h                           \
+                                                         hildon-date-editor.h                          \
+                                                         hildon-defines.h                              \
+                                                         hildon-enum-types.h                           \
+                                                         hildon-find-toolbar.h                         \
+                                                         hildon-font-selection-dialog.h                \
+                                                         hildon-get-password-dialog.h                  \
+                                                         hildon-hvolumebar.h                           \
+                                                         hildon-input-mode-hint.h                      \
+                                                         hildon-login-dialog.h                         \
+                                                         hildon-marshalers.h                           \
+                                                         hildon-note.h                                 \
+                                                         hildon-number-editor.h                        \
+                                                         hildon-program.h                              \
+                                                         hildon-range-editor.h                         \
+                                                         hildon-seekbar.h                              \
+                                                         hildon-set-password-dialog.h                  \
+                                                         hildon-sort-dialog.h                          \
+                                                         hildon-sound.h                                \
+                                                         hildon-time-editor.h                          \
+                                                         hildon-time-picker.h                          \
+                                                         hildon-volumebar-range.h                      \
+                                                         hildon-volumebar.h                            \
+                                                         hildon-vvolumebar.h                           \
+                                                         hildon-weekday-picker.h                       \
+                                                         hildon.h                                      \
+                                                         hildon-window.h                               \
+                                                         hildon-wizard-dialog.h
+
+noinst_HEADERS                                         = hildon-banner-private.h                       \
+                                                         hildon-calendar-popup-private.h               \
+                                                         hildon-caption-private.h                      \
+                                                         hildon-code-dialog-private.h                  \
+                                                         hildon-color-button-private.h                 \
+                                                         hildon-color-chooser-dialog-private.h         \
+                                                         hildon-color-chooser-private.h                \
+                                                         hildon-controlbar-private.h                   \
+                                                         hildon-date-editor-private.h                  \
+                                                         hildon-find-toolbar-private.h                 \
+                                                         hildon-font-selection-dialog-private.h        \
+                                                         hildon-get-password-dialog-private.h          \
+                                                         hildon-login-dialog-private.h                 \
+                                                         hildon-note-private.h                         \
+                                                         hildon-number-editor-private.h                \
+                                                         hildon-program-private.h                      \
+                                                         hildon-range-editor-private.h                 \
+                                                         hildon-seekbar-private.h                      \
+                                                         hildon-set-password-dialog-private.h          \
+                                                         hildon-sort-dialog-private.h                  \
+                                                         hildon-time-editor-private.h                  \
+                                                         hildon-time-picker-private.h                  \
+                                                         hildon-volumebar-private.h                    \
+                                                         hildon-weekday-picker-private.h               \
+                                                         hildon-window-private.h                       \
+                                                         hildon-wizard-dialog-private.h
 
 # Don't build the library until we have built the header that it needs:
 $(OBJECTS) $(libhildon_$(PACKAGE_VERSION_MAJOR)_la_OBJECTS): hildon-enum-types.h hildon-marshalers.c hildon-marshalers.h
 
 hildon-enum-types.h:                                     @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
-       (cd $(srcdir) && glib-mkenums \
-                       --fhead "#ifndef __HILDON_ENUM_TYPES_H__\n"     \
-                       --fhead "#define __HILDON_ENUM_TYPES_H__\n"     \
+       (cd $(srcdir) && glib-mkenums                                           \
+                       --fhead "#ifndef __HILDON_ENUM_TYPES_H__\n"             \
+                       --fhead "#define __HILDON_ENUM_TYPES_H__\n"             \
                        --fhead "\n"                                            \
                        --fhead "#include <glib-object.h>\n"                    \
                        --fhead "\n"                                            \
@@ -111,10 +140,10 @@ hildon-enum-types.h:                                        @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_inclu
                $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS)) > $@
 
 hildon-enum-types.c:                                     @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
-       (cd $(srcdir) && glib-mkenums \
-                       --fhead "#include \"hildon-widgets.h\"\n" \
-                       --fhead "#include <glib-object.h>" \
-                       --fprod "\n/* enumerations from \"@filename@\" */" \
+       (cd $(srcdir) && glib-mkenums                                           \
+                       --fhead "#include \"hildon.h\"\n"                       \
+                       --fhead "#include <glib-object.h>"                      \
+                       --fprod "\n/* enumerations from \"@filename@\" */"      \
                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
                        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
diff --git a/src/hildon-widgets.h b/src/hildon-widgets.h
deleted file mode 100644 (file)
index ee069c9..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This file is a part of hildon
- *
- * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
- *
- * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; version 2.1 of
- * the License.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef __HILDON_WIDGETS_H__
-#define __HILDON_WIDGETS_H__
-
-#include "hildon-banner.h"
-#include "hildon-calendar-popup.h"
-#include "hildon-caption.h"
-#include "hildon-code-dialog.h"
-#include "hildon-composite-widget.h"
-#include "hildon-color-chooser.h"
-#include "hildon-color-button.h"
-#include "hildon-color-chooser-dialog.h"
-#include "hildon-controlbar.h"
-#include "hildon-date-editor.h"
-#include "hildon-defines.h"
-#include "hildon-find-toolbar.h"
-#include "hildon-font-selection-dialog.h"
-#include "hildon-get-password-dialog.h"
-#include "hildon-hvolumebar.h"
-#include "hildon-input-mode-hint.h"
-#include "hildon-marshalers.h"
-#include "hildon-login-dialog.h"
-#include "hildon-note.h"
-#include "hildon-number-editor.h"
-#include "hildon-program.h"
-#include "hildon-range-editor.h"
-#include "hildon-seekbar.h"
-#include "hildon-set-password-dialog.h"
-#include "hildon-sort-dialog.h"
-#include "hildon-time-editor.h"
-#include "hildon-time-picker.h"
-#include "hildon-volumebar-private.h"
-#include "hildon-volumebar-range.h"
-#include "hildon-volumebar.h"
-#include "hildon-vvolumebar.h"
-#include "hildon-weekday-picker.h"
-#include "hildon-window-private.h"
-#include "hildon-window.h"
-#include "hildon-wizard-dialog.h"
-#include "hildon-enum-types.h"
-
-#endif 
diff --git a/src/hildon.h b/src/hildon.h
new file mode 100644 (file)
index 0000000..9ba5e25
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * This file is a part of hildon
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef                                         __HILDON_H__
+#define                                         __HILDON_H__
+
+#include                                        "hildon-banner.h"
+#include                                        "hildon-calendar-popup.h"
+#include                                        "hildon-caption.h"
+#include                                        "hildon-code-dialog.h"
+#include                                        "hildon-color-button.h"
+#include                                        "hildon-color-chooser-dialog.h"
+#include                                        "hildon-color-chooser.h"
+#include                                        "hildon-composite-widget.h"
+#include                                        "hildon-controlbar.h"
+#include                                        "hildon-date-editor.h"
+#include                                        "hildon-defines.h"
+#include                                        "hildon-enum-types.h"
+#include                                        "hildon-find-toolbar.h"
+#include                                        "hildon-font-selection-dialog.h"
+#include                                        "hildon-get-password-dialog.h"
+#include                                        "hildon-hvolumebar.h"
+#include                                        "hildon-input-mode-hint.h"
+#include                                        "hildon-login-dialog.h"
+#include                                        "hildon-marshalers.h"
+#include                                        "hildon-note.h"
+#include                                        "hildon-number-editor.h"
+#include                                        "hildon-program.h"
+#include                                        "hildon-range-editor.h"
+#include                                        "hildon-seekbar.h"
+#include                                        "hildon-set-password-dialog.h"
+#include                                        "hildon-sort-dialog.h"
+#include                                        "hildon-sound.h"
+#include                                        "hildon-time-editor.h"
+#include                                        "hildon-time-picker.h"
+#include                                        "hildon-volumebar-range.h"
+#include                                        "hildon-volumebar.h"
+#include                                        "hildon-vvolumebar.h"
+#include                                        "hildon-weekday-picker.h"
+#include                                        "hildon-window.h"
+#include                                        "hildon-wizard-dialog.h"
+
+#endif