[maemo-commits] [maemo-commits] r8599 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk tests

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Dec 4 17:08:57 EET 2006 
Author: tko
Date: 2006-12-04 17:08:56 +0200 (Mon, 04 Dec 2006)
New Revision: 8599

Added:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/Makefile.am
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtk.symbols
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserprivate.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystemmodel.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/tests/autotestfilechooser.c
Log:
Export enough symbols for implementing GtkFileChooser interface outside gtk.

2006-12-04  Tommi Komulainen  <tommi.komulainen at nokia.com>

	Export enough symbols for implementing GtkFileChooser interface
	outside gtk.

	* gtk/gtk.symbols: add hildon_gtk_file_chooser_install_properties
	* gtk/Makefile.am (INCLUDES): add -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
	(gtk_private_h_sources, gtk_semi_private_h_sources): export
	gtkfilesystemmodel.h, gtkfilechooserprivate.h, and
	gtkfilechooserutils.h as semi-private
	* gtk/gtkfilechooserutils.c
	(hildon_gtk_file_chooser_install_properties): add exported version of 
	_gtk_file_chooser_install_properties
	* gtk/gtkfilesystemmodel.h: add GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
	#ifdef guard
	* gtk/gtkfilechooserprivate.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
	#ifdef guard
	* gtk/gtkfilechooserutils.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
	#ifdef guard, declare hildon_gtk_file_chooser_install_properties

	* tests/autotestfilechooser.c: build with
	GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED


Added: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2006-12-04 15:08:56 UTC (rev 8599)
@@ -0,0 +1,22 @@
+2006-12-04  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	Export enough symbols for implementing GtkFileChooser interface
+	outside gtk.
+
+	* gtk/gtk.symbols: add hildon_gtk_file_chooser_install_properties
+	* gtk/Makefile.am (INCLUDES): add -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+	(gtk_private_h_sources, gtk_semi_private_h_sources): export
+	gtkfilesystemmodel.h, gtkfilechooserprivate.h, and
+	gtkfilechooserutils.h as semi-private
+	* gtk/gtkfilechooserutils.c
+	(hildon_gtk_file_chooser_install_properties): add exported version of 
+	_gtk_file_chooser_install_properties
+	* gtk/gtkfilesystemmodel.h: add GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+	#ifdef guard
+	* gtk/gtkfilechooserprivate.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+	#ifdef guard
+	* gtk/gtkfilechooserutils.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+	#ifdef guard, declare hildon_gtk_file_chooser_install_properties
+
+	* tests/autotestfilechooser.c: build with
+	GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/Makefile.am
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/Makefile.am	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/Makefile.am	2006-12-04 15:08:56 UTC (rev 8599)
@@ -33,6 +33,7 @@
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
+	-DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED		\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\
@@ -328,7 +329,10 @@
 # that are not included in gtk/gtk.h
 gtk_semi_private_h_sources =    \
 	gtktextlayout.h		\
-	gtkfilesystem.h
+	gtkfilesystem.h		\
+	gtkfilesystemmodel.h	\
+	gtkfilechooserprivate.h	\
+	gtkfilechooserutils.h
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =		\
@@ -337,10 +341,7 @@
 	gtkfilechooserdefault.h	\
 	gtkfilechooserembed.h	\
 	gtkfilechooserentry.h	\
-	gtkfilechooserprivate.h	\
 	gtkfilechoosersettings.h \
-	gtkfilechooserutils.h	\
-	gtkfilesystemmodel.h	\
 	gtkfilesystemunix.h	\
 	gtkhsv.h		\
 	gtkiconcache.h		\

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtk.symbols
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtk.symbols	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtk.symbols	2006-12-04 15:08:56 UTC (rev 8599)
@@ -1363,6 +1363,12 @@
 #endif
 #endif
 
+#if IN_HEADER(__GTK_FILE_CHOOSER_UTILS_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_UTILS_C__)
+hildon_gtk_file_chooser_install_properties
+#endif
+#endif
+
 #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
 #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
 gtk_file_chooser_widget_get_type G_GNUC_CONST

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserprivate.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserprivate.h	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserprivate.h	2006-12-04 15:08:56 UTC (rev 8599)
@@ -21,6 +21,14 @@
 #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
 #define __GTK_FILE_CHOOSER_PRIVATE_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 "gtkfilechooserprivate.h is not supported API for general use"
+#endif
+
 #include "gtkfilechooser.h"
 #include "gtkfilesystem.h"
 #include "gtkfilesystemmodel.h"

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.c	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.c	2006-12-04 15:08:56 UTC (rev 8599)
@@ -119,6 +119,12 @@
 				    "do-overwrite-confirmation");
 }
 
+void
+hildon_gtk_file_chooser_install_properties (GObjectClass *klass)
+{
+  _gtk_file_chooser_install_properties (klass);
+}
+
 /**
  * _gtk_file_chooser_delegate_iface_init:
  * @iface: a #GtkFileChoserIface structure
@@ -360,3 +366,6 @@
   g_signal_emit_by_name (data, "confirm-overwrite", &conf);
   return conf;
 }
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.h	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilechooserutils.h	2006-12-04 15:08:56 UTC (rev 8599)
@@ -22,6 +22,14 @@
 #ifndef __GTK_FILE_CHOOSER_UTILS_H__
 #define __GTK_FILE_CHOOSER_UTILS_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 "gtkfilechooserutils.h is not supported API for general use"
+#endif
+
 #include "gtkfilechooserprivate.h"
 
 G_BEGIN_DECLS
@@ -45,6 +53,7 @@
 } GtkFileChooserProp;
 
 void _gtk_file_chooser_install_properties (GObjectClass *klass);
+void hildon_gtk_file_chooser_install_properties (GObjectClass *klass);
 
 void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
 void _gtk_file_chooser_set_delegate        (GtkFileChooser *receiver,

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystemmodel.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystemmodel.h	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystemmodel.h	2006-12-04 15:08:56 UTC (rev 8599)
@@ -21,6 +21,10 @@
 #ifndef __GTK_FILE_SYSTEM_MODEL_H__
 #define __GTK_FILE_SYSTEM_MODEL_H__
 
+#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+#error "GtkFileSystemModel is not supported API for general use"
+#endif
+
 #include <glib-object.h>
 #include "gtkfilesystem.h"
 #include <gtk/gtktreemodel.h>

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/tests/autotestfilechooser.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/tests/autotestfilechooser.c	2006-12-04 15:06:41 UTC (rev 8598)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/tests/autotestfilechooser.c	2006-12-04 15:08:56 UTC (rev 8599)
@@ -30,6 +30,7 @@
  */
 
 #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
 
 #include <config.h>
 #include <string.h>
More information about the maemo-commits mailing list