diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-29 14:18:08 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-29 14:18:08 -0400 |
| commit | 3b20beb8d80e6b0ac12ef17e4f10e1d5dcc9fe55 (patch) | |
| tree | f1f686307b48aa5484f27de77a08d52f91220826 /gtk2_ardour | |
| parent | 197e75ab80a863585d83b515de8762407dfc70e1 (diff) | |
| parent | 16f8fc06578dac939e9d26af2f016a2d42405d7a (diff) | |
Merge branch 'patches' of https://github.com/jdekozak/ardour
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/startup.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/utils.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index a0ae965f07..72c7d5e8b5 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -1459,7 +1459,7 @@ ArdourStartup::info_scroller_update() char buf[512]; snprintf (buf, std::min(info_scroller_count,sizeof(buf)-1), "%s", ARDOUR_UI::instance()->announce_string().c_str() ); - buf[info_scroller_count] = NULL; + buf[info_scroller_count] = 0; info_scroller_label.set_text (buf); info_scroller_label.show(); diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index aa68519560..19f93ad2e8 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -676,7 +676,7 @@ set_pango_fontsize () /* FT2 rendering - used by GnomeCanvas, sigh */ - pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_for_display(), val/1024, val/1024); + pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024); /* Cairo rendering, in case there is any */ |