Merge lp:~arthurborsboom/xpad/xpad-4.3 into lp:xpad

[Arthur Borsboom]

[Arthur Borsboom (arthurborsboom)]

review: Approve

=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2014-06-13 15:50:29 +0000
+++ src/xpad-tray.c	2014-06-14 10:43:24 +0000
@@ -39,7 +39,7 @@
 };
 
 static void xpad_tray_open (XpadSettings *settings);
-static void xpad_tray_close ();
+static void xpad_tray_close (XpadSettings *settings);
 /* Enable/disable the tray icon */
 static void xpad_tray_toggle (XpadSettings *settings);
 /* tray icon left click handler */
@@ -86,7 +86,7 @@
 	    docklet = gtk_status_icon_new_from_icon_name (PACKAGE);
 
 	if (docklet) {
-		g_signal_connect (docklet, "activate", G_CALLBACK (xpad_tray_activate_cb), NULL);
+		g_signal_connect (docklet, "activate", G_CALLBACK (xpad_tray_activate_cb), settings);
 		g_signal_connect (docklet, "popup-menu", G_CALLBACK (xpad_tray_popup_menu_cb), NULL);
 	}
 }