[maemo-commits] [maemo-commits] r15917 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2008-08-29 11:59:57 +0300 (Fri, 29 Aug 2008)
New Revision: 15917

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/Makefile.am
   projects/haf/trunk/gtk+/gtk/gtkquery.h
   projects/haf/trunk/gtk+/gtk/gtksearchengine.h
Log:
2008-08-29 10:55:06  Tim Janik  <timj at imendio.com>

	Applied patch from Kristian Rietveld to fix inclusion of
	gtkfilechooserprivate.h in Gtk+ applications, by installing neccessary
	new include files.

	* gtk/gtkquery.h, gtk/gtksearchengine.h: guard against direct inclusion.

	* gtk/Makefile.am: install gtkquery.h and gtksearchengine.h.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-08-29 07:25:24 UTC (rev 15916)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-08-29 08:59:57 UTC (rev 15917)
@@ -1,3 +1,13 @@
+2008-08-29 10:55:06  Tim Janik  <timj at imendio.com>
+
+	Applied patch from Kristian Rietveld to fix inclusion of
+	gtkfilechooserprivate.h in Gtk+ applications, by installing neccessary
+	new include files.
+
+	* gtk/gtkquery.h, gtk/gtksearchengine.h: guard against direct inclusion.
+
+	* gtk/Makefile.am: install gtkquery.h and gtksearchengine.h.
+
 2008-08-12  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 
 	Released 2:2.12.9-0osso4

Modified: projects/haf/trunk/gtk+/gtk/Makefile.am
===================================================================
--- projects/haf/trunk/gtk+/gtk/Makefile.am	2008-08-29 07:25:24 UTC (rev 15916)
+++ projects/haf/trunk/gtk+/gtk/Makefile.am	2008-08-29 08:59:57 UTC (rev 15917)
@@ -342,6 +342,8 @@
 # Installed header files without compatibility guarantees
 # that are not included in gtk/gtk.h
 gtk_semi_private_h_sources =    \
+	gtkquery.h		\
+	gtksearchengine.h	\
 	gtktextlayout.h		\
 	gtkfilesystem.h		\
 	gtkfilesystemmodel.h	\
@@ -350,8 +352,6 @@
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =		\
-	gtkquery.h		\
-	gtksearchengine.h	\
 	gtksearchenginebeagle.h	\
 	gtksearchenginetracker.h\
 	gtksearchenginesimple.h	\

Modified: projects/haf/trunk/gtk+/gtk/gtkquery.h
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkquery.h	2008-08-29 07:25:24 UTC (rev 15916)
+++ projects/haf/trunk/gtk+/gtk/gtkquery.h	2008-08-29 08:59:57 UTC (rev 15917)
@@ -23,6 +23,14 @@
 #ifndef __GTK_QUERY_H__
 #define __GTK_QUERY_H__
 
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkFileChooser implementations; no stability guarantees 
+ * are made at this point
+ */
+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+#error "gtkquery.h is not supported API for general use"
+#endif
+
 #include <glib-object.h>
 
 G_BEGIN_DECLS

Modified: projects/haf/trunk/gtk+/gtk/gtksearchengine.h
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtksearchengine.h	2008-08-29 07:25:24 UTC (rev 15916)
+++ projects/haf/trunk/gtk+/gtk/gtksearchengine.h	2008-08-29 08:59:57 UTC (rev 15917)
@@ -23,6 +23,14 @@
 #ifndef __GTK_SEARCH_ENGINE_H__
 #define __GTK_SEARCH_ENGINE_H__
 
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkFileChooser implementations; no stability guarantees 
+ * are made at this point
+ */
+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+#error "gtksearchengine.h is not supported API for general use"
+#endif
+
 #include <glib-object.h>
 #include "gtkquery.h"