diff options
| author | lukefromdc <[email protected]> | 2019-01-28 02:57:40 -0500 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-01-29 22:17:19 +0100 |
| commit | 371e3d7cb45ed908ce2f04d9972129c69ff156eb (patch) | |
| tree | a7145c2d04597286502b06993b3d09a4825d0185 | |
| parent | c733d206b9e389b0ff1945f0ace496b9d3ad4a10 (diff) | |
| download | mate-panel-371e3d7cb45ed908ce2f04d9972129c69ff156eb.tar.bz2 mate-panel-371e3d7cb45ed908ce2f04d9972129c69ff156eb.tar.xz | |
fix crash on removing tray
*clear applet gsettings on dispose to stop crash and memory leak introduced in github.com/mate-desktop/mate-panel/commit/10b9c30fc79de5f8d9516ba153df233c4968da65
*tray: fix misplaced g_return_if_fail check
| -rw-r--r-- | applets/notification_area/main.c | 1 | ||||
| -rw-r--r-- | applets/notification_area/na-grid.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c index 8f8db2ff..271d22f8 100644 --- a/applets/notification_area/main.c +++ b/applets/notification_area/main.c @@ -333,6 +333,7 @@ na_tray_applet_realize (GtkWidget *widget) static void na_tray_applet_dispose (GObject *object) { + g_clear_object (&NA_TRAY_APPLET (object)->priv->settings); #ifdef PROVIDE_WATCHER_SERVICE g_clear_object (&NA_TRAY_APPLET (object)->priv->sn_watcher); #endif diff --git a/applets/notification_area/na-grid.c b/applets/notification_area/na-grid.c index bd87f139..8465fcab 100644 --- a/applets/notification_area/na-grid.c +++ b/applets/notification_area/na-grid.c @@ -183,9 +183,9 @@ void na_grid_set_min_icon_size (NaGrid *grid, gint min_icon_size) { - grid->min_icon_size = min_icon_size; - g_return_if_fail (NA_IS_GRID (grid)); + + grid->min_icon_size = min_icon_size; refresh_grid (grid); } |