[maemo-commits] [maemo-commits] r15772 - in projects/haf/trunk/hildon-1: . debian src

[From: subversion at stage.maemo.org]

Author: klattimer
Date: 2008-07-14 14:11:39 +0300 (Mon, 14 Jul 2008)
New Revision: 15772

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/debian/changelog
   projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.h
   projects/haf/trunk/hildon-1/src/hildon-color-chooser.h
Log:
 * 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++



Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-07-14 10:40:27 UTC (rev 15771)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-07-14 11:11:39 UTC (rev 15772)
@@ -1,3 +1,10 @@
+2008-07-04  Johannes Schmid  <johannes.schmid at 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 at imendio.com>
 
 	Merge change from hildon-widgets which makes hildon-1 build

Modified: projects/haf/trunk/hildon-1/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-1/debian/changelog	2008-07-14 10:40:27 UTC (rev 15771)
+++ projects/haf/trunk/hildon-1/debian/changelog	2008-07-14 11:11:39 UTC (rev 15772)
@@ -1,5 +1,14 @@
-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 at 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
     But resolves another variant of: Bug 83953
@@ -16,7 +25,7 @@
 
  -- Natalia Dobrovolskaya <natalia.dobrovolskaya at 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

Modified: projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.h
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.h	2008-07-14 10:40:27 UTC (rev 15771)
+++ projects/haf/trunk/hildon-1/src/hildon-color-chooser-dialog.h	2008-07-14 11:11:39 UTC (rev 15772)
@@ -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 @@
 hildon_color_chooser_dialog_get_color           (HildonColorChooserDialog *dialog,
                                                  GdkColor *color);
 
+G_END_DECLS
+
 #endif                                          /* __HILDON_COLOR_CHOOSER_DIALOG_H__ */

Modified: projects/haf/trunk/hildon-1/src/hildon-color-chooser.h
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-color-chooser.h	2008-07-14 10:40:27 UTC (rev 15771)
+++ projects/haf/trunk/hildon-1/src/hildon-color-chooser.h	2008-07-14 11:11:39 UTC (rev 15772)
@@ -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 @@
 hildon_color_chooser_get_color                  (HildonColorChooser *chooser, 
                                                  GdkColor *color);
 
+G_END_DECLS
+
 #endif                                          /* __HILDON_COLOR_CHOOSER_H__ */