[maemo-commits] [maemo-commits] r18627 - in projects/haf/trunk/gtkfilesystemmemory: . gtkfilesystemmemory gtkfilesystemmemorypublic

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-06-05 16:08:31 +0300 (Fri, 05 Jun 2009)
New Revision: 18627

Modified:
   projects/haf/trunk/gtkfilesystemmemory/ChangeLog
   projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemory.c
   projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemoryprivate.h
   projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemory.h
   projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemorypublic.c
Log:
2009-06-05  Claudio Saavedra  <csaavedra at igalia.com>

	* configure.ac: Depend on hildon-fm-2.
	* gtkfilesystemmemory/gtkfilesystemmemory.c:
	* gtkfilesystemmemory/gtkfilesystemmemoryprivate.h:
	* gtkfilesystemmemorypublic/gtkfilesystemmemory.h:
	* gtkfilesystemmemorypublic/gtkfilesystemmemorypublic.c: Get
	the gtkfilesystem.h header from hildon-fm-2, since GTK+ 2.14 doesn't
	include it anymore.



Modified: projects/haf/trunk/gtkfilesystemmemory/ChangeLog
===================================================================
--- projects/haf/trunk/gtkfilesystemmemory/ChangeLog	2009-06-05 11:40:13 UTC (rev 18626)
+++ projects/haf/trunk/gtkfilesystemmemory/ChangeLog	2009-06-05 13:08:31 UTC (rev 18627)
@@ -1,3 +1,13 @@
+2009-06-05  Claudio Saavedra  <csaavedra at igalia.com>
+
+	* configure.ac: Depend on hildon-fm-2.
+	* gtkfilesystemmemory/gtkfilesystemmemory.c:
+	* gtkfilesystemmemory/gtkfilesystemmemoryprivate.h:
+	* gtkfilesystemmemorypublic/gtkfilesystemmemory.h:
+	* gtkfilesystemmemorypublic/gtkfilesystemmemorypublic.c: Get
+	the gtkfilesystem.h header from hildon-fm-2, since GTK+ 2.14 doesn't
+	include it anymore.
+
 2009-01-15  Richard Sun  <richard.sun at nokia.com>
 
 	Release 0.18

Modified: projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemory.c
===================================================================
--- projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemory.c	2009-06-05 11:40:13 UTC (rev 18626)
+++ projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemory.c	2009-06-05 13:08:31 UTC (rev 18627)
@@ -31,7 +31,7 @@
 
 #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
 
-#include <gtk/gtkfilesystem.h>
+#include <hildon-fm-2/hildon/gtkfilesystem/gtkfilesystem.h>
 
 #include "gtkfilesystemmemoryprivate.h"
 #include "../gtkfilesystemmemorypublic/gtkfilesystemmemory.h"

Modified: projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemoryprivate.h
===================================================================
--- projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemoryprivate.h	2009-06-05 11:40:13 UTC (rev 18626)
+++ projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemory/gtkfilesystemmemoryprivate.h	2009-06-05 13:08:31 UTC (rev 18627)
@@ -30,12 +30,10 @@
 G_BEGIN_DECLS
 
 
-#include <gtk/gtktreestore.h>
-
 #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
 #undef __GNUC__
 
-#include <gtk/gtkfilesystem.h>
+#include <hildon-fm-2/hildon/gtkfilesystem/gtkfilesystem.h>
 
 #define GTK_TYPE_FILE_SYSTEM_MEMORY (gtk_file_system_memory_get_type ())
 #define GTK_FILE_SYSTEM_MEMORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM_MEMORY, GtkFileSystemMemory))

Modified: projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemory.h
===================================================================
--- projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemory.h	2009-06-05 11:40:13 UTC (rev 18626)
+++ projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemory.h	2009-06-05 13:08:31 UTC (rev 18627)
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#include <gtk/gtkfilesystem.h>
+#include <hildon-fm-2/hildon/gtkfilesystem/gtkfilesystem.h>
 #undef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
 
 G_BEGIN_DECLS

Modified: projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemorypublic.c
===================================================================
--- projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemorypublic.c	2009-06-05 11:40:13 UTC (rev 18626)
+++ projects/haf/trunk/gtkfilesystemmemory/gtkfilesystemmemorypublic/gtkfilesystemmemorypublic.c	2009-06-05 13:08:31 UTC (rev 18627)
@@ -31,7 +31,7 @@
 #undef __GNUC__ /* This is needed because compile option -pedantic
                    disables GNU extensions and code don't detect this */
 
-#include <gtk/gtkfilesystem.h>
+#include <hildon-fm-2/hildon/gtkfilesystem/gtkfilesystem.h>
 
 #include "../gtkfilesystemmemory/gtkfilesystemmemoryprivate.h"
 #include "gtkfilesystemmemory.h"