Merge lp:~laney/apport/no-yalign into lp:~apport-hackers/apport/trunk

Proposed by Iain Lane
Status: Merged
Merged at revision: 2967
Proposed branch: lp:~laney/apport/no-yalign
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
gtk/apport-gtk.ui (+1/-1)
To merge this branch: bzr merge lp:~laney/apport/no-yalign
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+261202@code.launchpad.net

Description of the change

This fixes a testsuite failure (fatal warnings) with gtk 3.16.

I'm going to upload it, but feel free to clobber with a better fix if you want.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Merged with a NEWS entry, thanks! For the wily upload it would be nice if you could push the GTK dependency as this doesn't look backwards compatible. (Not necessary to upload for just this, though.)

review: Approve
Revision history for this message
Iain Lane (laney) wrote :

On Fri, Jun 05, 2015 at 09:40:22PM -0000, Martin Pitt wrote:
> Review: Approve
>
> Merged with a NEWS entry, thanks! For the wily upload it would be nice if you could push the GTK dependency as this doesn't look backwards compatible. (Not necessary to upload for just this, though.)

I didn't verify, but the documentation says "Since: 3.0"

  https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget--valign

they only deprecated yalign this cycle, though. So seems it doesn't need
bumping?

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message
Martin Pitt (pitti) wrote :

Iain Lane [2015-06-08 10:39 -0000]:
> I didn't verify, but the documentation says "Since: 3.0"
>
> https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget--valign
>
> they only deprecated yalign this cycle, though. So seems it doesn't need
> bumping?

Ah, perfect. Thanks for verifying!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/apport-gtk.ui'
2--- gtk/apport-gtk.ui 2015-02-28 20:09:01 +0000
3+++ gtk/apport-gtk.ui 2015-06-05 10:54:20 +0000
4@@ -130,7 +130,7 @@
5 <object class="GtkImage" id="application_icon">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8- <property name="yalign">0</property>
9+ <property name="valign">start</property>
10 <property name="icon-name">dialog-error</property>
11 <property name="icon-size">6</property>
12 </object>

Subscribers

People subscribed via source and target branches