From 38246d857a1b8e7d51d985e793fea5268aed7684 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 12 Oct 2017 16:08:15 -0400 Subject: mq_tab_chrome_new(): Get and save MqFindToolbar from caller Also change member type in struct. And update call in MqTab. --- (limited to 'src/tab-chrome.c') diff --git a/src/tab-chrome.c b/src/tab-chrome.c index 40f7ed2..6b3e2ad 100644 --- a/src/tab-chrome.c +++ b/src/tab-chrome.c @@ -344,7 +344,7 @@ zoom_in_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome) static void find_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome) { - mq_find_toolbar_reveal(MQ_FIND_TOOLBAR(chrome->find_toolbar)); + mq_find_toolbar_reveal(chrome->find_toolbar); gtk_widget_hide(chrome->menu_popover); } @@ -752,23 +752,21 @@ navigation_toolbar_new(MqTabChrome *chrome, const gchar *uri) } MqTabChrome * -mq_tab_chrome_new(MqTab *tab, MqWebView *web_view, const gchar *uri) +mq_tab_chrome_new(MqTab *tab, MqFindToolbar *find_toolbar, MqWebView *web_view, + const gchar *uri) { MqTabChrome *chrome; chrome = malloc(sizeof(*chrome)); chrome->config = mq_application_get_config(mq_tab_get_application(tab)); chrome->tab = tab; + chrome->find_toolbar = find_toolbar; chrome->web_view = web_view; chrome->container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start(GTK_BOX(chrome->container), navigation_toolbar_new(chrome, uri), FALSE, FALSE, 0); - chrome->find_toolbar = mq_find_toolbar_new(web_view); - gtk_box_pack_start(GTK_BOX(chrome->container), chrome->find_toolbar, - FALSE, FALSE, 0); - return chrome; } -- cgit v0.9.1