From 52204ca987c42e49b8adecaa0584db2b02f4b3b2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 21 Jan 2010 16:39:23 +0000
Subject: [PATCH] ensure that the relevant quarks are initialized before
 linking cocoa & gtk menu items and menus

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6529 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/gtkmm2ext/gtkapplication_quartz.mm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/gtkmm2ext/gtkapplication_quartz.mm b/libs/gtkmm2ext/gtkapplication_quartz.mm
index cd7a2cdb3b..087a39e04e 100644
--- a/libs/gtkmm2ext/gtkapplication_quartz.mm
+++ b/libs/gtkmm2ext/gtkapplication_quartz.mm
@@ -655,6 +655,10 @@ cocoa_menu_connect (GtkWidget *menu,
 		    NSMenu*    cocoa_menu)
 {
 	[cocoa_menu retain];
+
+	if (cocoa_menu_quark == 0)
+		cocoa_menu_quark = g_quark_from_static_string ("NSMenu");
+	
 	g_object_set_qdata_full (G_OBJECT (menu), cocoa_menu_quark,
 				 cocoa_menu,
 				 (GDestroyNotify) cocoa_menu_free);
@@ -984,6 +988,9 @@ cocoa_menu_item_connect (GtkWidget*   menu_item,
 
 	[cocoa_item retain];
 
+	if (cocoa_menu_item_quark == 0)
+		cocoa_menu_item_quark = g_quark_from_static_string ("NSMenuItem");
+
 	g_object_set_qdata_full (G_OBJECT (menu_item), cocoa_menu_item_quark,
 				 cocoa_item,
 				 (GDestroyNotify) cocoa_menu_item_free);