im.pidgin.pidgin: 534c96a5976cb55b46a727cf2bee87140137b1e9

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 534c96a5976cb55b46a727cf2bee87140137b1e9
Ancestor: 50f86e2bfabb86adb9fb6dabba4c7de2c2600584
Author: sadrul at pidgin.im
Date: 2007-11-14T00:09:06
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.API finch/libgnt/gntmenu.c finch/libgnt/gntmenu.h
        finch/libgnt/gntwm.c

ChangeLog: 

Update the ChangeLog.API and change how gnt_menu_get_item works.
On a different note, 'IM experience' is such a dirty phrase. PUKE!

-------------- next part --------------
============================================================
--- ChangeLog.API	ed1fec86a1506b2fe7ee886e09beff862bf5299e
+++ ChangeLog.API	d5e06eb4d822c7946671ef2fd274e5a39f814076
@@ -146,11 +146,13 @@ version 2.3.0 (??/??/????):
 		  string id of a menuitem respectively.
 		* Added gnt_window_get_accel_item, which returns a the id of a menuitem
 		  bound to a keystroke.
-		* Added gnt_menu_get_item to activate and return a menuitem of the
-		  given id from a menu.
+		* Added gnt_menu_get_item to get a menuitem of the given id from a
+		  menu.
 		* Added gnt_menuitem_activate, which triggers the 'activate' signal on
 		  the menuitem and calls the callback function, if available.
 		* Added GntEntryKillRing in GntEntry.
+		* Added gnt_window_set_maximize and gnt_window_get_maximize, and
+		  GntWindowFlags enum.
 
 version 2.2.2 (??/??/????):
 	libpurple:
============================================================
--- finch/libgnt/gntmenu.c	574a87ed870bfea17955731baac88a2110b4bbc6
+++ finch/libgnt/gntmenu.c	f5ecf5004906b3743567f5376f50aa37d622f3e6
@@ -490,9 +490,6 @@ GntMenuItem *gnt_menu_get_item(GntMenu *
 		item = NULL;
 	}
 
-	if (item)
-		menuitem_activate(menu, item);
-
 	return item;
 }
 
============================================================
--- finch/libgnt/gntmenu.h	25dd6cd572d092f0d3d0641f2984d081a3664238
+++ finch/libgnt/gntmenu.h	37e685fe5201b1465075cbb36e630a1df3dfade0
@@ -108,7 +108,7 @@ void gnt_menu_add_item(GntMenu *menu, Gn
 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.
============================================================
--- finch/libgnt/gntwm.c	687b43c1b34215e82c4796da4b0fb806c2e0793d
+++ finch/libgnt/gntwm.c	b97e4eaef92e5bca804e30dc4634fed47b749e1f
@@ -1876,8 +1876,11 @@ gboolean gnt_wm_process_input(GntWM *wm,
 			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)