debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove special case from search_engines_new_from_file

Browse source
This commit is contained in:
Christian Dywan 2012-09-01 17:57:31 +02:00
parent 253a11d7ef
commit 373ddd5d0b
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
midori/main.c
View file

@ -311,8 +311,6 @@ search_engines_new_from_file (const gchar* filename,
key_file = g_key_file_new (); key_file = g_key_file_new ();
g_key_file_load_from_file (key_file, filename, g_key_file_load_from_file (key_file, filename,
G_KEY_FILE_KEEP_COMMENTS, error); G_KEY_FILE_KEEP_COMMENTS, error);
/*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL
, G_KEY_FILE_KEEP_COMMENTS, error);*/
engines = g_key_file_get_groups (key_file, NULL); engines = g_key_file_get_groups (key_file, NULL);
pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines),
&n_properties); &n_properties);
@ -355,18 +353,10 @@ search_engines_new_from_folder (const gchar* config,
} }
if (!error && katze_array_is_empty (search_engines)) if (!error && katze_array_is_empty (search_engines))
{ {
g_object_unref (search_engines);
#ifdef G_OS_WIN32
gchar* dir = g_win32_get_package_installation_directory_of_module (NULL);
katze_assign (config_file,
g_build_filename (dir, "etc", "xdg", PACKAGE_NAME, "search", NULL));
g_free (dir);
search_engines = search_engines_new_from_file (config_file, NULL);
#else
katze_assign (config_file, katze_assign (config_file,
midori_paths_get_config_filename (NULL, "search")); midori_paths_get_config_filename (NULL, "search"));
search_engines = search_engines_new_from_file (config_file, NULL); katze_object_assign (search_engines,
#endif search_engines_new_from_file (config_file, NULL));
} }
else if (error) else if (error)
{ {