diff --git a/include/Desktop/accel.h b/include/Desktop/accel.h
index c82d110..aa7ee57 100644
--- a/include/Desktop/accel.h
+++ b/include/Desktop/accel.h
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop libDesktop */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 /* types */
 typedef struct _DesktopAccel
 {
-	GtkSignalFunc callback;
+	GCallback callback;
 	GdkModifierType modifier;
 	unsigned int accel;
 } DesktopAccel;
diff --git a/include/Desktop/menubar.h b/include/Desktop/menubar.h
index 93b3962..a7180c4 100644
--- a/include/Desktop/menubar.h
+++ b/include/Desktop/menubar.h
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop libDesktop */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 typedef struct _DesktopMenu
 {
 	const char * name;
-	GtkSignalFunc callback;
+	GCallback callback;
 	const char * stock;
 	GdkModifierType modifier;
 	unsigned int accel;
diff --git a/include/Desktop/toolbar.h b/include/Desktop/toolbar.h
index 684b088..4130425 100644
--- a/include/Desktop/toolbar.h
+++ b/include/Desktop/toolbar.h
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop libDesktop */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 typedef struct _DesktopToolbar
 {
 	const char * name;
-	GtkSignalFunc callback;
+	GCallback callback;
 	const char * stock;
 	GdkModifierType modifier;
 	unsigned int accel;
diff --git a/src/menubar.c b/src/menubar.c
index af021da..982f04d 100644
--- a/src/menubar.c
+++ b/src/menubar.c
@@ -41,7 +41,7 @@ GtkWidget * desktop_menubar_create(DesktopMenubar * menubar, gpointer data,
 		menuitem = gtk_menu_item_new_with_mnemonic(_(menubar[i].name));
 		menu = _menubar_create_menu(menubar[i].menu, data, accel);
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-		gtk_menu_bar_append(GTK_MENU_BAR(ret), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(ret), menuitem);
 	}
 	return ret;
 }