* src/hildon-color-chooser.h * src/hildon-color-chooser-dialog.h: * Fixes: NB#86838...

diff --git a/ChangeLog b/ChangeLog
index 536b61c..2c07627 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-04  Johannes Schmid  <johannes.schmid@openismus.com>
+
+       * src/hildon-color-chooser.h
+       * src/hildon-color-chooser-dialog.h:
+
+       Add G_BEGIN_DECLS and G_END_DECLS to allow linking against C++
+
 2008-06-10  Michael Natterer  <mitch@imendio.com>
 
        Merge change from hildon-widgets which makes hildon-1 build

diff --git a/debian/changelog b/debian/changelog
index eda1385..f2213f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-libhildon (2.0.4-1) gutsy; urgency=low
+ libhildon (2.0.5-1) gutsy; urgency=low
+
+  * src/hildon-color-chooser.h
+  * src/hildon-color-chooser-dialog.h:
+  * Fixes: NB#86838: Add G_BEGIN_DECLS and G_END_DECLS to allow linking
+    against C++
+
+ -- Karl Lattimer <karl.lattimer@nokia.com>  Mon, Jul 14 2008 14:00:00 +0300 
+
+libhildon (2.0.4-1) gutsy; urgency=low 
 
   * src/hildon-banner.c: revert the recent change, that introduced gtk_window_present() calls. 
     This reopens: Bug 78481 - [freetest] information banners are hidden under browser menu
@@ -16,7 +25,7 @@ libhildon (2.0.3-1) gutsy; urgency=low
 
  -- Natalia Dobrovolskaya <natalia.dobrovolskaya@nokia.com>  Tue, 15 Apr 2008 15:03:00 +0100
 
-libhildon (2.0.2-1) gutsy; urgency=low
+libhildon (2.0.2-1) gutsy; urgency=low 
 
   * Fixes: MB#1220: HildonWindow should take GtkMenu accel_group into account
   * Fixes NB#78481: information banners are hidden under browser menu

diff --git a/src/hildon-color-chooser-dialog.h b/src/hildon-color-chooser-dialog.h
index 6b804ed..7fb7984 100644 (file)
--- a/src/hildon-color-chooser-dialog.h
+++ b/src/hildon-color-chooser-dialog.h
@@ -29,6 +29,8 @@
 #include                                        <gdk/gdkcolor.h>
 #include                                        <gtk/gtkdialog.h>
 
+G_BEGIN_DECLS
+
 #define                                         HILDON_TYPE_COLOR_CHOOSER_DIALOG \
                                                 (hildon_color_chooser_dialog_get_type())
 
@@ -74,4 +76,6 @@ void
 hildon_color_chooser_dialog_get_color           (HildonColorChooserDialog *dialog,
                                                  GdkColor *color);
 
+G_END_DECLS
+
 #endif                                          /* __HILDON_COLOR_CHOOSER_DIALOG_H__ */

diff --git a/src/hildon-color-chooser.h b/src/hildon-color-chooser.h
index b947665..0d0ef87 100644 (file)
--- a/src/hildon-color-chooser.h
+++ b/src/hildon-color-chooser.h
@@ -30,6 +30,8 @@
 #include                                        <gdk/gdkcolor.h>
 #include                                        <gtk/gtkwidget.h>
 
+G_BEGIN_DECLS
+
 #define                                         HILDON_TYPE_COLOR_CHOOSER \
                                                 (hildon_color_chooser_get_type())
 
@@ -78,4 +80,6 @@ void
 hildon_color_chooser_get_color                  (HildonColorChooser *chooser, 
                                                  GdkColor *color);
 
+G_END_DECLS
+
 #endif                                          /* __HILDON_COLOR_CHOOSER_H__ */