xref: /OK3568_Linux_fs/buildroot/package/midori/0001-fix-bug-1492932.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1*4882a593SmuzhiyunFix for https://bugs.launchpad.net/midori/+bug/1492932
2*4882a593SmuzhiyunPatch status: upstream
3*4882a593Smuzhiyun
4*4882a593SmuzhiyunSigned-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
5*4882a593Smuzhiyun
6*4882a593Smuzhiyun--- a/midori/midori-browser.c	2015-07-11 16:03:43 +0000
7*4882a593Smuzhiyun+++ b/midori/midori-browser.c	2015-09-25 21:30:31 +0000
8*4882a593Smuzhiyun@@ -5953,11 +5953,6 @@
9*4882a593Smuzhiyun                       G_CALLBACK (midori_browser_destroy_cb), NULL);
10*4882a593Smuzhiyun     gtk_window_set_role (GTK_WINDOW (browser), "browser");
11*4882a593Smuzhiyun     gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER);
12*4882a593Smuzhiyun-    #if GTK_CHECK_VERSION (3, 4, 0)
13*4882a593Smuzhiyun-    #ifndef HAVE_GRANITE
14*4882a593Smuzhiyun-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE);
15*4882a593Smuzhiyun-    #endif
16*4882a593Smuzhiyun-    #endif
17*4882a593Smuzhiyun     vbox = gtk_vbox_new (FALSE, 0);
18*4882a593Smuzhiyun     /* gtk_container_add (GTK_CONTAINER (browser), vbox);
19*4882a593Smuzhiyun     gtk_widget_show (vbox); */
20*4882a593Smuzhiyun
21*4882a593Smuzhiyun--- a/midori/midori-view.c	2015-07-06 21:26:46 +0000
22*4882a593Smuzhiyun+++ b/midori/midori-view.c	2015-09-25 21:30:31 +0000
23*4882a593Smuzhiyun@@ -3495,9 +3495,6 @@
24*4882a593Smuzhiyun     }
25*4882a593Smuzhiyun     else
26*4882a593Smuzhiyun         gtk_window_set_icon_name (GTK_WINDOW (window), icon_name);
27*4882a593Smuzhiyun-    #if GTK_CHECK_VERSION (3, 4, 0)
28*4882a593Smuzhiyun-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE);
29*4882a593Smuzhiyun-    #endif
30*4882a593Smuzhiyun     gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100);
31*4882a593Smuzhiyun     #if GTK_CHECK_VERSION (3, 0, 0)
32*4882a593Smuzhiyun     scrolled = gtk_scrolled_window_new (NULL, NULL);
33*4882a593Smuzhiyun
34*4882a593Smuzhiyun--- a/midori/midori-window.vala	2015-08-16 00:14:26 +0000
35*4882a593Smuzhiyun+++ b/midori/midori-window.vala	2015-09-25 21:30:31 +0000
36*4882a593Smuzhiyun@@ -28,7 +28,6 @@
37*4882a593Smuzhiyun                 toolbar.show_arrow = true;
38*4882a593Smuzhiyun #if HAVE_GTK3
39*4882a593Smuzhiyun                 toolbar.get_style_context ().add_class ("primary-toolbar");
40*4882a593Smuzhiyun-                hide_titlebar_when_maximized = true;
41*4882a593Smuzhiyun #endif
42*4882a593Smuzhiyun                 toolbar.popup_context_menu.connect ((x, y, button) => {
43*4882a593Smuzhiyun                     return button == 3 && context_menu (toolbar); });
44*4882a593Smuzhiyun
45