Fix applets sometimes not updating

when maximizing an unmaximized active window

.gitignore

@@ -0,0 +1 @@
+/build

window-buttons-applet/window-buttons-applet.vala

@@ -13,6 +13,7 @@ namespace WindowButtonsApplet{
 		}
 
 		private Wnck.Window* window = null;
+		private Wnck.Window *active_window = null;
 
 		public GLib.Settings gsettings = new GLib.Settings("org.mate.window-applets.window-buttons");
 		public GLib.Settings marco_gsettings = new GLib.Settings("org.mate.Marco.general");
@@ -81,13 +82,19 @@ namespace WindowButtonsApplet{
 
 		public void reload(){
 
+			// Disconnect signals from old window
 			if(window != null){
 				window->actions_changed.disconnect(reload);
 				window->state_changed.disconnect(reload);
 			}
 
+			if(active_window != null)
+				active_window->state_changed.disconnect(reload);
+
+
 			window = get_current_window();
 
+			// Watch for changes to new controlled window
 			if(window != null){
 				window->actions_changed.connect(reload);
 				window->state_changed.connect(reload);
@@ -100,6 +107,11 @@ namespace WindowButtonsApplet{
 				MAXIMIZE.set_visible(false);
 			}
 
+			// When active window is not the controlled window (because it is unmaximized),
+			// we need to watch its state as well
+			active_window = Wnck.Screen.get_default().get_active_window();
+			if(active_window != null && active_window != window)
+				active_window->state_changed.connect(reload);
 		}
 
 		public void change_layout(){
@@ -205,7 +217,7 @@ namespace WindowButtonsApplet{
 				break;
 				case "active-maximized":
 					win = Wnck.Screen.get_default().get_active_window();
-					if(!win->is_maximized())
+					if(win != null && !win->is_maximized())
 						win = null;
 				break;
 				case "topmost-maximized":

window-menu-applet/window-menu-applet.vala

@@ -4,31 +4,42 @@ namespace WindowMenuApplet{
 
 	WindowWidgets.WindowMenuButton button;
 	Wnck.Window *window;
+	Wnck.Window *active_window;
 
 	GLib.Settings gsettings;
 
 	public void reload(){
-		string behaviour = gsettings.get_string("behaviour");
 
+		// Disconnect signals from old window
 		if(window != null){
 			window->icon_changed.disconnect(button.icon_set);
 			window->actions_changed.disconnect(button.menu_set);
 			window->state_changed.disconnect(reload);
 		}
 
+		if(active_window != null)
+			active_window->state_changed.disconnect(reload);
+
+
 		window = get_current_window();
 
 		button.window = window;
 
 		button.icon_set();
 		button.menu_set();
 
+		// Watch for changes to new controlled window
 		if(window != null){
 			window->icon_changed.connect(button.icon_set);
 			window->actions_changed.connect(button.menu_set);
-			if(behaviour == "topmost-maximized")
-				window->state_changed.connect(reload);
+			window->state_changed.connect(reload);
 		}
+
+		// When active window is not the controlled window (because it is unmaximized),
+		// we need to watch its state as well
+		active_window = Wnck.Screen.get_default().get_active_window();
+		if(active_window != null && active_window != window)
+			active_window->state_changed.connect(reload);
 	}
 
 	public void change_orient(MatePanel.Applet applet){
@@ -66,7 +77,7 @@ namespace WindowMenuApplet{
 			break;
 			case "active-maximized":
 				win = Wnck.Screen.get_default().get_active_window();
-				if(!win->is_maximized())
+				if(win != null && !win->is_maximized())
 					win = null;
 			break;
 			case "topmost-maximized":

window-title-applet/window-title-applet.vala

@@ -2,26 +2,38 @@ namespace WindowTitleApplet{
 
 	Gtk.Label title;
 	Wnck.Window *window;
+	Wnck.Window *active_window;
 
 	GLib.Settings gsettings;
 
 	public void reload(){
-		string behaviour = gsettings.get_string("behaviour");
-
+
+		// Disconnect signals from old window
 		if(window != null){
 			window->name_changed.disconnect(update);
 			window->state_changed.disconnect(reload);
 		}
 
+		if(active_window != null)
+			active_window->state_changed.disconnect(reload);
+
+
 		window = get_current_window();
 
 		update();
 
+
+		// Watch for changes to new controlled window
 		if(window != null){
 			window->name_changed.connect(update);
-			if(behaviour == "topmost-maximized")
-				window->state_changed.connect(reload);
+			window->state_changed.connect(reload);
 		}
+
+		// When active window is not the controlled window (because it is unmaximized),
+		// we need to watch its state as well
+		active_window = Wnck.Screen.get_default().get_active_window();
+		if(active_window != null && active_window != window)
+			active_window->state_changed.connect(reload);
 	}
 
 	public void update(){
@@ -48,7 +60,7 @@ namespace WindowTitleApplet{
 			break;
 			case "active-maximized":
 				win = Wnck.Screen.get_default().get_active_window();
-				if(!win->is_maximized())
+				if(win != null && !win->is_maximized())
 					win = null;
 			break;
 			case "topmost-maximized":