[gedit] Further fixes to get_iter_from_tab in the doc pane

[Paolo Borelli <pborelli src gnome org>]

commit b12c50a738ee877d460d78baf98cd53409fb25ae
Author: Paolo Borelli <pborelli gnome org>
Date:   Mon Jul 4 16:46:13 2011 +0200

    Further fixes to get_iter_from_tab in the doc pane

 gedit/gedit-documents-panel.c |   74 +++++++++++++++++++---------------------
 1 files changed, 35 insertions(+), 39 deletions(-)
---
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index 12901fe..73d7bac 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -163,8 +163,8 @@ get_iter_from_tab (GeditDocumentsPanel *panel,
 
 	gedit_debug (DEBUG_PANEL);
 
-	g_assert (notebook != NULL || tab != NULL);
-	g_assert (tab != NULL);
+	g_assert (notebook != NULL);
+	/* tab may be NULL if just the notebook is specified */
 	g_assert (tab_iter != NULL);
 
 	search_notebook = (gedit_multi_notebook_get_n_notebooks (panel->priv->mnb) > 1);
@@ -175,76 +175,72 @@ get_iter_from_tab (GeditDocumentsPanel *panel,
 	success = FALSE;
 	do
 	{
+		GtkTreeIter iter;
+
 		if (search_notebook)
 		{
 			GeditNotebook *current_notebook;
-			gboolean is_cur;
 
 			gtk_tree_model_get (panel->priv->model,
 					    &parent,
 					    NOTEBOOK_COLUMN, &current_notebook,
 					    -1);
 
-			is_cur = (current_notebook == notebook);
-
-			g_object_unref (current_notebook);
-
-			if (is_cur)
+			if (current_notebook != NULL)
 			{
-				success = TRUE;
+				gboolean is_cur;
+				is_cur = (current_notebook == notebook);
 
-				if (tab == NULL)
+				g_object_unref (current_notebook);
+
+				if (is_cur)
 				{
-					break;
+					/* notebook found */
+					search_notebook = FALSE;
+					gtk_tree_model_iter_children (panel->priv->model, &iter, &parent);
 				}
 			}
 		}
-		else if (tab == NULL)
+		else
 		{
-			success = TRUE;
-
-			break;
+			iter = parent;
 		}
 
-		if (success || !search_notebook)
+		if (!search_notebook)
 		{
-			GeditTab *current_tab;
-			GtkTreeIter iter;
-
-			if (search_notebook)
-			{
-				g_assert (gtk_tree_model_iter_children (panel->priv->model,
-									&iter, &parent));
-			}
-			else
+			if (tab == NULL)
 			{
-				iter = parent;
+				success = TRUE;
+				break;
 			}
 
+			g_assert (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (panel->priv->model),
+								&iter));
+
 			do
 			{
-				gboolean is_cur;
+				GeditTab *current_tab;
 
 				gtk_tree_model_get (panel->priv->model,
 						    &iter,
 						    TAB_COLUMN, &current_tab,
 						    -1);
-				g_assert (current_tab != NULL);
-
-				is_cur = (current_tab == tab);
-
-				g_object_unref (current_tab);
 
-				if (is_cur)
+				if (current_tab != NULL)
 				{
-					g_assert (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (panel->priv->model),
-										&iter));
+					gboolean is_cur;
+
+					is_cur = (current_tab == tab);
+					g_object_unref (current_tab);
 
-					*tab_iter = iter;
-					success = TRUE;
+					if (is_cur)
+					{
+						*tab_iter = iter;
+						success = TRUE;
 
-					/* break 2; */
-					goto out;
+						/* break 2; */
+						goto out;
+					}
 				}
 			} while (gtk_tree_model_iter_next (panel->priv->model, &iter));