From 29fa27d654decd5677fde6a1ea26b7c6fb451156 Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Mon, 3 Jan 2011 10:19:01 +0330
Subject: [PATCH] Menu system bug fixed

---
 src/lib/modes.el        |  8 ++++----
 src/plugins/cproject.el | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/lib/modes.el b/src/lib/modes.el
index db60cb1..a11c5e3 100644
--- a/src/lib/modes.el
+++ b/src/lib/modes.el
@@ -75,25 +75,25 @@ This mode provide a basic configuration for an IDE."
       ;; kuso-mode is not loaded
       (let () 
 	;; before initiazing mode
-	(run-hooks kuso-preinit-mode-hook)
+	(run-hooks 'kuso-preinit-mode-hook)
 	;; i really found toolbar and scrollbar useless so i disabled them
 	(if tool-bar-mode (tool-bar-mode))
 	(if scroll-bar-mode (scroll-bar-mode))
 	(menu/init-menu)
 	;; after mode was initialized
-	(run-hooks kuso-postinit-mode-hook)
+	(run-hooks 'kuso-postinit-mode-hook)
 	)
     ;; kuso-mode already loaded
     (let ()
       ;; before deactivating mode
-      (run-hooks kuso-prerm-mode-hook)
+      (run-hooks 'kuso-prerm-mode-hook)
 
       ;; return everything to normal
       (if (not tool-bar-mode) (tool-bar-mode))
       (if (not scroll-bar-mode) (scroll-bar-mode))
       (menu/destruct-menu)
       ;; after deactivating mode
-      (run-hooks kuso-postrm-mode-hook)
+      (run-hooks 'kuso-postrm-mode-hook)
       )
     )
   )
diff --git a/src/plugins/cproject.el b/src/plugins/cproject.el
index 2a46157..f7986a8 100644
--- a/src/plugins/cproject.el
+++ b/src/plugins/cproject.el
@@ -65,7 +65,6 @@ binding for Kuso IDE C projects section."
 ;; Functions
 ;; ---------------------------------------------------------------------
 (defun init-menus () "Draw required menu for C mode"
-  (define-key-after global-map [menu-bar file new-proj cproj] (cons "C/C++" (make-sparse-keymap "c-cpp-proj")))
 
   (define-key global-map (kbd "\C-x n k") 'kmodule)
   (define-key global-map [menu-bar file new-proj cproj kmodule] '("Kernel Module" . kmodule))
@@ -128,7 +127,7 @@ binding for Kuso IDE C projects section."
 (defun init-main-menu ()
   "Initialize the C plugin menu under Kuso menus."
   (interactive)
-
+  (define-key-after global-map [menu-bar file new-proj cproj] (cons "C/C++" (make-sparse-keymap "c-cpp-proj")))
 )
 
 (defun initial-keymap ()
@@ -138,7 +137,7 @@ binding for Kuso IDE C projects section."
 
 ;; Initializing c menus at the load time
 (init-menus)
-
+(add-hook 'kuso-postinit-mode-hook 'init-main-menu)
 ;; ----------------------------------------------------------------------
 ;; Minor Modes
 ;; ----------------------------------------------------------------------
@@ -154,17 +153,17 @@ This mode provide C language plugin for Kuso IDE."
       ;; kuso-cplugin-mode is not loaded
       (let () 
 	;; before initiazing mode
-	(run-hooks kuso-cplug-preinit-hook)
+	(run-hooks 'kuso-cplug-preinit-hook)
 	(initial-keymap)
 	;; after mode was initialized
-	(run-hooks kuso-cplug-postinit-hook)
+	(run-hooks 'kuso-cplug-postinit-hook)
 	)
     ;; kuso-mode already loaded
     (let ()
       ;; before deactivating mode
-      (run-hooks kuso-cplug-prerm-hook)
+      (run-hooks 'kuso-cplug-prerm-hook)
       ;; after deactivating mode
-      (run-hooks kuso-cplug-postrm-hook)
+      (run-hooks 'kuso-cplug-postrm-hook)
       )
     )
   )