OLD | NEW |
(Empty) | |
| 1 diff --git a/base/third_party/xdg_mime/xdgmime.c b/base/third_party/xdg_mime/xdg
mime.c |
| 2 index 6dc58c253fa2..f340fcefabb4 100644 |
| 3 --- a/base/third_party/xdg_mime/xdgmime.c |
| 4 +++ b/base/third_party/xdg_mime/xdgmime.c |
| 5 @@ -136,7 +136,7 @@ xdg_dir_time_list_free (XdgDirTimeList *list) |
| 6 } |
| 7 |
| 8 static int |
| 9 -xdg_mime_init_from_directory (const char *directory) |
| 10 +xdg_mime_init_from_directory (const char *directory, void *user_data) |
| 11 { |
| 12 char *file_name; |
| 13 struct stat st; |
| 14 @@ -340,8 +340,9 @@ xdg_check_file (const char *file_path, |
| 15 |
| 16 static int |
| 17 xdg_check_dir (const char *directory, |
| 18 - int *invalid_dir_list) |
| 19 + void *user_data) |
| 20 { |
| 21 + int *invalid_dir_list = user_data; |
| 22 int invalid, exists; |
| 23 char *file_name; |
| 24 |
| 25 @@ -398,8 +399,7 @@ xdg_check_dirs (void) |
| 26 for (list = dir_time_list; list; list = list->next) |
| 27 list->checked = XDG_CHECKED_UNCHECKED; |
| 28 |
| 29 - xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_check_dir, |
| 30 - &invalid_dir_list); |
| 31 + xdg_run_command_on_dirs (xdg_check_dir, &invalid_dir_list); |
| 32 |
| 33 if (invalid_dir_list) |
| 34 return TRUE; |
| 35 @@ -455,8 +455,7 @@ xdg_mime_init (void) |
| 36 icon_list = _xdg_mime_icon_list_new (); |
| 37 generic_icon_list = _xdg_mime_icon_list_new (); |
| 38 |
| 39 - xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_mime_init_from_directory, |
| 40 - NULL); |
| 41 + xdg_run_command_on_dirs (xdg_mime_init_from_directory, NULL); |
| 42 |
| 43 need_reread = FALSE; |
| 44 } |
OLD | NEW |