Commit 17ede103 authored by Stéphane Démurget's avatar Stéphane Démurget

Fixed the closed bug id typo.

parent 4f456929
......@@ -35,7 +35,7 @@
2002-01-09 Andy Piper <andy.piper@freeuk.com>
* src/project_dbase.c: fix bug #492923 (thanks to Johannes Schmid)
* src/project_dbase.c: fix bug #497923 (thanks to Johannes Schmid)
2002-01-09 Stephane Demurget <demurgets@free.fr>
......
......@@ -310,11 +310,15 @@ AnSymbolView *sv_populate(TMProject *tm_proj)
SVRootType i;
g_message("Populating symbol view..");
g_print ("> sv_populate (): a\n"); fflush (stdout);
if (!sv)
sv_create();
g_print ("> sv_populate (): b\n"); fflush (stdout);
sv_disconnect();
sv_freeze();
sv_clear();
g_print ("> sv_populate (): c\n"); fflush (stdout);
if (!tm_proj || !IS_TM_PROJECT((TMWorkObject *) tm_proj))
{
sv_connect();
......@@ -323,6 +327,7 @@ AnSymbolView *sv_populate(TMProject *tm_proj)
return sv;
}
g_print ("> sv_populate (): d\n"); fflush (stdout);
if (!tm_proj->symbol_tree)
{
g_message("Updating project..");
......@@ -336,17 +341,21 @@ AnSymbolView *sv_populate(TMProject *tm_proj)
}
}
g_print ("> sv_populate (): e\n"); fflush (stdout);
sv->project = tm_proj;
root[sv_root_none_t] = NULL;
for (i = sv_root_class_t; i < sv_root_max_t; ++i)
CREATE_SV_NODE(i)
root[sv_root_max_t] = NULL;
g_print ("> sv_populate (): f\n"); fflush (stdout);
s = g_string_sized_new(255);
if (!tm_proj->symbol_tree->children)
{
g_message("No symbols found!");
}
g_print ("> sv_populate (): g\n"); fflush (stdout);
for (parent = tm_proj->symbol_tree->children; parent
; parent = g_slist_next(parent))
{
......@@ -394,8 +403,10 @@ AnSymbolView *sv_populate(TMProject *tm_proj)
, subitem, h_file, (GtkDestroyNotify) an_hist_file_free);
}
}
g_print ("> sv_populate (): h\n"); fflush (stdout);
g_string_free(s, TRUE);
sv_connect();
sv_thaw();
g_print ("> sv_populate (): i\n"); fflush (stdout);
return sv;
}
......@@ -246,8 +246,12 @@ new_prj_terminated (int status, time_t t)
MESSAGE_BUILD);
anjuta_status (_("Project was successfully autogenerated."));
}
g_print ("> new_prj_terminated (): a\n"); fflush (stdout);
project_dbase_update_tags_image(app->project_dbase);
g_print ("> new_prj_terminated (): b\n"); fflush (stdout);
project_dbase_show (app->project_dbase);
if (preferences_get_int (app->preferences, BEEP_ON_BUILD_COMPLETE))
gdk_beep ();
anjuta_update_app_status (TRUE, NULL);
......
......@@ -835,7 +835,11 @@ done:
project_dbase_update_tree (p);
extended_toolbar_update ();
tags_manager_load (app->tags_manager);
g_print ("> project_dbase_load_project (): a\n");
project_dbase_update_tags_image(p);
g_print ("> project_dbase_load_project (): b\n");
anjuta_status (_("Project loaded successfully."));
anjuta_set_active ();
if (show_project)
......@@ -1149,10 +1153,14 @@ project_dbase_load_yourself (ProjectDBase * p, PropsID props)
void
project_dbase_update_tags_image(ProjectDBase* p)
{
GList *src_files;
gchar* src_dir;
g_return_if_fail (p != NULL);
if (p->project_is_open == FALSE)
return;
g_print ("> project_dbase_update_tags_image (): a\n"); fflush (stdout);
if (p->tm_project)
{
if (((NULL == TM_PROJECT(p->tm_project)->file_list) ||
......@@ -1164,13 +1172,20 @@ project_dbase_update_tags_image(ProjectDBase* p)
}
else if (p->top_proj_dir)
p->tm_project = tm_project_new(p->top_proj_dir, NULL, NULL, TRUE, TRUE);
g_print ("> project_dbase_update_tags_image (): b\n"); fflush (stdout);
sv_populate(TM_PROJECT(p->tm_project));
g_print ("> project_dbase_update_tags_image (): c\n"); fflush (stdout);
fv_populate(TM_PROJECT(p->tm_project));
g_print ("> project_dbase_update_tags_image (): d\n"); fflush (stdout);
src_dir = project_dbase_get_module_dir (p, MODULE_SOURCE);
if (src_dir)
{
gchar* src_path;
GList *src_files;
src_path = g_strconcat (src_dir, "/", NULL);
src_files = glist_from_data (p->props, "module.source.files");
glist_strings_prefix (src_files, src_path);
......@@ -1178,7 +1193,11 @@ project_dbase_update_tags_image(ProjectDBase* p)
glist_strings_free (src_files);
g_free (src_path);
g_free (src_dir);
}
g_print ("> project_dbase_update_tags_image (): e\n"); fflush (stdout);
return;
}
static void
......
......@@ -485,6 +485,7 @@ create_project_dbase_gui (ProjectDBase * p)
fv = fv_populate(TM_PROJECT(p->tm_project));
gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook1), fv->win
, gtk_label_new(_("Files")));
sv = sv_populate(TM_PROJECT(p->tm_project));
gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook1), sv->win
, gtk_label_new(_("Symbols")));
......
......@@ -734,6 +734,8 @@ tags_manager_update_image (TagsManager * tm, GList * files)
return TRUE;
if (tm->update_in_progress)
return FALSE;
g_print ("> ENTERING in tags_manager_update_image ()\n"); fflush (stdout);
/*
if (g_list_length (files) == g_list_length (tm->file_list))
return TRUE;
......@@ -742,18 +744,25 @@ tags_manager_update_image (TagsManager * tm, GList * files)
tags_manager_freeze (tm);
tm->update_file_list = NULL;
node = files;
while (node)
{
gchar* fn = anjuta_get_full_filename (node->data);
if(!fn) {node = g_list_next(node); continue;}
for (node = files; node; node = g_list_next (node)) {
gchar *fn = anjuta_get_full_filename (node->data);
if (!fn)
continue;
if (tags_manager_check_update (tm, fn) == FALSE)
{
tm->update_file_list =
g_list_append(tm->update_file_list, g_strdup(node->data));
}
g_free (fn);
node = g_list_next(node);
}
for (node = tm->update_file_list; node; node = g_list_next (node))
g_print ("> NEED TO UPDATE (%s)\n", (gchar *) node->data);
fflush (stdout);
if (tm->update_file_list)
{
tm->update_counter = 0;
......@@ -769,9 +778,13 @@ tags_manager_update_image (TagsManager * tm, GList * files)
tags_manager_thaw(tm);
tm_project_update(app->project_dbase->tm_project, FALSE
, TRUE, TRUE);
g_print ("> tags_manager_update_image (): a\n"); fflush (stdout);
sv_populate(TM_PROJECT(app->project_dbase->tm_project));
g_print ("> tags_manager_update_image (): b\n"); fflush (stdout);
fv_populate(TM_PROJECT(app->project_dbase->tm_project));
}
g_print ("> EXITING from tags_manager_update_image ()\n"); fflush (stdout);
return TRUE;
}
......@@ -785,6 +798,7 @@ on_tags_manager_on_idle (gpointer data)
goto error;
if (tm->update_in_progress == FALSE)
goto error;
g_print ("> ENTERING IN tags_manager_on_idle ()\n"); fflush (stdout);
if (tm->update_counter >= g_list_length (tm->update_file_list))
{
tags_manager_thaw (tm);
......@@ -795,8 +809,12 @@ on_tags_manager_on_idle (gpointer data)
tags_manager_save(tm);
tm_project_update(app->project_dbase->tm_project, FALSE
, TRUE, TRUE);
g_print ("> tags_manager_on_idle (): a\n"); fflush (stdout);
sv_populate(TM_PROJECT(app->project_dbase->tm_project));
g_print ("> tags_manager_on_idle (): b\n"); fflush (stdout);
fv_populate(TM_PROJECT(app->project_dbase->tm_project));
g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
return FALSE;
}
if (app->project_dbase->project_is_open == FALSE)
......@@ -808,21 +826,25 @@ on_tags_manager_on_idle (gpointer data)
tm->update_counter));
if (!fn)
goto error;
g_print ("> tags_manager_on_idle (): going to update (%s)\n", fn);
if (tags_manager_update (tm, fn) == FALSE)
goto error;
g_free (fn);
tm->update_counter++;
anjuta_set_progress (tm->update_counter);
g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
return TRUE;
error:
if (fn)
g_free (fn);
tags_manager_thaw (tm);
anjuta_done_progress (_("Syncdronization of Tags image failed"));
anjuta_done_progress (_("Synchronization of Tags image failed"));
glist_strings_free (tm->update_file_list);
tm->update_file_list = NULL;
tm->update_in_progress = FALSE;
g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
return FALSE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment