Midori Web Browser

Merge lp:~elementary-apps/midori/fix-granite-decorations into lp:midori

  1. fix-granite-decorations
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 6759
Merged at revision: 6760
Proposed branch: lp:~elementary-apps/midori/fix-granite-decorations
Merge into: lp:midori
Diff against target: 21 lines (+3/-1)
1 file modified
midori/midori-browser.c (+3/-1)
To merge this branch: bzr merge lp:~elementary-apps/midori/fix-granite-decorations
Reviewer Review Type Date Requested Status
Danielle Foré (community) Approve
Review via email: mp+228044@code.launchpad.net

Commit message

don't hide window decorations for Midori-Granite

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2014-07-24 06:01:27 +0000
3+++ midori/midori-browser.c 2014-07-24 06:10:55 +0000
4@@ -5824,8 +5824,10 @@
5 gtk_window_set_role (GTK_WINDOW (browser), "browser");
6 gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER);
7 #if GTK_CHECK_VERSION (3, 4, 0)
8+ #ifndef HAVE_GRANITE
9 gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE);
10 #endif
11+ #endif
12 vbox = gtk_vbox_new (FALSE, 0);
13 gtk_container_add (GTK_CONTAINER (browser), vbox);
14 gtk_widget_show (vbox);
15@@ -7571,4 +7573,4 @@
16 g_return_if_fail (MIDORI_IS_BROWSER (browser));
17
18 g_signal_emit (browser, signals[QUIT], 0);
19-}
20+}
21\ No newline at end of file

Subscribers

People subscribed via source and target branches