merge of '0c66b53f17f5196eb35fffef39265d813c870e1c'

     and 'e3eea2ab1eb9f03b1640b15f0943c4fec05494cb'

43 files changed, 661 insertions, 329 deletions

diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
new file mode 100644
index 0000000000..f1dca9d8e1
--- /dev/null
+++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
@@ -0,0 +1,202 @@
+diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconfig
+--- linux-2.6.24.orig/drivers/leds/Kconfig	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Kconfig	2008-02-08 08:12:01.000000000 +0100
+@@ -114,6 +114,12 @@
+ 	help
+ 	  This option enables support for the CM-X270 LEDs.
+ 
++config LEDS_MPC8313E_RDB
++	tristate "LED Support for MPC8313E-RDB LEDs"
++	depends on LEDS_CLASS && PPC_83xx
++	help
++	  This option enables support for the LEDs on MPC8313E-RDB board.
++
+ comment "LED Triggers"
+ 
+ config LEDS_TRIGGERS
+diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c
+--- linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c	2008-02-08 08:12:01.000000000 +0100
+@@ -0,0 +1,171 @@
++/*
++ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com>
++ * Copyright (C) 2007 Jeremy Laine <jeremy.laine@bolloretelecom.eu>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file COPYING in the main directory of this archive for
++ * more details.
++ *
++ * MPC8313E-RDB LEDs driver
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/ioport.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
++
++static struct platform_device *leds_pdev = NULL;
++static struct resource *led_mem = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0xff;
++
++struct mpc8313_led {
++	struct led_classdev cdev;
++	u8 bitmask;
++};
++
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
++{
++	struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++	if (value)
++		led_state &= ~led_dev->bitmask;
++	else
++		led_state |= led_dev->bitmask;
++	iowrite8(led_state, led_io);
++}
++
++static struct mpc8313_led mpc8313_leds[] = {
++	{
++		.cdev = {
++			.name		= "mpc8313:led0",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 1,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led1",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 2,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led2",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 4,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led3",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 8,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led4",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 16,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:green",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 32,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:yellow",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 64,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:red",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 128,
++	},
++};
++
++static int mpc8313leds_probe(struct platform_device *pdev)
++{
++	int i;
++	int ret;
++       
++	for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++		ret = led_classdev_register(&pdev->dev,
++			&mpc8313_leds[i].cdev);
++	}
++
++	if (ret < 0 && i > 1) {
++		for (i = i - 2; i >= 0; i--)
++			led_classdev_unregister(&mpc8313_leds[i].cdev);
++	}
++	
++	return ret;
++}
++
++static int mpc8313leds_remove(struct platform_device *pdev)
++{
++	int i;
++
++	for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++		led_classdev_unregister(&mpc8313_leds[i].cdev);
++	
++	return 0;
++}
++
++static struct platform_driver mpc8313leds_driver = {
++	.driver         = {
++		.name   = "mpc8313-leds",
++		.owner  = THIS_MODULE,
++	},
++	.probe          = mpc8313leds_probe,
++	.remove         = mpc8313leds_remove,
++};
++
++static int __init mpc8313leds_init(void)
++{
++	if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++		return -ENOMEM;
++	if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
++	{
++		release_mem_region(LEDS_BASE, LEDS_SIZE);
++		led_mem = NULL;
++		return -ENOMEM;
++	}
++	iowrite8(led_state, led_io);
++
++	leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
++
++	return platform_driver_register(&mpc8313leds_driver);
++}
++
++static void __exit mpc8313leds_exit(void)
++{
++	if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
++	led_mem = NULL;
++	platform_driver_unregister(&mpc8313leds_driver);
++
++	platform_device_unregister(leds_pdev);
++}
++
++module_init(mpc8313leds_init);
++module_exit(mpc8313leds_exit);
++
++MODULE_AUTHOR("Leon Woestenberg <leon@sidebranch.com>");
++MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
++MODULE_LICENSE("GPL");
+diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile
+--- linux-2.6.24.orig/drivers/leds/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Makefile	2008-02-08 08:12:38.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
+ obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
++obj-$(CONFIG_LEDS_MPC8313E_RDB)		+= leds-mpc8313e-rdb.o
+ 
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
new file mode 100644
index 0000000000..0307094675
--- /dev/null
+++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
@@ -0,0 +1,24 @@
+diff -urN linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts	2008-02-08 08:09:07.000000000 +0100
+@@ -52,12 +52,20 @@
+ 		};
+ 
+ 		i2c@3000 {
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 			device_type = "i2c";
+ 			compatible = "fsl-i2c";
+ 			reg = <3000 100>;
+ 			interrupts = <e 8>;
+ 			interrupt-parent = < &ipic >;
+ 			dfsrr;
++
++			rtc@68 {
++				device_type = "rtc";
++				compatible = "dallas,ds1339";
++				reg = <68>;
++			};
+ 		};
+ 
+ 		i2c@3100 {
diff --git a/packages/maemo4/hildon-1/buttonbox.patch b/packages/maemo4/hildon-1/buttonbox.patch
deleted file mode 100644
index cfea60d000..0000000000
--- a/packages/maemo4/hildon-1/buttonbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/hildon-code-dialog.c	2007-08-07 11:46:03.000000000 +0200
-+++ hildon-1/src/hildon-code-dialog.c	2007-08-07 11:46:16.468400000 +0200
-@@ -277,7 +277,7 @@
-     gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1);
-     dialog_action_area1 = GTK_DIALOG (dialog)->action_area;
-     gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
--            GTK_BUTTONBOX_CENTER);
-+            GTK_BUTTONBOX_DEFAULT);
- 
-     okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK,
-             GTK_RESPONSE_OK);
diff --git a/packages/maemo4/hildon-base-lib_0.11.1.bb b/packages/maemo4/hildon-base-lib_0.11.1.bb
deleted file mode 100644
index ce3f667a00..0000000000
--- a/packages/maemo4/hildon-base-lib_0.11.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "LGPL"
-
-DEPENDS = "gtk+ virtual/libx11"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/hildon-lgpl_0.12.1.bb b/packages/maemo4/hildon-lgpl_0.12.1.bb
deleted file mode 100644
index 02bbad9dd2..0000000000
--- a/packages/maemo4/hildon-lgpl_0.12.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "LGPL"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-4.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}	
-
diff --git a/packages/maemo4/hildon-libs_0.15.1.bb b/packages/maemo4/hildon-libs_0.15.1.bb
deleted file mode 100644
index 4c88d322ff..0000000000
--- a/packages/maemo4/hildon-libs_0.15.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon librares"
-
-DEPENDS = "gtk-doc-native libosso libmatchbox"
-
-PR = "r0"
-
-SRC_URI = "http://launchpadlibrarian.net/7598381/hildon-libs_0.15.1-1ubuntu2.tar.gz"
-
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/${PN}"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-        touch gtk-doc.make
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
-FILES_${PN} += "${libdir}/hildon-widgets/*"
-
diff --git a/packages/maemo4/hildon-thumbnail.inc b/packages/maemo4/hildon-thumbnail.inc
new file mode 100644
index 0000000000..46468e1ca1
--- /dev/null
+++ b/packages/maemo4/hildon-thumbnail.inc
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon thumbnail library"
+
+DEPENDS = "libhildonmime"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+
+	touch gtk-doc.make
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/hildon-thumbnail_0.11.bb b/packages/maemo4/hildon-thumbnail_0.11.bb
deleted file mode 100644
index 54646e7630..0000000000
--- a/packages/maemo4/hildon-thumbnail_0.11.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon thumbnail library"
-
-DEPENDS = "libhildonmime hildon-libs osso-thumbnail"
-
-PR = "r0"
-
-SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/h/${PN}/${PN}_${PV}.tar.gz \
-          "
-
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/${PV}"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-        touch gtk-doc.make
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/hildon-thumbnail_0.14.bb b/packages/maemo4/hildon-thumbnail_0.14.bb
new file mode 100644
index 0000000000..adc52b3912
--- /dev/null
+++ b/packages/maemo4/hildon-thumbnail_0.14.bb
@@ -0,0 +1,10 @@
+require hildon-thumbnail.inc
+
+DEPENDS = "libhildon libosso"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/h/${PN}/${PN}_${PV}.tar.gz \
+          "
+
+
diff --git a/packages/maemo4/libconic/dbus-api-update.patch b/packages/maemo4/libconic/dbus-api-update.patch
deleted file mode 100644
index 3542cecae8..0000000000
--- a/packages/maemo4/libconic/dbus-api-update.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /tmp/conicconnection.c	2007-11-12 12:45:37.000000000 +0100
-+++ libconic-0.13/conic/conicconnection.c	2007-11-12 12:46:04.663234000 +0100
-@@ -473,7 +473,7 @@
- 							  ICD_DBUS_PATH,
- 							  &icd_vtable,
- 							  NULL)) {
--			dbus_connection_disconnect(dbus_connection);
-+			dbus_connection_close(dbus_connection);
- 			dbus_connection_unref(dbus_connection);
- 			dbus_connection = NULL;
- 		}
---- /tmp/Makefile.am	2007-11-12 12:47:22.000000000 +0100
-+++ libconic-0.13/Makefile.am	2007-11-12 12:47:29.773234000 +0100
-@@ -1,4 +1,4 @@
--SUBDIRS = conic tests
-+SUBDIRS = conic 
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = conic.pc
diff --git a/packages/maemo4/libconic_0.13.bb b/packages/maemo4/libconic_0.13.bb
index 511abb70cc..5f57cf77b1 100644
--- a/packages/maemo4/libconic_0.13.bb
+++ b/packages/maemo4/libconic_0.13.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "Internet connection library"
 LICENSE = "LGPL"
-DEPENDS = "dbus-glib gconf"
+DEPENDS = "dbus gconf osso-ic-oss"
+
+PR = "r1"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libc/${PN}/${PN}_${PV}-0.8.tar.gz"
 
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
-           file://dbus-api-update.patch;patch=1"
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+	autotools_stage_all
 }
 
 
diff --git a/packages/maemo4/libgpsbt_0.1.bb b/packages/maemo4/libgpsbt_0.1.bb
index 59d0db9fbc..beca783a0b 100644
--- a/packages/maemo4/libgpsbt_0.1.bb
+++ b/packages/maemo4/libgpsbt_0.1.bb
@@ -1,7 +1,9 @@
 LICENSE = "nokia"
 
-DEPENDS = "libgpsmgr dbus-glib"
+DEPENDS = "libgpsmgr dbus"
 
+# This is proprietary software in Chinook, so we have to stay with the last released
+# free version.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-18.tar.gz"
 
 inherit autotools pkgconfig
diff --git a/packages/maemo4/libgpsmgr_0.1.bb b/packages/maemo4/libgpsmgr_0.1.bb
index f0fc14bae9..bcbb4cefcb 100644
--- a/packages/maemo4/libgpsmgr_0.1.bb
+++ b/packages/maemo4/libgpsmgr_0.1.bb
@@ -1,11 +1,13 @@
 LICENSE = "nokia"
 
+# This is proprietary software in Chinook, so we have to stay with the last released
+# free version.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-10.tar.gz"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+  autotools_stage_all
 }
 
 
diff --git a/packages/maemo4/hildon-1_svn.bb b/packages/maemo4/libhildon.inc
index 27b0443d79..bab16cf062 100644
--- a/packages/maemo4/hildon-1_svn.bb
+++ b/packages/maemo4/libhildon.inc
@@ -3,17 +3,10 @@ LICENSE = "LGPL"
 
 DEPENDS = "gconf-dbus esound gtk+"
 
-PV = "1.0.17+svnr${SRCREV}"
-
-SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \
-           file://buttonbox.patch;patch=1;maxrev=14173 "
-S = "${WORKDIR}/hildon-1"
-
 inherit autotools pkgconfig lib_package
 
 EXTRA_OECONF = "--with-maemo-gtk=no"
 
-
 do_stage() {
         autotools_stage_all
 }
diff --git a/packages/maemo4/hildon-1/.mtn2git_empty b/packages/maemo4/libhildon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/maemo4/hildon-1/.mtn2git_empty
+++ b/packages/maemo4/libhildon/.mtn2git_empty
diff --git a/packages/maemo4/libhildon/libhildon-buildfix.patch b/packages/maemo4/libhildon/libhildon-buildfix.patch
new file mode 100644
index 0000000000..b9a669c76a
--- /dev/null
+++ b/packages/maemo4/libhildon/libhildon-buildfix.patch
@@ -0,0 +1,16 @@
+Index: libhildon-1.99.0/src/hildon-code-dialog.c
+===================================================================
+--- libhildon-1.99.0.orig/src/hildon-code-dialog.c	2007-10-10 15:03:09.000000000 +0200
++++ libhildon-1.99.0/src/hildon-code-dialog.c	2008-02-13 13:54:47.000000000 +0100
+@@ -302,7 +302,11 @@
+     gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1);
+     dialog_action_area1 = GTK_DIALOG (dialog)->action_area;
+     gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
++#if defined (MAEMO_GTK)
+             GTK_BUTTONBOX_CENTER);
++#else
++            GTK_BUTTONBOX_DEFAULT_STYLE);
++#endif
+ 
+     okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK,
+             GTK_RESPONSE_OK);
diff --git a/packages/maemo4/libhildon_1.99.0.bb b/packages/maemo4/libhildon_1.99.0.bb
new file mode 100644
index 0000000000..4757d140b2
--- /dev/null
+++ b/packages/maemo4/libhildon_1.99.0.bb
@@ -0,0 +1,11 @@
+require libhildon.inc
+
+DEPENDS += "libpng libxt libxi"
+
+SRC_URI = "\
+  http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz \
+  file://libhildon-buildfix.patch;patch=1 \
+  "
+
+
+
diff --git a/packages/maemo4/libhildonfm.inc b/packages/maemo4/libhildonfm.inc
new file mode 100644
index 0000000000..b6c20a4499
--- /dev/null
+++ b/packages/maemo4/libhildonfm.inc
@@ -0,0 +1,22 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "gtk+ libxi libxt libpng gconf dbus libosso libhildon hildon-thumbnail libhildonmime osso-gwconnect mce-dev"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+
+	touch gtk-doc.make
+}
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+	autotools_stage_all
+	ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
+}
+
+
diff --git a/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff b/packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch
index 8d91e1dd65..6af13d24bf 100644
--- a/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff
+++ b/packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch
@@ -1,5 +1,50 @@
---- /tmp/hildon-file-selection.c	2007-10-02 10:08:17.000000000 +0200
-+++ 1_1.9.41/hildon-fm/hildon-file-selection.c	2007-10-02 11:26:58.292045000 +0200
+Index: libhildonfm-1.9.46/hildon-fm/hildon-file-chooser-dialog.c
+===================================================================
+--- libhildonfm-1.9.46.orig/hildon-fm/hildon-file-chooser-dialog.c	2007-10-16 10:11:59.000000000 +0200
++++ libhildonfm-1.9.46/hildon-fm/hildon-file-chooser-dialog.c	2008-02-14 08:24:41.000000000 +0100
+@@ -192,6 +192,7 @@
+   return (first_digit << 4) | second_digit;
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+                                             GtkInvalidInputType inv_type,
+                                             gpointer user_data)
+@@ -202,6 +203,7 @@
+                                     HCS("ckdg_ib_maximum_characters_reached"));
+   }
+ }
++#endif
+ 
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+@@ -1838,7 +1840,9 @@
+     g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+ 
+ 
++#ifdef USE_MAEMO_GTK
+     hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+ 
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1979,10 @@
+           g_signal_connect( priv->entry_name, "changed",
+                           G_CALLBACK( hildon_file_chooser_entry_changed ),
+                           self );
+-
++#ifdef USE_MAEMO_GTK
+     g_signal_connect(priv->entry_name, "invalid-input",
+                      G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif
+     priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->image_location = gtk_image_new();
+Index: libhildonfm-1.9.46/hildon-fm/hildon-file-selection.c
+===================================================================
+--- libhildonfm-1.9.46.orig/hildon-fm/hildon-file-selection.c	2007-10-16 10:11:59.000000000 +0200
++++ libhildonfm-1.9.46/hildon-fm/hildon-file-selection.c	2008-02-14 08:21:31.000000000 +0100
 @@ -2036,6 +2036,7 @@
      g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
  }
@@ -12,7 +57,7 @@
      ULOG_DEBUG(__FUNCTION__);
      g_signal_emit(data, signal_content_pane_context_menu, 0);
  }
-+#endif /* USE_MAEMO_GTK */
++#endif
  
  static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
                                                            widget,
@@ -24,16 +69,15 @@
  static gboolean
  tap_and_hold_query (gpointer self, guint signal_id)
  {
-@@ -2225,6 +2228,8 @@
+@@ -2224,6 +2227,7 @@
+ {
    return tap_and_hold_query (self, signal_navigation_pane_context_menu);
  }
++#endif
  
-+#endif /* USE_MAEMO_GTK */
-+
  static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
                                                          * self)
- {
-@@ -2277,7 +2282,7 @@
+@@ -2277,7 +2281,7 @@
      g_signal_connect_object(tree, "key-press-event",
                       G_CALLBACK(hildon_file_selection_on_content_pane_key),
                       self, 0);
@@ -42,15 +86,16 @@
      gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
                                    GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
      g_signal_connect_object (tree, "tap-and-hold-query",
-@@ -2286,6 +2291,7 @@
+@@ -2286,7 +2290,7 @@
      g_signal_connect_object(tree, "tap-and-hold",
                       G_CALLBACK
                       (hildon_file_selection_content_pane_context), self, 0);
-+#endif /* USE_MAEMO_GTK */
- 
+-
++#endif
      g_signal_connect_object(tree, "notify::has-focus",
                       G_CALLBACK(content_pane_focus), self, 0);
-@@ -2397,7 +2403,7 @@
+ }
+@@ -2397,7 +2401,7 @@
          (selection, "changed",
           G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
           self, 0);
@@ -59,16 +104,16 @@
      gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
                                    GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
      g_signal_connect_object (tree, "tap-and-hold-query",
-@@ -2406,7 +2412,7 @@
+@@ -2406,7 +2410,7 @@
      g_signal_connect_object(tree, "tap-and-hold",
                       G_CALLBACK
                       (hildon_file_selection_content_pane_context), self, 0);
 -
-+#endif /* USE_MAEMO_GTK */
++#endif
      g_signal_connect_object(tree, "key-press-event",
                       G_CALLBACK(hildon_file_selection_on_content_pane_key),
                       self, 0);
-@@ -2492,7 +2498,7 @@
+@@ -2492,7 +2496,7 @@
      g_signal_connect_object(selection, "changed",
                       G_CALLBACK(hildon_file_selection_selection_changed),
                       self, 0);
@@ -77,56 +122,12 @@
      gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
                                    NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
      g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
-@@ -2502,7 +2508,7 @@
+@@ -2502,7 +2506,7 @@
                       G_CALLBACK
                       (hildon_file_selection_navigation_pane_context),
                       self, 0);
 -
-+#endif /* USE_MAEMO_GTK */
++#endif
      g_signal_connect_ob