diff options
| author | rbuj <[email protected]> | 2020-11-25 12:22:03 +0100 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2020-12-11 10:40:04 -0500 |
| commit | cb8a660fe089c7f37995f787ee8ac8ac147f50d6 (patch) | |
| tree | 572907267805bdabdcfd87db179ee78849a9b2d2 /libwindow-settings | |
| parent | 3fab839c77d6b7ab5e5dd1cb33997773154dd763 (diff) | |
| download | mate-control-center-cb8a660fe089c7f37995f787ee8ac8ac147f50d6.tar.bz2 mate-control-center-cb8a660fe089c7f37995f787ee8ac8ac147f50d6.tar.xz | |
mate-wm-manager: directory parameter is an immutable string on scan_wm_directory
Diffstat (limited to 'libwindow-settings')
| -rw-r--r-- | libwindow-settings/mate-wm-manager.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/libwindow-settings/mate-wm-manager.c b/libwindow-settings/mate-wm-manager.c index bb31d0ea..a9cf0ea7 100644 --- a/libwindow-settings/mate-wm-manager.c +++ b/libwindow-settings/mate-wm-manager.c @@ -69,15 +69,14 @@ wm_free (AvailableWindowManager *wm) } static GList * -list_desktop_files_in_dir (gchar *directory) +list_desktop_files_in_dir (const gchar *directory) { DIR *dir; struct dirent *child; GList *result = NULL; gchar *suffix; - dir = opendir (directory); - if (dir == NULL) + if ((dir = opendir (directory)) == NULL) return NULL; while ((child = readdir (dir)) != NULL) { @@ -190,7 +189,7 @@ wm_load (const char *desktop_file, } static void -scan_wm_directory (gchar *directory, gboolean is_user) +scan_wm_directory (const gchar *directory, gboolean is_user) { GList *tmp_list; GList *files; @@ -213,27 +212,26 @@ scan_wm_directory (gchar *directory, gboolean is_user) g_list_free (files); } -void mate_wm_manager_init(void) +void +mate_wm_manager_init (void) { - char* tempdir; + gchar *user_config_dir; - if (done_scan) - { - return; - } - - done_scan = TRUE; - - tempdir = g_build_filename(MATE_WM_PROPERTY_PATH, NULL); - scan_wm_directory(tempdir, FALSE); - g_free(tempdir); + if (done_scan) + { + return; + } + done_scan = TRUE; - tempdir = g_build_filename(g_get_user_config_dir(), "mate", "wm-properties", NULL); + /* look up WMs on system config folder */ + scan_wm_directory (MATE_WM_PROPERTY_PATH, FALSE); - scan_wm_directory(tempdir, TRUE); - g_free(tempdir); + /* look up WMs on user config folder */ + user_config_dir = g_build_filename (g_get_user_config_dir (), "mate", "wm-properties", NULL); + scan_wm_directory (user_config_dir, TRUE); + g_free (user_config_dir); - available_wms = g_list_sort(available_wms, wm_compare); + available_wms = g_list_sort (available_wms, wm_compare); } static AvailableWindowManager* |