summaryrefslogtreecommitdiff
path: root/mixer
diff options
context:
space:
mode:
authorCallum McKenzie <callum@src.gnome.org>2008-08-26 22:11:26 +0000
committerCallum McKenzie <callum@src.gnome.org>2008-08-26 22:11:26 +0000
commit478a2bbdd51bc77775d2d896089dbacad82702c6 (patch)
tree2306b41aea07fd9c9c60f3af8270b64ec4a0b360 /mixer
parent37499a04b7cdfe32a5199c0e4a3eb02ee21d4437 (diff)
Stop the mixer crashing if the icon cannot be found in an RTL environment. Bug 509065.
svn path=/trunk/; revision=10937
Diffstat (limited to 'mixer')
-rw-r--r--mixer/ChangeLog5
-rw-r--r--mixer/applet.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/mixer/ChangeLog b/mixer/ChangeLog
index 6089e7988..f2e501849 100644
--- a/mixer/ChangeLog
+++ b/mixer/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-27 Callum McKenzie <callum@spooky-possum.org>
+
+ * applet.c: Patch from Cosimo Cecchi to avoid a crash when the
+ panel icon cannot be found. Bug 509065.
+
2008-08-19 Rodrigo Moya <rodrigo@gnome-db.org>
* dock.c (destroy_source): set function to void explicitly, to
diff --git a/mixer/applet.c b/mixer/applet.c
index 8d1ea48da..c4fa558e6 100644
--- a/mixer/applet.c
+++ b/mixer/applet.c
@@ -135,7 +135,8 @@ init_pixbufs (GnomeVolumeApplet *applet)
applet->panel_size - 4,
0,
NULL);
- if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
+ if (applet->pix[n] != NULL &&
+ gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
GdkPixbuf *temp;
temp = gdk_pixbuf_flip (applet->pix[n], TRUE);