Merge lp:~darkxst/ubuntu/trusty/epiphany-browser/lp1263387 into lp:ubuntu/trusty/epiphany-browser

[Tim Lunn]

[Andrew Starr-Bochicchio (andrewsomething)]

Looks good to me. Thanks for working on this!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-14 07:46:25 +0000
+++ debian/changelog	2013-12-22 00:30:39 +0000
@@ -1,3 +1,10 @@
+epiphany-browser (3.10.3-0ubuntu2) trusty; urgency=medium
+
+  * debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
+    for non-GNOME sessions (LP: #1263387)
+
+ -- Tim Lunn <[e-mail]>  Sun, 22 Dec 2013 11:03:08 +1100
+
 epiphany-browser (3.10.3-0ubuntu1) trusty; urgency=low
 
   * New upstream release (LP: #1260942)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-11-13 11:39:29 +0000
+++ debian/patches/series	2013-12-22 00:30:39 +0000
@@ -3,3 +3,4 @@
 07_bookmarks.patch
 12_safetypes.patch
 81_ubuntu_force_update_bookmarks_menu.patch
+ubuntu_titlebars.patch

=== added file 'debian/patches/ubuntu_titlebars.patch'
--- debian/patches/ubuntu_titlebars.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_titlebars.patch	2013-12-22 00:30:39 +0000
@@ -0,0 +1,84 @@
+From 716669f8d58efd5391ab7c8c8972615ada294a0f Mon Sep 17 00:00:00 2001
+From: Yosef Or Boczko <[e-mail]>
+Date: Thu, 29 Aug 2013 22:34:37 +0300
+Subject: wphy-window: Use the top bar GtkBox as titlebar
+
+The GtkEventBox is to ensure opacity (see
+bug #706045).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706050
+
+Modified to only show titlebars under non-GNOME sessions
+
+---
+
+
+--- a/src/ephy-window.c
++++ b/src/ephy-window.c
+@@ -3720,9 +3720,13 @@
+ 	gtk_widget_set_margin_bottom (toolbar, 5);
+ 	gtk_widget_set_margin_left (toolbar, 6);
+ 	gtk_widget_set_margin_right (toolbar, 6);
+-	gtk_container_add (GTK_CONTAINER (frame), toolbar);
+-	gtk_widget_show (frame);
+-	gtk_window_set_titlebar (GTK_WINDOW (window), frame);
++	if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME")) {
++		gtk_container_add (GTK_CONTAINER (frame), toolbar);
++		gtk_widget_show (frame);
++		gtk_window_set_titlebar (GTK_WINDOW (window), frame);
++	} else
++		gtk_box_pack_start (GTK_BOX (priv->main_vbox),
++			            toolbar, FALSE, FALSE, 0);
+ 
+ 	action = gtk_action_group_get_action (priv->toolbar_action_group,
+ 					      "NavigationBack");
+--- a/src/ephy-toolbar.c
++++ b/src/ephy-toolbar.c
+@@ -252,27 +252,29 @@
+   }
+ 
+   /* Separator and Close */
+-  separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+-  gtk_container_add (GTK_CONTAINER (toolbar), separator);
+-  gtk_widget_show_all (separator);
++  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME")) {
++    separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
++    gtk_container_add (GTK_CONTAINER (toolbar), separator);
++    gtk_widget_show_all (separator);
+ 
+-  if (gtk_widget_get_direction (GTK_WIDGET (separator)) == GTK_TEXT_DIR_RTL)
+-    gtk_widget_set_margin_right (GTK_WIDGET (separator), 6);
+-  else
+-    gtk_widget_set_margin_left (GTK_WIDGET (separator), 6);
++    if (gtk_widget_get_direction (GTK_WIDGET (separator)) == GTK_TEXT_DIR_RTL)
++      gtk_widget_set_margin_right (GTK_WIDGET (separator), 6);
++    else
++      gtk_widget_set_margin_left (GTK_WIDGET (separator), 6);
+ 
+-  button = gtk_button_new_from_icon_name ("window-close-symbolic",
+-                                          GTK_ICON_SIZE_MENU);
+-  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+-  g_signal_connect (button, "clicked",
+-                    G_CALLBACK (close_button_clicked), NULL);
+-  gtk_container_add (GTK_CONTAINER (toolbar), button);
+-  gtk_widget_show_all (button);
++    button = gtk_button_new_from_icon_name ("window-close-symbolic",
++                                            GTK_ICON_SIZE_MENU);
++    gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
++    g_signal_connect (button, "clicked",
++                      G_CALLBACK (close_button_clicked), NULL);
++    gtk_container_add (GTK_CONTAINER (toolbar), button);
++    gtk_widget_show_all (button);
+ 
+-  if (gtk_widget_get_direction (button) == GTK_TEXT_DIR_RTL)
+-    gtk_widget_set_margin_right (button, 6);
+-  else
+-    gtk_widget_set_margin_left (button, 6);
++    if (gtk_widget_get_direction (button) == GTK_TEXT_DIR_RTL)
++      gtk_widget_set_margin_right (button, 6);
++    else
++      gtk_widget_set_margin_left (button, 6);
++  }
+ }
+ 
+ static void