Revision: 3412
http://geany.svn.sourceforge.net/geany/?rev=3412&view=rev
Author: eht16
Date: 2008-12-21 20:09:08 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
Only stat() files after saving for the timestamp when file_prefs.disk_check_timeout is set (to greater 0).
Call realpath() on files only when opening or changing the filename but not on every save.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-21 19:50:18 UTC (rev 3411)
+++ trunk/ChangeLog 2008-12-21 20:09:08 UTC (rev 3412)
@@ -5,6 +5,11 @@
Command used (on Debian Sid/Experimental):
'CFLAGS=`pkg-config --cflags gtk+-2.0` geany -g gtk-2.14.c.tags
/usr/include/gtk-2.0/gtk/gtk.h'
+ * src/document.c:
+ Only stat() files after saving for the timestamp when
+ file_prefs.disk_check_timeout is set (to greater 0).
+ Call realpath() on files only when opening or changing the filename
+ but not on every save.
2008-12-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2008-12-21 19:50:18 UTC (rev 3411)
+++ trunk/src/document.c 2008-12-21 20:09:08 UTC (rev 3412)
@@ -1342,6 +1342,8 @@
g_free(doc->file_name);
doc->file_name = g_strdup(utf8_fname);
}
+ /* reset real path, it's retrieved again in document_save() */
+ setptr(doc->real_path, NULL);
/* detect filetype */
if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_NONE)
@@ -1547,8 +1549,10 @@
}
/* now the file is on disk, set real_path */
- g_free(doc->real_path);
- doc->real_path = get_real_path_from_utf8(doc->file_name);
+ if (doc->real_path == NULL)
+ {
+ doc->real_path = get_real_path_from_utf8(doc->file_name);
+ }
/* store the opened encoding for undo/redo */
store_saved_encoding(doc);
@@ -1560,7 +1564,8 @@
/* stat the file to get the timestamp, otherwise on Windows the actual
* timestamp can be ahead of time(NULL) */
- document_update_timestamp(doc);
+ if (file_prefs.disk_check_timeout > 0)
+ document_update_timestamp(doc);
/* update filetype-related things */
document_set_filetype(doc, doc->file_type);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3406
http://geany.svn.sourceforge.net/geany/?rev=3406&view=rev
Author: ntrel
Date: 2008-12-19 16:49:37 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
Show Structs separately from Typedefs / Enums for the C symbol list.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/symbols.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-19 16:28:14 UTC (rev 3405)
+++ trunk/ChangeLog 2008-12-19 16:49:37 UTC (rev 3406)
@@ -3,6 +3,8 @@
* src/symbols.c, tagmanager/fortran.c:
Use plurals for HTML symbol list parent items.
Fix Fortran Types showing as Interfaces in the symbol list.
+ * src/symbols.c:
+ Show Structs separately from Typedefs / Enums for the C symbol list.
2008-12-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2008-12-19 16:28:14 UTC (rev 3405)
+++ trunk/src/symbols.c 2008-12-19 16:49:37 UTC (rev 3406)
@@ -572,7 +572,7 @@
case GEANY_FILETYPES_HASKELL:
tag_list_add_groups(tag_store,
&tv_iters.tag_namespace, _("Module"), NULL,
- &tv_iters.tag_struct, _("Types"), NULL,
+ &tv_iters.tag_type, _("Types"), NULL,
&tv_iters.tag_macro, _("Type constructors"), NULL,
&tv_iters.tag_function, _("Functions"), "classviewer-method",
NULL);
@@ -787,7 +787,8 @@
&(tv_iters.tag_class), _("Classes"), "classviewer-class",
&(tv_iters.tag_function), _("Functions"), "classviewer-method",
&(tv_iters.tag_member), _("Members"), "classviewer-member",
- &(tv_iters.tag_struct), _("Structs / Typedefs"), "classviewer-struct",
+ &(tv_iters.tag_struct), _("Structs"), "classviewer-struct",
+ &(tv_iters.tag_type), _("Typedefs / Enums"), "classviewer-struct",
NULL);
if (ft_id != GEANY_FILETYPES_D)
@@ -954,18 +955,8 @@
case tm_tag_typedef_t:
case tm_tag_enum_t:
{
- /* TODO separate C-like types here also */
- switch (ft_id)
- {
- case GEANY_FILETYPES_HAXE:
- case GEANY_FILETYPES_FORTRAN:
- case GEANY_FILETYPES_F77:
- iter = &tv_iters.tag_type;
- goto skip;
- default:
- break;
- }
- /* fall through */
+ iter = &tv_iters.tag_type;
+ break;
}
case tm_tag_union_t:
case tm_tag_struct_t:
@@ -990,7 +981,6 @@
iter = &tv_iters.tag_other;
}
}
-skip:
if (iter->stamp != -1)
return iter;
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3404
http://geany.svn.sourceforge.net/geany/?rev=3404&view=rev
Author: ntrel
Date: 2008-12-19 16:10:54 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
Prevent GLib warning for g_strstrip().
Modified Paths:
--------------
trunk/src/editor.c
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-12-18 22:02:15 UTC (rev 3403)
+++ trunk/src/editor.c 2008-12-19 16:10:54 UTC (rev 3404)
@@ -1971,7 +1971,8 @@
word = editor_read_word_stem(editor, pos, wc);
/* prevent completion of "for " */
- if (! isspace(sci_get_char_at(sci, pos - 1))) /* pos points to the line end char so use pos -1 */
+ if (NZV(word) &&
+ ! isspace(sci_get_char_at(sci, pos - 1))) /* pos points to the line end char so use pos -1 */
{
sci_start_undo_action(sci); /* needed because we insert a space separately from construct */
result = snippets_complete_constructs(editor, pos, word);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.