fix some memleaks

Author: jcupitt

README.md

@@ -230,12 +230,6 @@ On success, merge to master.
 
 ## TODO
 
-- paste kills it
-
-- copy then paste into gimp doesn't seem to work
-
-- test drag/drop too
-
 - get `object_unref: assertion 'G_IS_OBJECT (object)' failed` during free of
   stack ... seems to be a harmless minor glib bug with `g_clear_object()`
   failing with a crit for a null value
@@ -244,7 +238,8 @@ On success, merge to master.
 
 - load cancel does not work
 
-- duplicate should copy all view params?
+- duplicate should copy more view params? slider settings? scale and
+  position?
 
 - check mem use, esp with three large images loaded
 

src/gtkutil.c

@@ -127,6 +127,14 @@ change_state(GtkWidget *widget, const char *name, GVariant *state)
 		g_action_change_state(action, state);
 }
 
+void
+set_state(GtkWidget *to, GSettings *settings, const char *name)
+{
+	g_autoptr(GVariant) var = g_settings_get_value(settings, name);
+
+	change_state(to, name, var);
+}
+
 GVariant *
 get_state(GtkWidget *widget, const char *name)
 {

src/gtkutil.h

@@ -10,6 +10,7 @@ void copy_adj(GtkAdjustment *to, GtkAdjustment *from);
 void change_state(GtkWidget *widget, const char *name, GVariant *state);
 GVariant *get_state(GtkWidget *widget, const char *name);
 void copy_state(GtkWidget *to, GtkWidget *from, const char *name);
+void set_state(GtkWidget *to, GSettings *settings, const char *name);
 
 void process_events(void);
 

src/imagewindow.c

@@ -634,7 +634,8 @@ image_window_imageui_set_visible(ImageWindow *win,
 
 		/* Enable the control settings, if the displaycontrolbar is on.
 		 */
-		GVariant *control = g_settings_get_value(win->settings, "control");
+		g_autoptr(GVariant) control = 
+			g_settings_get_value(win->settings, "control");
 		g_object_set(new_tile_source,
 			"active", g_variant_get_boolean(control),
 			"visible", TRUE,
@@ -1562,17 +1563,12 @@ image_window_init(ImageWindow *win)
 	 * instead.
 	 */
 
-	/* Initialise from settings.
+	/* Menu state from settings.
 	 */
-	change_state(GTK_WIDGET(win), "properties",
-		g_settings_get_value(win->settings, "properties"));
-
-	/* Initial menu state from settings.
-	 */
-	change_state(GTK_WIDGET(win), "control",
-		g_settings_get_value(win->settings, "control"));
-	change_state(GTK_WIDGET(win), "info",
-		g_settings_get_value(win->settings, "info"));
+	set_state(GTK_WIDGET(win), win->settings, "properties");
+	set_state(GTK_WIDGET(win), win->settings, "control");
+	set_state(GTK_WIDGET(win), win->settings, "info");
+	set_state(GTK_WIDGET(win), win->settings, "background");
 
 	// some kind of gtk bug? hexpand on properties can't be set from .ui or in
 	// properties.c, but must be set after adding to a parent