diff -u pavucontrol-0.9.7/debian/changelog pavucontrol-0.9.7/debian/changelog --- pavucontrol-0.9.7/debian/changelog +++ pavucontrol-0.9.7/debian/changelog @@ -1,3 +1,11 @@ +pavucontrol (0.9.7-1ubuntu2) jaunty; urgency=low + + * 0002-Handle-noninitialised-data.patch: Backport from upstream + 01e4826b653065268e7a4b8d57e528836e167a23, makes pavucontrol + more robust against LP #286273. + + -- Daniel T Chen Thu, 02 Apr 2009 00:21:20 -0400 + pavucontrol (0.9.7-1ubuntu1) jaunty; urgency=low * Merge from Debian unstable: diff -u pavucontrol-0.9.7/debian/patches/series pavucontrol-0.9.7/debian/patches/series --- pavucontrol-0.9.7/debian/patches/series +++ pavucontrol-0.9.7/debian/patches/series @@ -1,0 +2 @@ +0002-Handle-noninitialised-data.patch only in patch2: unchanged: --- pavucontrol-0.9.7.orig/debian/patches/0002-Handle-noninitialised-data.patch +++ pavucontrol-0.9.7/debian/patches/0002-Handle-noninitialised-data.patch @@ -0,0 +1,34 @@ +Index: pavucontrol-0.9.7/src/pavucontrol.cc +=================================================================== +--- pavucontrol-0.9.7.orig/src/pavucontrol.cc 2009-04-02 00:19:11.000000000 -0400 ++++ pavucontrol-0.9.7/src/pavucontrol.cc 2009-04-02 00:20:54.000000000 -0400 +@@ -940,7 +940,7 @@ + info.channel_map.channels = 1; + info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; + info.volume = volume; +- info.device = device.c_str(); ++ info.device = device == "" ? NULL : device.c_str(); + info.mute = muteToggleButton->get_active(); + + pa_operation* o; +@@ -952,7 +952,6 @@ + pa_operation_unref(o); + } + +- + /*** MainWindow ***/ + + MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x) : +@@ -1428,10 +1427,10 @@ + + eventRoleWidget->updating = true; + +- eventRoleWidget->device = info.device; ++ eventRoleWidget->device = info.device ? info.device : ""; + + volume.channels = 1; +- volume.values[0] = pa_cvolume_avg(&info.volume); ++ volume.values[0] = pa_cvolume_max(&info.volume); + + eventRoleWidget->setVolume(volume); + eventRoleWidget->muteToggleButton->set_active(info.mute);