[pavucontrol] 02/07: Handle IO errors when loading theme icon. Closes: #765725

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch master
in repository pavucontrol.

commit 1ac784098dbddb911f5150701eb2d10cd45779d9
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Oct 22 20:09:54 2014 -0300

    Handle IO errors when loading theme icon. Closes: #765725
---
 ...rol-Handle-IO-errors-in-icon-setting-code.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/0005-pavucontrol-Handle-IO-errors-in-icon-setting-code.patch b/debian/patches/0005-pavucontrol-Handle-IO-errors-in-icon-setting-code.patch
new file mode 100644
index 0000000..f6520ca
--- /dev/null
+++ b/debian/patches/0005-pavucontrol-Handle-IO-errors-in-icon-setting-code.patch
@@ -0,0 +1,23 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Wed, 22 Oct 2014 19:50:00 -0300
+Subject: pavucontrol: Handle IO errors in icon setting code
+
+If gtk cannot load the file, it will throw a Gio::Error. In that case
+fall back to setting the name.
+---
+ src/mainwindow.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mainwindow.cc b/src/mainwindow.cc
+index a67b15c..fbd72e8 100644
+--- a/src/mainwindow.cc
++++ b/src/mainwindow.cc
+@@ -249,6 +249,8 @@ static void set_icon_name_fallback(Gtk::Image *i, const char *name, Gtk::IconSiz
+             i->set(name);
+     } catch (Gtk::IconThemeError &e) {
+         i->set(name);
++    } catch (Gio::Error &e) {
++        i->set(name);
+     }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b20ca94..12b075c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-README-updating.patch
 0003-Reference-the-widget-before-returning-it-from-create.patch
 0004-Do-not-instantiate-cardwidget-devicewidget-and-rolew.patch
+0005-pavucontrol-Handle-IO-errors-in-icon-setting-code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pavucontrol.git