Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

15 files changed, 322 insertions, 27 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 24254a919b..7040047a37 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13415,8 +13415,8 @@ md5=13a91cfd9b26182edbbdcd2a0d27c80f
 sha256=e41470fbea5322aabdca21b3ee7ebc2b3ddb1638d25902ee96fcb10698b35dd4
 
 [http://www.claws-mail.org/downloads/plugins/mailmbox-1.14.tar.gz]
-md5=62fb82a6e778d9788364a3cd1b78d609
-sha256=e59572e750baadad7d1baaf24b9e44d4fa5ab194ccf3faeb41c6061ca6b375a6
+md5=0a5907628c1112cf8e5fe251ed1db551
+sha256=d8d948807b4a09eb6da392161564c4bcee01070c9c86483889f93f1b14fd0870
 
 [ftp://ftp.gnu.org/gnu/mailutils/mailutils-0.3.1.tar.bz2]
 md5=d2f0192b3dd95b33e764a0d480085cdd
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 914300e31c..6d258e19e9 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -8,6 +8,7 @@ require conf/machine/include/tune-xscale.inc
 IMAGE_FSTYPES ?= "jffs2"
 
 # wlan-ng Modules
-MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb"
+# OHCI suspend/resume fixup
+MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix"
 
 ROOT_FLASH_SIZE = "28"
diff --git a/packages/apmd/apm-tosa-suspendfix_0.1.bb b/packages/apmd/apm-tosa-suspendfix_0.1.bb
new file mode 100644
index 0000000000..ad223c1959
--- /dev/null
+++ b/packages/apmd/apm-tosa-suspendfix_0.1.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Workaround for bug 2134 (Tosa Angstrom x11 image suspend/resume failure)"
+AUTHOR = "Dmitry Baryshkov"
+PR = "r0"
+
+SRC_URI = "file://50-tmio-ohci-unbind"
+
+do_install() {
+	install -d ${D}${sysconfdir}/apm/event.d
+	install -m 0755 ${WORKDIR}/50-tmio-ohci-unbind ${D}${sysconfdir}/apm/event.d
+}
diff --git a/packages/apmd/files/50-tmio-ohci-unbind b/packages/apmd/files/50-tmio-ohci-unbind
new file mode 100644
index 0000000000..f65e0b37d3
--- /dev/null
+++ b/packages/apmd/files/50-tmio-ohci-unbind
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+TOPATH=/sys/bus/platform/drivers/tmio-ohci
+
+case "$1" in
+	suspend)
+		if [ -d $TOPATH ]
+		then
+			echo -n tmio-ohci >  $TOPATH/unbind
+		fi
+		;;
+	resume)
+		if [ -d $TOPATH ]
+		then
+			echo -n tmio-ohci >  $TOPATH/bind
+		fi
+		;;
+esac
+
diff --git a/packages/gphoto2/files/gphoto-popt-fixup.patch b/packages/gphoto2/files/gphoto-popt-fixup.patch
new file mode 100644
index 0000000000..66b6168e02
--- /dev/null
+++ b/packages/gphoto2/files/gphoto-popt-fixup.patch
@@ -0,0 +1,22 @@
+Index: gphoto2-2.4.2/m4m/gp-check-popt.m4
+===================================================================
+--- gphoto2-2.4.2.orig/m4m/gp-check-popt.m4	2008-12-04 01:46:40.000000000 +0300
++++ gphoto2-2.4.2/m4m/gp-check-popt.m4	2008-12-04 01:47:03.000000000 +0300
+@@ -69,7 +69,7 @@
+		if test -n "${popt_prefix}"; then
+			:
+		elif test -d "${popt_prefix}/include"; then
+-			CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS}"
++			CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS_save}"
+		else
+			continue
+		fi
+@@ -113,7 +113,7 @@
+			if test "${popt_libdir}" = "/"; then
+				popt_libdir=""
+			elif test -d "${popt_libdir}"; then
+-				LDFLAGS="-L${popt_libdir} ${LDFLAGS}"
++				LDFLAGS="-L${popt_libdir} ${LDFLAGS_save}"
+			else
+				continue
+			fi
diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb
index 996edb25a0..ee4e9c614f 100644
--- a/packages/gphoto2/gphoto2_2.4.2.bb
+++ b/packages/gphoto2/gphoto2_2.4.2.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "libtool libgphoto2 popt"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2\
+           file://gphoto-popt-fixup.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa
index db1aa16238..9c42d4bccb 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa
@@ -822,7 +822,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_POWER is not set
+CONFIG_INPUT_POWER=y
 
 #
 # Input Device Drivers
@@ -839,7 +839,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_SPITZ is not set
 CONFIG_KEYBOARD_TOSA=y
 # CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index d0a937aa8f..c4987088eb 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r16"
+PR = "r17"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
diff --git a/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch b/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch
new file mode 100644
index 0000000000..a2eb438ed9
--- /dev/null
+++ b/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch
@@ -0,0 +1,30 @@
+Index: trunk/hw/baum.c
+===================================================================
+--- trunk.orig/hw/baum.c	2008-11-29 05:12:40.418390606 +0300
++++ trunk/hw/baum.c	2008-11-29 05:13:11.498378426 +0300
+@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void)
+     CharDriverState *chr;
+     brlapi_handle_t *handle;
+ #ifdef CONFIG_SDL
++#ifdef SDL_VIDEO_DRIVER_X11
+     SDL_SysWMinfo info;
+ #endif
++#endif
+     int tty;
+
+     baum = qemu_mallocz(sizeof(BaumDriverState));
+@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void)
+     }
+
+ #ifdef CONFIG_SDL
++#ifdef SDL_VIDEO_DRIVER_X11
+     memset(&info, 0, sizeof(info));
+     SDL_VERSION(&info.version);
+     if (SDL_GetWMInfo(&info))
+         tty = info.info.x11.wmwindow;
+     else
+ #endif
++#endif
+         tty = BRLAPI_TTY_DEFAULT;
+
+     if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {
diff --git a/packages/qemu/qemu_svn.bb b/packages/qemu/qemu_svn.bb
index e8d9883c74..b4acae7cda 100644
--- a/packages/qemu/qemu_svn.bb
+++ b/packages/qemu/qemu_svn.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
 PV = "0.9.1+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/"
 
@@ -34,6 +34,7 @@ SRC_URI = "\
     file://fix_protection_bits.patch;patch=1 \
     file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \
     file://qemu-n800-support.patch;patch=1 \
+    file://fix_baum_c_compilation.patch;patch=1 \
     file://fix_dirent_h_include.patch;patch=1"
 
 S = "${WORKDIR}/trunk"
diff --git a/packages/sylpheed/claws-mail_3.6.1.bb b/packages/sylpheed/claws-mail_3.6.1.bb
index ac0ff1bd26..a2d7101ece 100644
--- a/packages/sylpheed/claws-mail_3.6.1.bb
+++ b/packages/sylpheed/claws-mail_3.6.1.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ libetpan openssl aspell"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig
 
@@ -49,3 +49,7 @@ do_install_append() {
 	install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
 	sed -i 's/Icon=[^.]*$/&.png/' ${D}${datadir}/applications/claws-mail.desktop
 }
+
+do_stage() {
+	autotools_stage_includes
+}
diff --git a/packages/sylpheed/claws-plugin-mailmbox_1.14.bb b/packages/sylpheed/claws-plugin-mailmbox_1.14.bb
index cfa26a464e..621fbb4fdf 100644
--- a/packages/sylpheed/claws-plugin-mailmbox_1.14.bb
+++ b/packages/sylpheed/claws-plugin-mailmbox_1.14.bb
@@ -2,19 +2,14 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent plugins"
 DEPENDS = "claws-mail"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz"
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\
+           file://claws-plugin-mailmbox-fixup.patch;patch=1"
 
 inherit autotools pkgconfig
 
 S = "${WORKDIR}/mailmbox-${PV}"
 
-do_configure() {
-    gnu-configize
-    libtoolize --force
-    oe_runconf
-}
-
 FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
 FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
diff --git a/packages/sylpheed/claws-plugin-rssyl_0.18.bb b/packages/sylpheed/claws-plugin-rssyl_0.18.bb
index 29fc245ac4..fd30e81ef6 100644
--- a/packages/sylpheed/claws-plugin-rssyl_0.18.bb
+++ b/packages/sylpheed/claws-plugin-rssyl_0.18.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent plugins"
 DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
 
@@ -10,11 +10,5 @@ inherit autotools pkgconfig
 
 S = "${WORKDIR}/rssyl-${PV}"
 
-do_configure() {
-    gnu-configize
-    libtoolize --force
-    oe_runconf
-}
-
 FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
-
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
diff --git a/packages/sylpheed/files/claws-plugin-mailmbox-fixup.patch b/packages/sylpheed/files/claws-plugin-mailmbox-fixup.patch
new file mode 100644
index 0000000000..f8cce25225
--- /dev/null
+++ b/packages/sylpheed/files/claws-plugin-mailmbox-fixup.patch
@@ -0,0 +1,218 @@
+Index: mailmbox-1.14/src/plugin_gtk.c
+===================================================================
+--- mailmbox-1.14.orig/src/plugin_gtk.c	2008-12-04 06:18:50.000000000 +0300
++++ mailmbox-1.14/src/plugin_gtk.c	2008-12-04 06:49:40.000000000 +0300
+@@ -35,39 +35,41 @@
+
+ #include "pluginconfig.h"
+
+-static void new_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void delete_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void rename_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget);
+-static void add_mailbox(gpointer callback_data, guint callback_action, GtkWidget *widget);
+-
+-static GtkItemFactoryEntry claws_mailmbox_popup_entries[] =
+-{
+-	{N_("/Create _new folder..."),	 NULL, new_folder_cb,     0, NULL},
+-	{N_("/---"),			 NULL, NULL,              0, "<Separator>"},
+-	{N_("/_Rename folder..."),	 NULL, rename_folder_cb,  0, NULL},
+-	{N_("/M_ove folder..."), 	 NULL, move_folder_cb,    0, NULL},
+-	{N_("/Cop_y folder..."),	 NULL, move_folder_cb,    1, NULL},
+-	{N_("/---"),			 NULL, NULL,              0, "<Separator>"},
+-	{N_("/_Delete folder"),		 NULL, delete_folder_cb,  0, NULL},
+-	{N_("/---"),			 NULL, NULL,              0, "<Separator>"},
+-	{N_("/_Check for new messages"), NULL, update_tree_cb,    0, NULL},
+-	{N_("/C_heck for new folders"),  NULL, update_tree_cb,    1, NULL},
+-	{N_("/R_ebuild folder tree"),	 NULL, update_tree_cb,    2, NULL},
+-	{N_("/---"),			 NULL, NULL, 		  0, "<Separator>"},
+-	{N_("/Remove _mailbox"),	 NULL, remove_mailbox_cb, 0, NULL},
+-	{N_("/---"),			 NULL, NULL, 		  0, "<Separator>"},
++static void new_folder_cb(GtkAction *action, gpointer data);
++static void delete_folder_cb(GtkAction *action, gpointer data);
++static void rename_folder_cb(GtkAction *action, gpointer data);
++static void move_folder_cb(GtkAction *action, gpointer data);
++static void update_tree_cb(GtkAction *action, gpointer data);
++static void remove_mailbox_cb(GtkAction *action, gpointer data);
++static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data);
++
++static GtkActionEntry claws_mailmbox_popup_entries[] =
++{
++	{"FolderViewPopup/CreateNewFolder",	NULL, N_("/Create _new folder..."), NULL, NULL, G_CALLBACK(new_folder_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/RenameFolder",	NULL, N_("/_Rename folder..."), NULL, NULL, G_CALLBACK(rename_folder_cb) },
++	{"FolderViewPopup/MoveFolder",		NULL, N_("/M_ove folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
++	{"FolderViewPopup/CopyFolder",		NULL, N_("/Cop_y folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/DeleteFolder",	NULL, N_("/_Delete folder"), NULL, NULL, G_CALLBACK(delete_folder_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/CheckNewMessages",	NULL, N_("/_Check for new messages"), NULL, NULL, G_CALLBACK(update_tree_cb) },
++	{"FolderViewPopup/CheckNewFolders",	NULL, N_("/C_heck for new folders"), NULL, NULL, G_CALLBACK(update_tree_cb) },
++	{"FolderViewPopup/RebuildfTree",	NULL, N_("/R_ebuild folder tree"), NULL, NULL, G_CALLBACK(update_tree_cb) },
++	{"FolderViewPopup/---",			NULL, N_("/---") },
++	{"FolderViewPopup/RemoveMailbox",	NULL, N_("/Remove _mailbox"), NULL, NULL, G_CALLBACK(remove_mailbox_cb) },
+ };
+
+-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);
++static void set_sensitivity(GtkUIManager *factory, FolderItem *item);
+
+ static FolderViewPopup claws_mailmbox_popup =
+ {
+	"mailmbox",
+	"<MailmboxFolder>",
+-	NULL,
++	claws_mailmbox_popup_entries,
++	G_N_ELEMENTS(claws_mailmbox_popup_entries),
++	NULL, 0,
++	NULL, 0, 0, NULL, NULL,
+	set_sensitivity
+ };
+
+@@ -85,11 +87,6 @@
+	GtkItemFactory *ifactory;
+	MainWindow *mainwin = mainwindow_get_mainwindow();
+
+-	n_entries = sizeof(claws_mailmbox_popup_entries) /
+-		sizeof(claws_mailmbox_popup_entries[0]);
+-	for (i = 0; i < n_entries; i++)
+-		claws_mailmbox_popup.entries = g_slist_append(claws_mailmbox_popup.entries, &claws_mailmbox_popup_entries[i]);
+-
+	folderview_register_popup(&claws_mailmbox_popup);
+
+	ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+@@ -115,7 +112,7 @@
+	gtk_item_factory_delete_item(ifactory, mainwindow_add_mailbox.path);
+ }
+
+-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
++static void set_sensitivity(GtkUIManager *factory, FolderItem *item)
+ {
+ #define SET_SENS(name, sens) \
+	menu_set_sensitive(factory, name, sens)
+@@ -132,10 +129,13 @@
+ #undef SET_SENS
+ }
+
+-static void update_tree_cb(FolderView *folderview, guint action,
+-			   GtkWidget *widget)
++#define DO_ACTION(name, act)	{ if (!strcmp(a_name, name)) act; }
++
++static void update_tree_cb(GtkAction *action, gpointer data)
+ {
++	FolderView *folderview = (FolderView *)data;
+	FolderItem *item;
++	const gchar *a_name = gtk_action_get_name(action);
+
+	item = folderview_get_selected_item(folderview);
+	g_return_if_fail(item != NULL);
+@@ -144,16 +144,12 @@
+
+	g_return_if_fail(item->folder != NULL);
+
+-	if (action == 0)
+-		folderview_check_new(item->folder);
+-	else if (action == 1)
+-		folderview_rescan_tree(item->folder, FALSE);
+-	else if (action == 2)
+-		folderview_rescan_tree(item->folder, TRUE);
++	DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
++	DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
++	DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, FALSE));
+ }
+
+-static void add_mailbox(gpointer callback_data, guint callback_action,
+-                        GtkWidget *widget)
++static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data)
+ {
+	MainWindow *mainwin = (MainWindow *) callback_data;
+	gchar *path, *basename;
+@@ -193,10 +189,10 @@
+	return;
+ }
+
+-static void new_folder_cb(FolderView *folderview, guint action,
+-		          GtkWidget *widget)
++static void new_folder_cb(GtkAction *action, gpointer data)
+ {
+-	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
++	FolderView *folderview = (FolderView *)data;
++	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+	FolderItem *item;
+	FolderItem *new_item;
+	gchar *new_folder;
+@@ -245,9 +241,10 @@
+	folder_write_list();
+ }
+
+-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget)
++static void remove_mailbox_cb(GtkAction *action, gpointer data)
+ {
+-	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
++	FolderView *folderview = (FolderView *)data;
++	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+	GtkCTreeNode *node;
+	FolderItem *item;
+	gchar *name;
+@@ -276,10 +273,10 @@
+	folder_destroy(item->folder);
+ }
+
+-static void delete_folder_cb(FolderView *folderview, guint action,
+-			     GtkWidget *widget)
++static void delete_folder_cb(GtkAction *action, gpointer data)
+ {
+-	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
++	FolderView *folderview = (FolderView *)data;
++	GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+	FolderItem *item;
+	gchar *message, *name;
+	AlertValue avalue;
+@@ -329,24 +326,41 @@
+
+ }
+
+-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget)
++static void move_folder_cb(GtkAction *action, gpointer data)
++{
++	FolderView *folderview = (FolderView *)data;
++	FolderItem *from_folder = NULL, *to_folder = NULL;
++
++	from_folder = folderview_get_selected_item(folderview);
++	if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
++		return;
++
++	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
++	if (!to_folder)
++		return;
++
++	folderview_move_folder(folderview, from_folder, to_folder, 0);
++}
++
++static void copy_folder_cb(GtkAction *action, gpointer data)
+ {
++	FolderView *folderview = (FolderView *)data;
+	FolderItem *from_folder = NULL, *to_folder = NULL;
+
+	from_folder = folderview_get_selected_item(folderview);
+	if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
+		return;
+
+-	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
++	to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
+	if (!to_folder)
+		return;
+
+-	folderview_move_folder(folderview, from_folder, to_folder, action);
++	folderview_move_folder(folderview, from_folder, to_folder, 1);
+ }
+
+-static void rename_folder_cb(FolderView *folderview, guint action,
+-			     GtkWidget *widget)
++static void rename_folder_cb(GtkAction *action, gpointer data)
+ {
++	FolderView *folderview = (FolderView *)data;
+	FolderItem *item, *parent;
+	gchar *new_folder;
+	gchar *name;
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 9d3bc8ebdd..c973661ef3 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r74"
+PR = "r75"
 
 inherit task