Revision: 3709
http://geany.svn.sourceforge.net/geany/?rev=3709&view=rev
Author: eht16
Date: 2009-04-16 17:55:26 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
Add some missing 'void's in function definitions.
If the project base path is './', just use the path of the project config file instead of appending './'.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/project.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-15 22:47:33 UTC (rev 3708)
+++ trunk/ChangeLog 2009-04-16 17:55:26 UTC (rev 3709)
@@ -1,3 +1,11 @@
+2009-04-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/project.c:
+ Add some missing 'void's in function definitions.
+ If the project base path is './', just use the path of the project
+ config file instead of appending './'.
+
+
2009-04-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/keyfile.c, src/keyfile.h, src/project.c:
Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c 2009-04-15 22:47:33 UTC (rev 3708)
+++ trunk/src/project.c 2009-04-16 17:55:26 UTC (rev 3709)
@@ -98,7 +98,7 @@
#define PROJECT_DIR _("projects")
-void project_new()
+void project_new(void)
{
GtkWidget *vbox;
GtkWidget *table;
@@ -243,7 +243,7 @@
#endif
-void project_open()
+void project_open(void)
{
const gchar *dir = local_prefs.project_file_path;
#ifdef G_OS_WIN32
@@ -493,7 +493,7 @@
}
-void project_properties()
+void project_properties(void)
{
PropertyDialogElements *e = g_new(PropertyDialogElements, 1);
GeanyProject *p = app->project;
@@ -1024,7 +1024,7 @@
* base path if it is absolute or it is built out of project file name's dir and base_path.
* If there is no project or project's base_path is invalid, NULL will be returned.
* The returned string should be freed when no longer needed. */
-gchar *project_get_base_path()
+gchar *project_get_base_path(void)
{
GeanyProject *project = app->project;
@@ -1037,7 +1037,10 @@
gchar *path;
gchar *dir = g_path_get_dirname(project->file_name);
- path = g_strconcat(dir, G_DIR_SEPARATOR_S, project->base_path, NULL);
+ if (utils_str_equal(project->base_path, "./"))
+ return dir;
+ else
+ path = g_strconcat(dir, G_DIR_SEPARATOR_S, project->base_path, NULL);
g_free(dir);
return path;
}
@@ -1048,7 +1051,7 @@
/* Returns: NULL if the default path should be used, or a UTF-8 path.
* Maybe in future this will support a separate project make path from base path. */
-gchar *project_get_make_dir()
+gchar *project_get_make_dir(void)
{
GeanyProject *project = app->project;
@@ -1094,7 +1097,7 @@
/* Initialize project-related preferences in the Preferences dialog. */
-void project_setup_prefs()
+void project_setup_prefs(void)
{
GtkWidget *path_entry = ui_lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry");
GtkWidget *path_btn = ui_lookup_widget(ui_widgets.prefs_dialog, "project_file_path_button");
@@ -1107,7 +1110,7 @@
/* Update project-related preferences after using the Preferences dialog. */
-void project_apply_prefs()
+void project_apply_prefs(void)
{
GtkWidget *path_entry = ui_lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry");
const gchar *str;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3706
http://geany.svn.sourceforge.net/geany/?rev=3706&view=rev
Author: eht16
Date: 2009-04-09 12:41:29 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
When updating global type definitions for opened documents, take also C++ namespace symbols into account and don't ignore symbols which are defined inside a scope.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/symbols.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-09 12:12:58 UTC (rev 3705)
+++ trunk/ChangeLog 2009-04-09 12:41:29 UTC (rev 3706)
@@ -1,3 +1,11 @@
+2009-04-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/symbols.c:
+ When updating global type definitions for opened documents, take
+ also C++ namespace symbols into account and don't ignore symbols
+ which are defined inside a scope.
+
+
2009-04-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/plugins.c:
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2009-04-09 12:12:58 UTC (rev 3705)
+++ trunk/src/symbols.c 2009-04-09 12:41:29 UTC (rev 3706)
@@ -54,7 +54,7 @@
const guint TM_GLOBAL_TYPE_MASK =
tm_tag_class_t | tm_tag_enum_t | tm_tag_interface_t |
- tm_tag_struct_t | tm_tag_typedef_t | tm_tag_union_t;
+ tm_tag_struct_t | tm_tag_typedef_t | tm_tag_union_t | tm_tag_namespace_t;
static gchar **html_entities = NULL;
@@ -210,6 +210,7 @@
TMTag *tag;
GString *s = NULL;
GPtrArray *typedefs;
+ gint tag_lang;
g_return_val_if_fail(G_LIKELY(tags_array != NULL), NULL);
@@ -221,22 +222,18 @@
for (j = 0; j < typedefs->len; ++j)
{
tag = TM_TAG(typedefs->pdata[j]);
- if (!(tag->atts.entry.scope))
- {
- /* tag->atts.file.lang contains (for some reason) the line of the tag if
- * tag->atts.entry.file is not NULL */
- gint tag_lang =
- (tag->atts.entry.file) ? tag->atts.entry.file->lang : tag->atts.file.lang;
+ /* tag->atts.file.lang contains (for some reason) the line of the tag if
+ * tag->atts.entry.file is not NULL */
+ tag_lang = (tag->atts.entry.file) ? tag->atts.entry.file->lang : tag->atts.file.lang;
- /* the check for tag_lang == lang is necessary to avoid wrong type colouring of
- * e.g. PHP classes in C++ files
- * lang = -2 disables the check */
- if (tag->name && (tag_lang == lang || lang == -2))
- {
- if (j != 0)
- g_string_append_c(s, ' ');
- g_string_append(s, tag->name);
- }
+ /* the check for tag_lang == lang is necessary to avoid wrong type colouring of
+ * e.g. PHP classes in C++ files
+ * lang = -2 disables the check */
+ if (tag->name && (tag_lang == lang || lang == -2))
+ {
+ if (j != 0)
+ g_string_append_c(s, ' ');
+ g_string_append(s, tag->name);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.