From 3fdad75a7eed4b42419208e6793ba0571b975f56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Granjoux?= Date: Tue, 23 Nov 2010 21:19:45 +0100 Subject: [PATCH] symbol-db: removed duplicate code on_project_root_added() and on_project_load(). --- plugins/symbol-db/plugin.c | 51 ++-------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/plugins/symbol-db/plugin.c b/plugins/symbol-db/plugin.c index 1421722ec..451235c5d 100644 --- a/plugins/symbol-db/plugin.c +++ b/plugins/symbol-db/plugin.c @@ -1652,7 +1652,6 @@ on_project_loaded (IAnjutaProjectManager *pm, GError *error, gboolean flag_offline; gboolean flag_update; - sources_array = symbol_db_util_get_files_with_zero_symbols (sdb_plugin->sdbe_project); @@ -1660,25 +1659,14 @@ on_project_loaded (IAnjutaProjectManager *pm, GError *error, { do_import_project_sources_after_abort (sdb_plugin, sources_array); - g_ptr_array_foreach (sources_array, (GFunc)g_free, NULL); - g_ptr_array_free (sources_array, TRUE); + g_ptr_array_unref (sources_array); } /* check for offline changes */ flag_offline = do_check_offline_files_changed (sdb_plugin); /* update any files of the project which isn't up-to-date */ - flag_update = do_update_project_symbols (sdb_plugin, sdb_plugin->project_root_dir); - - /* if they're both false then there won't be a place where - * the do_check_languages_count () is called. Check the returns - * and to it here - */ - if (flag_offline == FALSE && flag_update == FALSE) - { - /* check for the number of languages used in the opened project. */ - //do_check_languages_count (sdb_plugin); - } + flag_update = do_update_project_symbols (sdb_plugin, sdb_plugin->project_root_dir); } } @@ -1799,41 +1787,6 @@ on_project_root_added (AnjutaPlugin *plugin, const gchar *name, "1.0"); } - /* - * we need an initial import - */ - if (needs_sources_scan == TRUE) - { - DEBUG_PRINT ("Importing sources."); - do_import_project_sources (ANJUTA_PLUGIN_SYMBOL_DB(plugin), pm, root_dir); - } - else - { - /* - * no import needed. But we may have aborted the scan of sources in - * a previous session.. - */ - GPtrArray *sources_array = NULL; - gboolean flag_offline; - gboolean flag_update; - - - sources_array = - symbol_db_util_get_files_with_zero_symbols (sdb_plugin->sdbe_project); - - if (sources_array != NULL && sources_array->len > 0) - { - do_import_project_sources_after_abort (ANJUTA_PLUGIN_SYMBOL_DB (plugin), - sources_array); - g_ptr_array_unref (sources_array); - } - - /* check for offline changes */ - flag_offline = do_check_offline_files_changed (sdb_plugin); - - /* update any files of the project which isn't up-to-date */ - flag_update = do_update_project_symbols (sdb_plugin, root_dir); - } gtk_progress_bar_set_text (GTK_PROGRESS_BAR (sdb_plugin->progress_bar_project), _("Populating symbol database…")); id = g_idle_add ((GSourceFunc) gtk_progress_bar_pulse, -- 2.11.4.GIT