remove artifact from the time when type checking casts warned on NULL,

2007-04-02  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): remove
	artifact from the time when type checking casts warned on NULL,
	some whitespace cleanup.


svn path=/trunk/; revision=17578
This commit is contained in:
Michael Natterer 2007-04-02 16:32:22 +00:00 committed by Michael Natterer
parent c524f988bf
commit d7c5a3010a
2 changed files with 16 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2007-04-02 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): remove
artifact from the time when type checking casts warned on NULL,
some whitespace cleanup.
2007-04-01 Cody Russell <bratsche@gnome.org>
* modules/engines/ms-windows/msw_style.c: Fix rendering of

View File

@ -1237,12 +1237,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
(GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement ==
GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement))
{
GtkWidget *tmp_widget = parent_menu_shell->parent_menu_shell;
if (tmp_widget)
parent_menu_shell = GTK_MENU_SHELL (tmp_widget);
else
parent_menu_shell = NULL;
parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell);
}
if (parent_menu_shell)
@ -1263,6 +1258,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
menu_shell->children)
_gtk_menu_shell_select_last (menu_shell, TRUE);
break;
case GTK_MENU_DIR_NEXT:
gtk_menu_shell_move_selected (menu_shell, 1);
if (!had_selection &&