Avoid unexpected warning message when navigating menu (#68517)

* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
Avoid unexpected warning message when navigating menu (#68517)

diff --git a/ChangeLog b/ChangeLog
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3ade382500e405484eef4977228a61ba5db9698f..7d3856aab1bb57fe5967504750aaf19286c45100 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
+       Avoid unexpected warning message when navigating menu (#68517)
+
 2002-01-15  Jody Goldberg <jody@gnome.org>
 
        * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index ccd200b9097ae6d84efc1d9a2708641c89a481c0..fd88cbfbbed2b96183957940c3452519bb311a8c 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -981,8 +981,15 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
          while (parent_menu_shell && 
                 (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement ==
                  GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement))
-           parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell);
-         
+            {
+              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;
+            }
+
          if (parent_menu_shell)
            {
              gtk_menu_shell_move_selected (parent_menu_shell, 1);