diff -u gxmms2-0.7.0/debian/changelog gxmms2-0.7.0/debian/changelog
--- gxmms2-0.7.0/debian/changelog
+++ gxmms2-0.7.0/debian/changelog
@@ -1,3 +1,12 @@
+gxmms2 (0.7.0-2ubuntu1) jaunty; urgency=low
+
+  * Added debian/gxmms2.desktop and moved xmms2-core from Suggests to Depends
+    because this package contains the xmms2 icon.
+  * gxmms2src/gxmms2.c: Do not assume that the volume control has a left
+    channel (fixes muting of playback on launch, LP: #292822).
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Sat, 21 Feb 2009 17:32:51 +0100
+
 gxmms2 (0.7.0-2) unstable; urgency=low
 
   * Be compatible with xmms2 DrLecter.
diff -u gxmms2-0.7.0/debian/gxmms2.install gxmms2-0.7.0/debian/gxmms2.install
--- gxmms2-0.7.0/debian/gxmms2.install
+++ gxmms2-0.7.0/debian/gxmms2.install
@@ -1,3 +1,4 @@
 usr/bin/gxmms2
+usr/share/applications
 usr/share/gxmms2/gxmms2_mini.xpm
 usr/share/gxmms2/README usr/share/doc/gxmms2/
diff -u gxmms2-0.7.0/debian/control gxmms2-0.7.0/debian/control
--- gxmms2-0.7.0/debian/control
+++ gxmms2-0.7.0/debian/control
@@ -11,8 +11,7 @@
 
 Package: gxmms2
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: xmms2-core
+Depends: ${shlibs:Depends}, ${misc:Depends}, xmms2-core
 Description: xmms2 client for the GNOME desktop
  gxmms2 is a GTK2 based XMMS2 client, written in C. Its main window is small
  and simple. It includes a playlist editor and a file details dialog.
diff -u gxmms2-0.7.0/debian/rules gxmms2-0.7.0/debian/rules
--- gxmms2-0.7.0/debian/rules
+++ gxmms2-0.7.0/debian/rules
@@ -27,6 +27,8 @@
 	dh_installdirs
 	$(MAKE) install install_gkrellxmms2 PREFIX=$(CURDIR)/debian/tmp/usr KRELLPREFIX=$(CURDIR)/debian/tmp/usr
 	chmod a-x $(CURDIR)/debian/tmp/usr/share/gxmms2/gxmms2_mini.xpm
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications
+	install -m 0644 debian/gxmms2.desktop $(CURDIR)/debian/tmp/usr/share/applications
 	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
 
 binary-indep:
@@ -38,6 +40,7 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installman
+	dh_desktop
 	dh_strip
 	dh_compress
 	dh_fixperms
only in patch2:
unchanged:
--- gxmms2-0.7.0.orig/debian/gxmms2.desktop
+++ gxmms2-0.7.0/debian/gxmms2.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=gxmms2
+GenericName=Audio Player
+Comment=Play music
+Comment[de]=Musik abspielen
+Categories=GTK;AudioVideo;Audio;Player;
+Exec=gxmms2
+Icon=xmms2
+Terminal=false
+Type=Application
only in patch2:
unchanged:
--- gxmms2-0.7.0.orig/gxmms2src/gxmms2.c
+++ gxmms2-0.7.0/gxmms2src/gxmms2.c
@@ -108,24 +108,44 @@
 	xmms2ctrl_volume_set(connection, volume);
 }
 
-static void bc_handle_volume_change(xmmsc_result_t *res, void *userdata)
+static void bc_handle_volume_change_channel(const void *key,
+                                     xmmsc_result_value_type_t type,
+                                     const void *value,
+                                     void *user_data)
 {
 	guint32 volume;
 	gchar   buf[64];
-	
-	xmmsc_result_get_dict_entry_uint(res, "left", &volume);
-	wejpvolume_set_volume(WEJPVOLUME(wv), volume);
-	snprintf(buf, 63, "Volume: %d %%", volume);
-	wejpscroller_shortmessage_show(WEJPSCROLLER(scroller), buf, 50);
+
+	if(type == XMMSC_RESULT_VALUE_TYPE_UINT32) {
+		volume = (guint32)(size_t)value;
+		wejpvolume_set_volume(WEJPVOLUME(wv), volume);
+		snprintf(buf, 63, "Volume: %d %%", volume);
+		wejpscroller_shortmessage_show(WEJPSCROLLER(scroller), buf, 50);
+	}
 }
 
-static void n_volume_init(xmmsc_result_t *res, void *userdata)
+static void bc_handle_volume_change(xmmsc_result_t *res, void *userdata)
+{
+	xmmsc_result_dict_foreach(res, bc_handle_volume_change_channel, NULL);
+}
+
+static void n_volume_init_channel(const void *key,
+                           xmmsc_result_value_type_t type,
+                           const void *value,
+                           void *user_data)
 {
 	guint32 volume;
-	
-	xmmsc_result_get_dict_entry_uint(res, "left", &volume);
-	wejpvolume_set_volume(WEJPVOLUME(wv), volume);
-	change_volume(0, volume);
+
+	if(type == XMMSC_RESULT_VALUE_TYPE_UINT32) {
+		volume = (guint32)(size_t)value;
+		wejpvolume_set_volume(WEJPVOLUME(wv), volume);
+		change_volume(0, volume);
+	}
+}
+
+static void n_volume_init(xmmsc_result_t *res, void *userdata)
+{
+	xmmsc_result_dict_foreach(res, n_volume_init_channel, NULL);
 	xmmsc_result_unref(res);
 }