Merge lp:~larsu/eog/fullscreen-button into lp:~ubuntu-desktop/eog/ubuntu

[Lars Karlitski]

* Correctly attribute traditional titlebar patch
* Add debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch (GNOME #755799)

* Correctly attribute traditional titlebar patch
* Add debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch (GNOME #755799)

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-29 11:54:23 +0000
+++ debian/changelog	2015-09-29 16:47:34 +0000
@@ -8,6 +8,8 @@
   * Add debian/patches/0001-Add-a-traditional-menu-bar.patch (LP: #1491699)
   * Update debian/patches/0002-Show-traditional-title-bar-in-unity.patch:
     update to make work with menubar patch and use GActionGroup's signals
+  * Add debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch
+    (GNOME #755799)
 
  -- Lars Uebernickel <[e-mail]>  Tue, 29 Sep 2015 12:30:46 +0200
 

=== modified file 'debian/patches/0002-Show-traditional-title-bar-in-unity.patch'
--- debian/patches/0002-Show-traditional-title-bar-in-unity.patch	2015-09-29 10:35:24 +0000
+++ debian/patches/0002-Show-traditional-title-bar-in-unity.patch	2015-09-29 16:47:34 +0000
@@ -3,7 +3,7 @@
 Date: Tue, 29 Sep 2015 12:25:29 +0200
 Subject: [PATCH 2/2] Show traditional title bar in unity
 
-Based on a patch by Sebastien Bacher <[e-mail]>
+Based on a patch by Iain Lane <[e-mail]>
 ---
  src/eog-window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++----------
  1 file changed, 55 insertions(+), 11 deletions(-)

=== added file 'debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch'
--- debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch	2015-09-29 16:47:34 +0000
@@ -0,0 +1,107 @@
+From c716887f49fd6c2d65f18da6d8784b5e84bb24b6 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Tue, 29 Sep 2015 18:25:08 +0200
+Subject: [PATCH] Put "Exit Fullscreen" button into toolbar
+
+So that the button has the same background as the toolbar itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755799
+---
+ data/fullscreen-toolbar.ui | 18 +++++++++++++++++-
+ src/eog-window.c           | 31 +++++--------------------------
+ 2 files changed, 22 insertions(+), 27 deletions(-)
+
+diff --git a/data/fullscreen-toolbar.ui b/data/fullscreen-toolbar.ui
+index 1d851b7..1f21a4b 100644
+--- a/data/fullscreen-toolbar.ui
++++ b/data/fullscreen-toolbar.ui
+@@ -5,7 +5,7 @@
+   <object class="GtkToolbar" id="fullscreen_toolbar">
+     <property name="visible">True</property>
+     <property name="can_focus">False</property>
+-    <property name="toolbar_style">icons</property>
++    <property name="toolbar_style">both-horiz</property>
+     <child>
+       <object class="GtkToolButton" id="first_button">
+         <property name="visible">True</property>
+@@ -226,5 +226,21 @@
+         <property name="homogeneous">True</property>
+       </packing>
+     </child>
++    <child>
++      <object class="GtkToolButton" id="exit_fullscreen_button">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="label" translatable="yes">_Leave Fullscreen</property>
++        <property name="use_underline">True</property>
++        <property name="tooltip_text" translatable="yes">Leave fullscreen mode</property>
++        <property name="icon_name">view-restore</property>
++        <property name="halign">end</property>
++        <property name="is_important">True</property>
++      </object>
++      <packing>
++        <property name="expand">True</property>
++        <property name="homogeneous">False</property>
++      </packing>
++    </child>
+   </object>
+ </interface>
+diff --git a/src/eog-window.c b/src/eog-window.c
+index 4e3c716..8c25852 100644
+--- a/src/eog-window.c
++++ b/src/eog-window.c
+@@ -1845,28 +1845,6 @@ exit_fullscreen_button_clicked_cb (GtkWidget *button, EogWindow *window)
+ }
+ 
+ static GtkWidget *
+-eog_window_get_exit_fullscreen_button (EogWindow *window)
+-{
+-	GtkWidget *button;
+-	GtkWidget *image;
+-
+-	button = gtk_button_new_with_mnemonic (_("_Leave Fullscreen"));
+-	image = gtk_image_new_from_icon_name ("view-restore",
+-					      GTK_ICON_SIZE_BUTTON);
+-	gtk_button_set_image (GTK_BUTTON (button), image);
+-	gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE);
+-	gtk_widget_set_tooltip_text(button,
+-				    _("Leave fullscreen mode"));
+-
+-
+-	g_signal_connect (button, "clicked",
+-			  G_CALLBACK (exit_fullscreen_button_clicked_cb),
+-			  window);
+-
+-	return button;
+-}
+-
+-static GtkWidget *
+ eog_window_create_fullscreen_popup (EogWindow *window)
+ {
+ 	GtkWidget *revealer;
+@@ -1891,10 +1869,10 @@ eog_window_create_fullscreen_popup (EogWindow *window)
+ 
+ 	gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0);
+ 
+-	g_object_unref (builder);
+-
+-	button = eog_window_get_exit_fullscreen_button (window);
+-	gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
++	button = GTK_WIDGET (gtk_builder_get_object (builder, "exit_fullscreen_button"));
++	g_signal_connect (button, "clicked",
++			  G_CALLBACK (exit_fullscreen_button_clicked_cb),
++			  window);
+ 
+ 	/* Disable timer when the pointer enters the toolbar window. */
+ 	g_signal_connect (revealer,
+@@ -1902,6 +1880,7 @@ eog_window_create_fullscreen_popup (EogWindow *window)
+ 			  G_CALLBACK (fullscreen_leave_notify_cb),
+ 			  window);
+ 
++	g_object_unref (builder);
+ 	return revealer;
+ }
+ 
+-- 
+2.5.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-09-29 10:35:24 +0000
+++ debian/patches/series	2015-09-29 16:47:34 +0000
@@ -1,2 +1,3 @@
 0001-Add-a-traditional-menu-bar.patch
 0002-Show-traditional-title-bar-in-unity.patch
+Put-Exit-Fullscreen-button-into-toolbar.patch