From 06795d8cd18df331305f4874213591ff2cf4ee4c Mon Sep 17 00:00:00 2001
From: Patrick McDermott <pj@pehjota.net>
Date: Fri, 22 Sep 2017 01:19:22 -0400
Subject: Move tab population code from MqWindow to MqTab

---
(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index 21717e0..013ed80 100644
--- a/src/window.c
+++ b/src/window.c
@@ -120,39 +120,19 @@ tab_label_button_press_cb(GtkWidget *widget, GdkEvent *event, MqTab *tab)
 static void
 add_tab(MqWindow *window, gchar *uri, gint position)
 {
-	GtkWidget *tab_label_image;
-	GtkWidget *tab_label_label;
-	GtkWidget *tab_label;
 	MqTab     *tab;
 	GtkWidget *tab_label_event_box;
 	GtkWidget *tab_widget;
 
-	tab_label_image = gtk_image_new_from_icon_name("text-x-generic",
-		GTK_ICON_SIZE_BUTTON);
-
-	tab_label_label = gtk_label_new("New tab");
-	gtk_label_set_ellipsize(GTK_LABEL(tab_label_label),
-		PANGO_ELLIPSIZE_END);
-	gtk_widget_set_hexpand(tab_label_label, TRUE);
-	gtk_widget_set_size_request(tab_label_label, 50, 1);
-
-	tab_label = gtk_grid_new();
-	gtk_grid_attach(GTK_GRID(tab_label), tab_label_image,
-		0, 0, 1, 1);
-	gtk_grid_attach(GTK_GRID(tab_label), tab_label_label,
-		1, 0, 1, 1);
-	gtk_grid_attach(GTK_GRID(tab_label), gtk_button_new_from_icon_name(
-			"window-close", GTK_ICON_SIZE_BUTTON), 2, 0, 1, 1);
-	gtk_widget_show_all(tab_label);
-
-	tab = mq_tab_new(uri, tab_label_image, tab_label_label);
+	tab = mq_tab_new(uri);
 
 	tab_label_event_box = gtk_event_box_new();
 	g_signal_connect(tab_label_event_box, "button-press-event",
 		G_CALLBACK(tab_label_button_press_cb), tab);
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(tab_label_event_box),
 		FALSE);
-	gtk_container_add(GTK_CONTAINER(tab_label_event_box), tab_label);
+	gtk_container_add(GTK_CONTAINER(tab_label_event_box),
+		mq_tab_get_tab(tab));
 
 	tab_widget = mq_tab_get_container(tab);
 	position = gtk_notebook_insert_page(GTK_NOTEBOOK(window->notebook),
--
cgit v0.9.1