r34663 - in /desktop/unstable/epiphany-browser/debian: changelog patches/13_toolbar_size_fixes.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Apr 30 16:04:51 2012
New Revision: 34663

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34663
Log:
debian/patches/13_toolbar_size_fixes.patch: Add location entry and
stop/reload button to a vertical GtkSizeGroup. This ensures that they
have the same height, regardless of things like fonts.
Patch cherry-picked from upstream Git.

Added:
    desktop/unstable/epiphany-browser/debian/patches/13_toolbar_size_fixes.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=34663&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Mon Apr 30 16:04:51 2012
@@ -7,8 +7,12 @@
 
   [ Michael Biebl ]
   * New upstream release.
-
- -- Michael Biebl <biebl at debian.org>  Mon, 30 Apr 2012 18:01:40 +0200
+  * debian/patches/13_toolbar_size_fixes.patch: Add location entry and
+    stop/reload button to a vertical GtkSizeGroup. This ensures that they
+    have the same height, regardless of things like fonts.
+    Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 30 Apr 2012 18:03:43 +0200
 
 epiphany-browser (3.4.0.1-2) experimental; urgency=low
 

Added: desktop/unstable/epiphany-browser/debian/patches/13_toolbar_size_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/13_toolbar_size_fixes.patch?rev=34663&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/13_toolbar_size_fixes.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/13_toolbar_size_fixes.patch [utf-8] Mon Apr 30 16:04:51 2012
@@ -1,0 +1,45 @@
+commit 71a003cab0961d03c9bbdd4452e3a4b9e921accd
+Author: Diego Escalante Urrelo <diegoe at igalia.com>
+Date:   Tue Mar 27 05:31:49 2012 -0500
+
+    ephy-toolbar: fix stop/reload button alignment
+    
+    Add location entry and stop/reload button to a vertical GtkSizeGroup.
+    This ensures that they have the same height, regardless of things like
+    fonts.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=668135
+
+diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
+index 6e10753..97a72a1 100644
+--- a/src/ephy-toolbar.c
++++ b/src/ephy-toolbar.c
+@@ -85,11 +85,16 @@ ephy_toolbar_constructed (GObject *object)
+   GtkAction *action;
+   GtkToolItem *back_forward, *location_stop_reload, *tool_item;
+   GtkWidget *tool_button, *box, *location, *toolbar;
++  GtkSizeGroup *size;
+ 
+   G_OBJECT_CLASS (ephy_toolbar_parent_class)->constructed (object);
+ 
+   toolbar = GTK_WIDGET (object);
+ 
++  /* Create a GtkSizeGroup to sync the height of the location entry, and
++   * the stop/reload button. */
++  size = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
++
+   /* Set the MENUBAR style class so it's possible to drag the app
+    * using the toolbar. */
+   gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
+@@ -160,6 +165,11 @@ ephy_toolbar_constructed (GObject *object)
+                            NULL);
+   
+   gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (location_stop_reload));
++
++  gtk_size_group_add_widget (size, tool_button);
++  gtk_size_group_add_widget (size, location);
++  g_object_unref (size);
++
+   gtk_widget_set_margin_right (GTK_WIDGET (location_stop_reload), 12);
+   gtk_widget_show_all (GTK_WIDGET (location_stop_reload));
+ 

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=34663&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Mon Apr 30 16:04:51 2012
@@ -2,3 +2,4 @@
 01_email-as-user-for-password-remembering.patch
 07_bookmarks.patch
 12_safetypes.patch
+13_toolbar_size_fixes.patch