[gtk+] Fix a combo refactor regression

[Matthias Clasen <matthiasc src gnome org>]

commit 64c79c15a6f391e52a0b42d377675b30cb1740f2
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 17 21:55:13 2011 -0500

    Fix a combo refactor regression
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639792

 gtk/gtktreemenu.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c
index e7ed138..a2f1290 100644
--- a/gtk/gtktreemenu.c
+++ b/gtk/gtktreemenu.c
@@ -961,7 +961,7 @@ row_reordered_cb (GtkTreeModel    *model,
   GtkTreeMenuPrivate *priv = menu->priv;
   gboolean            this_menu = FALSE;
 
-  if (path == NULL && priv->root == NULL)
+  if (path == NULL || priv->root == NULL)
     this_menu = TRUE;
   else if (priv->root)
     {
@@ -1645,8 +1645,8 @@ _gtk_tree_menu_get_model (GtkTreeMenu *menu)
  * Since: 3.0
  */
 void
-_gtk_tree_menu_set_root (GtkTreeMenu         *menu,
-                         GtkTreePath         *path)
+_gtk_tree_menu_set_root (GtkTreeMenu *menu,
+                         GtkTreePath *path)
 {
   GtkTreeMenuPrivate *priv;