Updated readme for 0.12-rc6

ChangeLog

@@ -1,4 +1,4 @@
-2015-05-23 master
+2015-06-12 master
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
   offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
   already present. They are marked with '(already released by distros)'.
@@ -70,6 +70,7 @@
     background of other icons;
   - a crash caused by a change that prevents Google Chrome (and possibly other misbehaving applications) from leaving a large
     number of empty icons in the system tray;
+  - a crash caused by the system tray code on computers with ATI cards;
   - the panel window had a shadow;
   - some ATI drivers return an extra monitor with size zero which should be ignored when using panel_monitor = all;
   - the battery applet was sometimes working incorrectly with certain laptop models (the battery applet stopped updating after

README.md

@@ -1,14 +1,14 @@
-### New unstable release: 0.12-rc5
+### New unstable release: 0.12-rc6
 Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
 
 Documentation: https://gitlab.com/o9000/tint2/wikis/home
 
 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-mkdir tint2-0.12-rc5
+mkdir tint2-0.12-rc6
-cd tint2-0.12-rc5
+cd tint2-0.12-rc6
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc5' --output-document tint2-0.12-rc5.tar.gz
+wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc6' --output-document tint2-0.12-rc6.tar.gz
-tar -xzf tint2-0.12-rc5.tar.gz
+tar -xzf tint2-0.12-rc6.tar.gz
 cd tint2.git
 mkdir build
 cd build

src/systray/systraybar.c

@@ -746,7 +746,7 @@ void systray_render_icon_composited(void* t)
 	// drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
 	Pixmap tmp_pmap = XCreatePixmap(server.dsp, traywin->win, traywin->width, traywin->height, 32);
 	if (!tmp_pmap) {
-		goto on_error;
+		goto on_systray_error;
 	}
 	XRenderPictFormat *f;
 	if (traywin->depth == 24) {
@@ -761,7 +761,7 @@ void systray_render_icon_composited(void* t)
 	XRenderPictFormat *f32 = XRenderFindVisualFormat(server.dsp, server.visual32);
 	if (!f || !f32) {
 		XFreePixmap(server.dsp, tmp_pmap);
-		goto on_error;
+		goto on_systray_error;
 	}
 
 	XSync(server.dsp, False);
@@ -833,7 +833,11 @@ void systray_render_icon_composited(void* t)
 	return;
 
 on_error:
-	printf("systray: rendering error. Disabling compositing and restarting systray...\n");
+	printf("systray %d: rendering error for icon %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
+	return;
+
+on_systray_error:
+	printf("systray %d: rendering error for icon %lu pid %d. Disabling compositing and restarting systray...\n", __LINE__, traywin->win, traywin->pid);
 	systray_composited = 0;
 	stop_net();
 	start_net();