diff options
| author | Nils Philippsen <nils@tiptoe.de> | 2016-08-04 09:48:47 +0200 |
|---|---|---|
| committer | Nils Philippsen <nils@tiptoe.de> | 2016-08-04 09:52:22 +0200 |
| commit | 65c2e089ab263c83bff7d2e945b80c53f80b749b (patch) | |
| tree | 4009d005e196cf1d21c3cef8159e5f99be4d4e59 /gtk2_ardour/startup.cc | |
| parent | d6fd0486aef08fcccf013d889734971ed01eaedd (diff) | |
workaround changes in glibmm 2.49.x
Glib::RefPtr defines the operator bool() as explicit which breaks
comparisons like "some_ref_ptr == 0" or "... != 0".
https://bugzilla.gnome.org/show_bug.cgi?id=769502
Diffstat (limited to 'gtk2_ardour/startup.cc')
| -rw-r--r-- | gtk2_ardour/startup.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 58c1cfc7ad..12f98916bf 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -80,23 +80,23 @@ ArdourStartup::ArdourStartup () set_position (WIN_POS_CENTER); set_border_width (12); - if ((icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px")) == 0) { + if (! (icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px"))) { throw failed_constructor(); } list<Glib::RefPtr<Gdk::Pixbuf> > window_icons; Glib::RefPtr<Gdk::Pixbuf> icon; - if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px")) != 0) { + if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px"))) { window_icons.push_back (icon); } - if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px")) != 0) { + if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px"))) { window_icons.push_back (icon); } - if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px")) != 0) { + if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px"))) { window_icons.push_back (icon); } - if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px")) != 0) { + if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px"))) { window_icons.push_back (icon); } if (!window_icons.empty ()) { |