gnome-panel r10212 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: 2007-02-05 23:37:35 +0000 (Mon, 05 Feb 2007)
New Revision: 10212
ViewCVS link: http://svn.gnome.org/viewcvs/gnome-panel?rev=10212&view=rev

Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/menu.c
   trunk/gnome-panel/panel-addto.c
   trunk/gnome-panel/panel-compatibility.c
   trunk/gnome-panel/panel-compatibility.h
   trunk/gnome-panel/panel-menu-button.c
   trunk/gnome-panel/panel-menu-items.c
Log:
2007-02-06  Vincent Untz  <vuntz gnome org>

	Revert changes about settings.menu.
	Based on patch by Denis Washington <dwashington gmx net>

	* panel-compatibility.[ch]:
	(panel_compatiblity_migrate_settings_menu_button): kill
	* menu.c: (submenu_to_display): fix callback data when appending a
	menu
	* panel-menu-items.c: (panel_desktop_menu_item_append_menu): brought
	back from the deads
	(panel_desktop_menu_item_create_menu): use settings.menu as basis for
	the menu and append data later
	* panel-menu-button.c: don't migrate from settings.menu
	* panel-addto.c: (panel_addto_make_application_model):
	(panel_addto_make_application_model): use settings.menu