From bfb8968156d9d3d9c20b1d7fde7ef025fb2cfedc Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 4 May 2010 00:07:01 +0000
Subject: [PATCH] Updated the API for menubar and toolbar accelerators (must
 specify the modifier)

---
 include/Desktop/menubar.h | 1 +
 include/Desktop/toolbar.h | 1 +
 src/menubar.c             | 2 +-
 src/toolbar.c             | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/Desktop/menubar.h b/include/Desktop/menubar.h
index 6e09649..93b3962 100644
--- a/include/Desktop/menubar.h
+++ b/include/Desktop/menubar.h
@@ -26,6 +26,7 @@ typedef struct _DesktopMenu
 	const char * name;
 	GtkSignalFunc callback;
 	const char * stock;
+	GdkModifierType modifier;
 	unsigned int accel;
 } DesktopMenu;
 
diff --git a/include/Desktop/toolbar.h b/include/Desktop/toolbar.h
index 4373f3e..684b088 100644
--- a/include/Desktop/toolbar.h
+++ b/include/Desktop/toolbar.h
@@ -26,6 +26,7 @@ typedef struct _DesktopToolbar
 	const char * name;
 	GtkSignalFunc callback;
 	const char * stock;
+	GdkModifierType modifier;
 	unsigned int accel;
 	GtkToolItem * widget;
 } DesktopToolbar;
diff --git a/src/menubar.c b/src/menubar.c
index 7d792df..af021da 100644
--- a/src/menubar.c
+++ b/src/menubar.c
@@ -74,7 +74,7 @@ static GtkWidget * _menubar_create_menu(DesktopMenu * menu, gpointer data,
 			gtk_widget_set_sensitive(menuitem, FALSE);
 		if(accel != NULL && p->accel != 0)
 			gtk_widget_add_accelerator(menuitem, "activate", accel,
-					p->accel, GDK_CONTROL_MASK,
+					p->accel, p->modifier,
 					GTK_ACCEL_VISIBLE);
 		gtk_menu_shell_append(GTK_MENU_SHELL(ret), menuitem);
 	}
diff --git a/src/toolbar.c b/src/toolbar.c
index 1d0d0d2..379e6a2 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -55,8 +55,8 @@ GtkWidget * desktop_toolbar_create(DesktopToolbar * toolbar, gpointer data,
 				G_CALLBACK(p->callback), data);
 		if(accel != NULL && p->accel != 0)
 			gtk_widget_add_accelerator(GTK_WIDGET(p->widget),
-					"clicked", accel, p->accel,
-					GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+					"clicked", accel, p->accel, p->modifier,
+					GTK_ACCEL_VISIBLE);
 		gtk_toolbar_insert(GTK_TOOLBAR(ret), p->widget, -1);
 	}
 	return ret;