Merge lp:~not-used-anymore-deactivatedaccount/apport/fixes-bug-1422176 into lp:~apport-hackers/apport/trunk

[not-used-anymore]

Rationale: In apport gui, the error icon was not showing correctly. This needs to be fixed

Fix: in gui/apport-gtk, the constants used to reference the error dialog icon were legacy (deprecated). Changed from Gtk.STOCK_DIALOG_ERROR legacy constant to icon string 'dialog-error'

Also, in gui/apport-gtk.ui, fixed legacy icon reference 'gtk-dialog-error' to be current 'dialog-error'

Test: I could not find a way to test from the source code directory of the branch I downloaded. So, I booted up a vivid Ubuntu-Gnome instance using the LiveCD in a VM and selected "Try Ubuntu," then altered the /usr/share/apport/apport-gtk file with the changes described in "Fix:" above, then verified by running "apport-bug gnome-session" that the GUI now correctly showed the error icon.

[Martin Pitt (pitti)]

LGTM, thank you!

For the record, I usually call PYTHONPATH=. gtk/apport-gtk [args], and also running "test/run ui_gtk" cannot hurt.

review: Approve

[not-used-anymore (not-used-anymore-deactivatedaccount)]

You're welcome!

Wish I had known the "right" way to test at the time!

Take care,

Scott

On Mon, Mar 2, 2015 at 1:14 AM, Martin Pitt <email address hidden> wrote:

> Review: Approve
>
> LGTM, thank you!
>
> For the record, I usually call PYTHONPATH=. gtk/apport-gtk [args], and
> also running "test/run ui_gtk" cannot hurt.
> --
> https://code.launchpad.net/~aeoril/apport/fixes-bug-1422176/+merge/251375
> You are the owner of lp:~aeoril/apport/fixes-bug-1422176.
>

=== modified file 'gtk/apport-gtk'
--- gtk/apport-gtk	2015-02-06 07:55:25 +0000
+++ gtk/apport-gtk	2015-02-28 20:46:10 +0000
@@ -335,10 +335,10 @@
                     app_icon.set_from_pixbuf(pb)
             except GLib.GError:
                 self.w('application_icon').set_from_icon_name(
-                    Gtk.STOCK_DIALOG_ERROR, Gtk.IconSize.DIALOG)
+                    'dialog-error', Gtk.IconSize.DIALOG)
         else:
             self.w('application_icon').set_from_icon_name(
-                Gtk.STOCK_DIALOG_ERROR, Gtk.IconSize.DIALOG)
+                'dialog-error', Gtk.IconSize.DIALOG)
 
         d = self.w('dialog_crash_new')
         if 'DistroRelease' in self.report:

=== modified file 'gtk/apport-gtk.ui'
--- gtk/apport-gtk.ui	2014-12-19 06:31:22 +0000
+++ gtk/apport-gtk.ui	2015-02-28 20:46:10 +0000
@@ -131,7 +131,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="yalign">0</property>
-                <property name="icon-name">gtk-dialog-error</property>
+                <property name="icon-name">dialog-error</property>
                 <property name="icon-size">6</property>
               </object>
               <packing>