From d1b429dfe3df835109f16408baa6f0bc140f6c1a Mon Sep 17 00:00:00 2001
From: Patrick McDermott <pj@pehjota.net>
Date: Fri, 13 Oct 2017 03:32:55 -0400
Subject: MqTabChrome: Reorganize navigation toolbar population code

---
(limited to 'src')

diff --git a/src/tab-chrome.c b/src/tab-chrome.c
index 8bce75c..55df39a 100644
--- a/src/tab-chrome.c
+++ b/src/tab-chrome.c
@@ -37,35 +37,36 @@
 static GtkWidget *
 navigation_toolbar_new(MqTabChrome *chrome, const gchar *uri)
 {
-	GtkToolbar  *navigation_toolbar;
-	GtkToolItem *back_forward_tool_item;
+	GtkToolItem *back_forward_button_box;
 	GtkToolItem *stop_reload_button;
-	GtkToolItem *uri_tool_item;
+	GtkToolItem *uri_entry;
 	GtkToolItem *home_button;
 	GtkToolItem *menu_button;
-
-	navigation_toolbar = GTK_TOOLBAR(gtk_toolbar_new());
+	GtkToolbar  *navigation_toolbar;
 
 	/* Back/forward button box */
-	back_forward_tool_item = mq_back_forward_button_box_new(
+	back_forward_button_box = mq_back_forward_button_box_new(
 		chrome->web_view);
-	gtk_toolbar_insert(navigation_toolbar, back_forward_tool_item, -1);
 
 	/* Stop/reload button */
 	stop_reload_button = mq_stop_reload_button_new(chrome->web_view);
-	gtk_toolbar_insert(navigation_toolbar, stop_reload_button, -1);
 
-	/* URI bar */
-	uri_tool_item = mq_uri_entry_new(chrome->web_view, uri);
-	gtk_toolbar_insert(navigation_toolbar, uri_tool_item, -1);
+	/* URI entry */
+	uri_entry = mq_uri_entry_new(chrome->web_view, uri);
 
 	/* Home button */
 	home_button = mq_home_button_new(chrome->config, chrome->web_view);
-	gtk_toolbar_insert(navigation_toolbar, home_button, -1);
 
 	/* Menu button */
 	menu_button = mq_main_menu_new(chrome->tab,
 		chrome->find_toolbar, chrome->web_view);
+
+	/* Navigation toolbar */
+	navigation_toolbar = GTK_TOOLBAR(gtk_toolbar_new());
+	gtk_toolbar_insert(navigation_toolbar, back_forward_button_box, -1);
+	gtk_toolbar_insert(navigation_toolbar, stop_reload_button, -1);
+	gtk_toolbar_insert(navigation_toolbar, uri_entry, -1);
+	gtk_toolbar_insert(navigation_toolbar, home_button, -1);
 	gtk_toolbar_insert(navigation_toolbar, menu_button, -1);
 
 	gtk_widget_set_hexpand(GTK_WIDGET(navigation_toolbar), TRUE);
--
cgit v0.9.1