From e5531336d56c476fe4e889cd4c7ae7f8b584cb89 Mon Sep 17 00:00:00 2001
From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
Date: Tue, 20 Nov 2007 18:17:50 -0500
Subject: [PATCH] Update to eaf9c59bfb575035371d0962068db72cea3b2d9f

---
 gntlabel.c | 5 ++++-
 gntmenu.c  | 3 ---
 gntmenu.h  | 2 +-
 gntwm.c    | 7 +++++--
 mtn        | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gntlabel.c b/gntlabel.c
index 5a256c9..4fbfae6 100644
--- a/gntlabel.c
+++ b/gntlabel.c
@@ -130,7 +130,10 @@ gnt_label_class_init(GntLabelClass *klass)
 			PROP_TEXT_FLAG,
 			g_param_spec_int("text-flag", "Text flag",
 				"Text attribute to use when displaying the text in the label.",
-				GNT_TEXT_FLAG_NORMAL, GNT_TEXT_FLAG_HIGHLIGHT, GNT_TEXT_FLAG_NORMAL,
+				GNT_TEXT_FLAG_NORMAL,
+				GNT_TEXT_FLAG_NORMAL|GNT_TEXT_FLAG_BOLD|GNT_TEXT_FLAG_UNDERLINE|
+				GNT_TEXT_FLAG_BLINK|GNT_TEXT_FLAG_DIM|GNT_TEXT_FLAG_HIGHLIGHT,
+				GNT_TEXT_FLAG_NORMAL,
 				G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 			)
 		);
diff --git a/gntmenu.c b/gntmenu.c
index 976c68f..d46708b 100644
--- a/gntmenu.c
+++ b/gntmenu.c
@@ -490,9 +490,6 @@ GntMenuItem *gnt_menu_get_item(GntMenu *menu, const char *id)
 		item = NULL;
 	}
 
-	if (item)
-		menuitem_activate(menu, item);
-
 	return item;
 }
 
diff --git a/gntmenu.h b/gntmenu.h
index 4872a77..4345ba7 100644
--- a/gntmenu.h
+++ b/gntmenu.h
@@ -108,7 +108,7 @@ GntWidget * gnt_menu_new(GntMenuType type);
 void gnt_menu_add_item(GntMenu *menu, GntMenuItem *item);
 
 /**
- * Activate and return the GntMenuItem with the given ID.
+ * Return the GntMenuItem with the given ID.
  *
  * @param menu   The menu.
  * @param id     The ID for an item.
diff --git a/gntwm.c b/gntwm.c
index 151ad70..26f3b54 100644
--- a/gntwm.c
+++ b/gntwm.c
@@ -1876,8 +1876,11 @@ gboolean gnt_wm_process_input(GntWM *wm, const char *keys)
 			GntMenu *menu = GNT_WINDOW(win)->menu;
 			if (menu) {
 				const char *id = gnt_window_get_accel_item(GNT_WINDOW(win), keys);
-				if (id)
-					ret = (gnt_menu_get_item(menu, id) != NULL);
+				if (id) {
+					GntMenuItem *item = gnt_menu_get_item(menu, id);
+					if (item)
+						ret = gnt_menuitem_activate(item);
+				}
 			}
 		}
 		if (!ret)
diff --git a/mtn b/mtn
index 1b51fd7..e7710e4 100644
--- a/mtn
+++ b/mtn
@@ -1 +1 @@
-42565dfdfb1d0477d08281c1c37e99bba59c56fc
+eaf9c59bfb575035371d0962068db72cea3b2d9f
-- 
2.11.4.GIT