comparison: pidgin/pidginstock.c
pidgin/pidginstock.c
- branch
- next.minor
- changeset 29492
- 25c9a945380f
- parent 27910
- f72e8440bd9b
- child 29499
- 08832cbd946b
equal
deleted
inserted
replaced
| 29491:31c1d615772e | 29492:25c9a945380f |
|---|---|
| 237 | 237 |
| 238 static gchar * | 238 static gchar * |
| 239 find_file_common(const char *name) | 239 find_file_common(const char *name) |
| 240 { | 240 { |
| 241 gchar *filename; | 241 gchar *filename; |
| 242 #if GLIB_CHECK_VERSION(2,6,0) | |
| 243 const gchar *userdir; | 242 const gchar *userdir; |
| 244 const gchar * const *sysdirs; | 243 const gchar * const *sysdirs; |
| 245 | 244 |
| 246 userdir = g_get_user_data_dir(); | 245 userdir = g_get_user_data_dir(); |
| 247 filename = g_build_filename(userdir, name, NULL); | 246 filename = g_build_filename(userdir, name, NULL); |
| 254 filename = g_build_filename(*sysdirs, name, NULL); | 253 filename = g_build_filename(*sysdirs, name, NULL); |
| 255 if (g_file_test(filename, G_FILE_TEST_EXISTS)) | 254 if (g_file_test(filename, G_FILE_TEST_EXISTS)) |
| 256 return filename; | 255 return filename; |
| 257 g_free(filename); | 256 g_free(filename); |
| 258 } | 257 } |
| 259 #endif | |
| 260 filename = g_build_filename(DATADIR, name, NULL); | 258 filename = g_build_filename(DATADIR, name, NULL); |
| 261 if (g_file_test(filename, G_FILE_TEST_EXISTS)) | 259 if (g_file_test(filename, G_FILE_TEST_EXISTS)) |
| 262 return filename; | 260 return filename; |
| 263 g_free(filename); | 261 g_free(filename); |
| 264 return NULL; | 262 return NULL; |
