merge of '9e8c127f2df600ab15261c110bde36827b5a4a3a'

     and 'f35c147cdfeae0339a8026ad6c1f95a69c097843'

6 files changed, 217 insertions, 32 deletions

diff --git a/packages/gpephone/libim-0.1/.mtn2git_empty b/packages/gpephone/libim-0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libim-0.1/.mtn2git_empty
diff --git a/packages/gpephone/libim-0.1/im-dbus-segfault.patch b/packages/gpephone/libim-0.1/im-dbus-segfault.patch
new file mode 100644
index 0000000000..3ef6cd909d
--- /dev/null
+++ b/packages/gpephone/libim-0.1/im-dbus-segfault.patch
@@ -0,0 +1,179 @@
+Index: test/im_proxy.c
+===================================================================
+--- test/im_proxy.c	(Revision 550)
++++ test/im_proxy.c	(Arbeitskopie)
+@@ -26,7 +26,7 @@
+ 
+   open_log_file (IM_DBUS_LOG_FILE);
+ 
+-  bus_conn = dbus_init ();
++  bus_conn = dbus_init_im ();
+   if (!bus_conn)
+   {
+     close_log_file ();
+Index: src/dbus-if.h
+===================================================================
+--- src/dbus-if.h	(Revision 550)
++++ src/dbus-if.h	(Arbeitskopie)
+@@ -25,7 +25,7 @@
+ 
+ #include <dbus/dbus.h>
+ 
+-DBusConnection *dbus_init (void);
++DBusConnection *dbus_init_im (void);
+ void dbus_add_msg_listener (const gchar *interface, const gchar *method,
+                             void (*callback) ());
+ 
+Index: src/im_client_dbus.c
+===================================================================
+--- src/im_client_dbus.c	(Revision 550)
++++ src/im_client_dbus.c	(Arbeitskopie)
+@@ -63,7 +63,6 @@
+  *
+  *@note for inner usage only.
+  */
+-// static DBusMessageIter *_pIter = NULL;
+ 
+ evt_src_t *im_evt_src = NULL;
+ 
+@@ -116,7 +115,6 @@
+   char *cdata;
+   im_presence_t *presence;
+ 
+-  //im_uri_t*user;
+   char *cuser;
+   char *desc;
+   im_presence_state_t state;
+@@ -165,7 +163,6 @@
+   prtl = tdata;
+   g_print ("=============|-evt_data: protocol = %d\n", tdata);
+ 
+-  //  im_uri_new(cuser, prtl, &user);
+   im_presence_new (prtl, NULL, &presence);
+   im_presence_set_from (presence, cuser);
+   im_presence_set_state (presence, state);
+@@ -569,20 +566,12 @@
+ _im_evt_get (evt_src_t *evt_src,
+              sid_t sid, evt_t **evt, int timeout, DBusMessageIter *pIter)
+ {
+-//   int a[10240];
+   dbus_int32_t tdata;
+   evt_type_t evt_type = -1;
+   evt_data_free_t evt_data_free = NULL;
+   int asynch = 0;
+   evt_err_t rt = EVT_ERROR_NONE;
+ 
+-//   int b[10240];
+-
+-/*  a[0] = 1;
+-  a[10239] = 2;
+-  b[0] = 3;
+-  b[10239] = 4;*/
+-//   g_print("=============in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+   dbus_message_iter_next (pIter);
+   if (dbus_message_iter_get_arg_type (pIter) != DBUS_TYPE_INT32)
+     return IM_ERROR_DBUS;
+@@ -671,51 +660,37 @@
+   if (asynch)
+   {
+     rt = im_client_incoming_asyn_handle (pIter, evt);
+-//     g_print("in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+   }
+   else
+   {
+     rt = im_client_incoming_evt_handle (pIter, evt);
+-//     g_print("in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+   }
+-//   g_print("in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+-//   printf("++++++++++%d\n", rt);
+-//   printf("%d %d %d %d\n",a[0], a[10239], b[0], b[10239]);
+   return rt;
+-//   return EVT_ERROR_NONE;
+ };
+ 
+-// G_LOCK_DEFINE(_pIter);
+ 
+ void
+ im_client_incoming_evt (DBusMessage *message)
+ {
+   DBusMessageIter iter;
+ 
+-//   G_LOCK(_pIter);
+-//   _pIter = &iter;
+   dbus_message_iter_init (message, &iter);
+   if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_UINT32)
+   {
+     dbus_uint32_t sid;
+ 
+     dbus_message_iter_get_basic (&iter, &sid);  //get sid
+-    //evt_process(im_evt_src, sid, -1);
+     evt_t *evt = NULL;
+ 
+     if (_im_evt_get (im_evt_src, sid, &evt, -1, &iter) != EVT_ERROR_NONE)
+     {
+-//       g_print("=============in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+       g_message ("Error when receiving event: %s:%s %d\n", __FILE__,
+                  __FUNCTION__, __LINE__);
+       return;
+     }
+-//     g_print("=============in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+     evt_call (im_evt_src, evt);
+     evt_release (im_evt_src, evt);
+   }
+-//   _pIter = NULL;
+-//   G_UNLOCK(_pIter);
+ }
+ 
+ im_err_t
+@@ -759,7 +734,7 @@
+ {
+   im_err_t rt = IM_ERROR_NONE;
+ 
+-  bus_conn = dbus_init ();
++  bus_conn = dbus_init_im ();
+   if (!bus_conn)
+   {
+     return IM_ERROR_DBUS;
+@@ -789,8 +764,6 @@
+   DBusMessage *message = NULL;
+   DBusMessage *reply = NULL;
+ 
+-  // int result;
+-
+   dbus_error_init (&error);
+ 
+   message = dbus_message_new_method_call (IM_DBUS_SERVICE,
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(Revision 550)
++++ src/Makefile.am	(Arbeitskopie)
+@@ -1,7 +1,7 @@
+ 
+ 
+ # set the include path found by configure
+-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include \
++INCLUDES = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/include \
+ 	-I$(top_srcdir)/src/log -I$(top_srcdir)/src/xmpp $(all_includes)
+ 
+ # the library search path.
+Index: src/dbus-if.c
+===================================================================
+--- src/dbus-if.c	(Revision 550)
++++ src/dbus-if.c	(Arbeitskopie)
+@@ -118,7 +118,7 @@
+ }
+ 
+ DBusConnection *
+-dbus_init (void)
++dbus_init_im (void)
+ {
+   DBusError error;
+   GMainLoop *mainloop;
+@@ -140,7 +140,6 @@
+ 
+   dbus_connection_add_filter (bus, msg_filter, mainloop, NULL);
+   g_main_loop_unref (mainloop);
+-
+   return bus;
+ }
+ 
diff --git a/packages/gpephone/libim_0.1.bb b/packages/gpephone/libim_0.1.bb
index 4d59957d79..5458f510aa 100644
--- a/packages/gpephone/libim_0.1.bb
+++ b/packages/gpephone/libim_0.1.bb
@@ -3,11 +3,12 @@ DESCRIPTION = "LiPS event model library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent"
-PR          = "r0"
+PR          = "r1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "${GPEPHONE_MIRROR}/${P}/lips_im-${PV}.tar.gz"
+SRC_URI = "${GPEPHONE_MIRROR}/${P}/lips_im-${PV}.tar.gz \
+           file://im-dbus-segfault.patch;patch=1;pnum=0"
 
 EXTRA_OECONF = "--with-session-bus-services-dir=${datadir}/dbus-1/services"
 
diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch
index cbc2272eb2..3f28d9eace 100644
--- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch
+++ b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch
@@ -1,6 +1,6 @@
 diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kconfig
---- linux-2.6.20.vanilla/drivers/mfd/Kconfig	2007-02-09 18:27:41.000000000 +0100
-+++ linux-2.6.20/drivers/mfd/Kconfig	2007-02-09 19:29:23.000000000 +0100
+--- linux-2.6.20.vanilla/drivers/mfd/Kconfig	2007-02-10 19:01:56.000000000 +0100
++++ linux-2.6.20/drivers/mfd/Kconfig	2007-02-14 16:30:15.000000000 +0100
 @@ -23,4 +23,7 @@
  	tristate "Touchscreen interface support"
  	depends on MCP_UCB1200 && INPUT
@@ -10,8 +10,8 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kcon
 +        depends on MCP_UCB1200 && INPUT
  endmenu
 diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Makefile
---- linux-2.6.20.vanilla/drivers/mfd/Makefile	2007-02-09 18:27:41.000000000 +0100
-+++ linux-2.6.20/drivers/mfd/Makefile	2007-02-09 19:29:23.000000000 +0100
+--- linux-2.6.20.vanilla/drivers/mfd/Makefile	2007-02-10 19:01:56.000000000 +0100
++++ linux-2.6.20/drivers/mfd/Makefile	2007-02-14 16:30:15.000000000 +0100
 @@ -6,7 +6,7 @@
  obj-$(CONFIG_MCP_SA11X0)	+= mcp-sa11x0.o
  obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-core.o
@@ -23,8 +23,8 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Mak
  endif
 diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drivers/mfd/ucb1x00-switches.c
 --- linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c	2007-02-09 19:30:34.000000000 +0100
-@@ -0,0 +1,200 @@
++++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c	2007-02-14 16:32:57.000000000 +0100
+@@ -0,0 +1,204 @@
 +/*
 + *  linux/drivers/mfd/ucb1x00-switches.c
 + *
@@ -65,7 +65,6 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
 +	struct input_dev *idev = switches->idev;
 +	ucb1x00_enable(switches->ucb);
 +	
-+	//check if it really is a event this is not real neccessary because input dev checkes it itself a second.
 +	this=~ucb1x00_io_read(switches->ucb);
 +	if (this==last) {
 +		 return;
@@ -76,48 +75,57 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
 +
 +	case 0:
 +
-+		if ((this & (1<<0)) != 0) input_report_key(idev, KEY_PROG1, 1);
-+		else input_report_key(idev, KEY_PROG1, 0);
++		if 
++			((this & (1<<0)) != 0) input_report_key(idev, KEY_PROG1, 1);
++		else 
++			input_report_key(idev, KEY_PROG1, 0);
 +		break;
 +
 +	case 1:
 +
-+		if ((this & (1<<1)) != 0) input_report_key(idev, KEY_PROG2, 1);
-+		else input_report_key(idev, KEY_PROG2, 0);
++		if 
++			((this & (1<<1)) != 0) input_report_key(idev, KEY_PROG2, 1);
++		else 
++			input_report_key(idev, KEY_PROG2, 0);
 +		break;
 +
 +	case 2:
 +
-+		if ((this & (1<<2)) != 0) input_report_key(idev, KEY_UP, 1); 
-+		else input_report_key(idev, KEY_UP, 0); 
++		if 
++			((this & (1<<2)) != 0) input_report_key(idev, KEY_UP, 1); 
++		else 
++			input_report_key(idev, KEY_UP, 0); 
 +		break;
 +
 +	case 3:
 +
-+		if ((this & (1<<3)) != 0) input_report_key(idev, KEY_DOWN, 1); 
-+		else input_report_key(idev, KEY_DOWN, 0); 
++		if 
++			((this & (1<<3)) != 0) input_report_key(idev, KEY_DOWN, 1); 
++		else 
++			input_report_key(idev, KEY_DOWN, 0); 
 +		break;
 +
 +	case 4:
 +
-+		if ((this & (1<<4)) != 0) input_report_key(idev, KEY_LEFT, 1);
-+		else input_report_key(idev, KEY_LEFT, 0);
++		if 
++			((this & (1<<4)) != 0) input_report_key(idev, KEY_LEFT, 1);
++		else 
++			input_report_key(idev, KEY_LEFT, 0);
 +		break;
 +
 +	case 5:
 +
-+		if ((this & (1<<5)) != 0) input_report_key(idev, KEY_RIGHT, 1);
-+		else input_report_key(idev, KEY_RIGHT, 0);
++		if 
++			((this & (1<<5)) != 0) input_report_key(idev, KEY_RIGHT, 1);
++		else 
++			input_report_key(idev, KEY_RIGHT, 0);
 +		break;
 +
 +	default:
 +
 +		printk(KERN_DEBUG "switches-ucb1x00 is BUGGY!!! \n");
-+
-+	}
-+
-+	ucb1x00_disable_irq(switches->ucb, UCB_IRQ_TSPX, UCB_FALLING);
-+	
++		
++	}	
 +}
 +
 +static int ucb1x00_switches_add(struct ucb1x00_dev *dev)
@@ -129,7 +137,6 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
 +	switches = kzalloc(sizeof(struct ucb1x00_switches), GFP_KERNEL);
 +	idev = input_allocate_device();
 +
-+
 +	if (!switches || !idev) {
 +		err = -ENOMEM;
 +		goto fail;
@@ -137,7 +144,6 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
 +
 +	switches->ucb = dev->ucb;
 +	
-+
 +	idev->private    = switches;
 +	idev->name       = "SIMpad Switches";
 +	idev->id.product = switches->ucb->id;
@@ -191,14 +197,12 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
 +	input_unregister_device(switches->idev);
 +		
 +	for (i = 5; i >= 0; --i) {
-+
 +		ucb1x00_disable_irq(switches->ucb, i, UCB_RISING | UCB_FALLING);
 +
 +		/* Only error conditions are ENOENT and EINVAL; silently
 +		 * ignore:
 +		 */
 +		ucb1x00_free_irq(switches->ucb, i, NULL);
-+
 +	}
 +	ucb1x00_disable(switches->ucb);
 +	kfree(switches);
diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb
index f4372186e6..893856a16a 100644
--- a/packages/linux/linux_2.6.20.bb
+++ b/packages/linux/linux_2.6.20.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPL"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig"
@@ -16,7 +17,7 @@ SRC_URI_append_simpad = "\
 inherit kernel
 
 KERNEL_IMAGETYPE = "bzImage"
-KERNEL_IMAGETYPE_simpad = "bzImage"
+KERNEL_IMAGETYPE_simpad = "zImage"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 4ba53f0631..d6368b0fcf 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://tslib-input_raw-grab_events.patch;patch=1 \