Commits November 2010

commits@lists.geany.org

4 participants
109 discussions

SF.net SVN: geany:[5454] trunk/src/utils.c
by ntrel＠users.sourceforge.net 30 Nov '10

30 Nov '10

Revision: 5454 http://geany.svn.sourceforge.net/geany/?rev=5454&view=rev Author: ntrel Date: 2010-11-30 18:25:16 +0000 (Tue, 30 Nov 2010) Log Message: ----------- Add warning for utils_write_file() that g_file_set_contents() is a better choice because it handles disk exhaustion safely. Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2010-11-30 18:18:24 UTC (rev 5453) +++ trunk/src/utils.c 2010-11-30 18:25:16 UTC (rev 5454) @@ -217,15 +217,19 @@ /** - * Writes the given @a text into a file with @a filename. - * If the file doesn't exist, it will be created. - * If it already exists, it will be overwritten. + * Writes @a text into a file named @a filename. + * If the file doesn't exist, it will be created. + * If it already exists, it will be overwritten. * - * @param filename The filename of the file to write, in locale encoding. - * @param text The text to write into the file. + * @warning You should use @c g_file_set_contents() instead if you don't need + * file permissions and other metadata to be preserved, as that always handles + * disk exhaustion safely. * - * @return 0 if the file was successfully written, otherwise the @c errno of the - * failed operation is returned. + * @param filename The filename of the file to write, in locale encoding. + * @param text The text to write into the file. + * + * @return 0 if the file was successfully written, otherwise the @c errno of the + * failed operation is returned. **/ gint utils_write_file(const gchar *filename, const gchar *text) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5453] trunk
by ntrel＠users.sourceforge.net 30 Nov '10

30 Nov '10

Revision: 5453 http://geany.svn.sourceforge.net/geany/?rev=5453&view=rev Author: ntrel Date: 2010-11-30 18:18:24 +0000 (Tue, 30 Nov 2010) Log Message: ----------- Check result of fclose() for utils_write_file(). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-30 18:12:15 UTC (rev 5452) +++ trunk/ChangeLog 2010-11-30 18:18:24 UTC (rev 5453) @@ -1,3 +1,9 @@ +2010-11-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c: + Check result of fclose() for utils_write_file(). + + 2010-11-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * win32-config.h: Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2010-11-30 18:12:15 UTC (rev 5452) +++ trunk/src/utils.c 2010-11-30 18:18:24 UTC (rev 5453) @@ -246,30 +246,35 @@ { FILE *fp; gint bytes_written, len; + gboolean fail = FALSE; if (filename == NULL) return ENOENT; len = strlen(text); + errno = 0; fp = g_fopen(filename, "w"); - if (fp != NULL) + if (fp == NULL) + fail = TRUE; + else { - bytes_written = fwrite(text, sizeof (gchar), len, fp); - fclose(fp); + bytes_written = fwrite(text, sizeof(gchar), len, fp); if (len != bytes_written) { + fail = TRUE; geany_debug( "utils_write_file(): written only %d bytes, had to write %d bytes to %s", bytes_written, len, filename); - return EIO; } + if (fclose(fp) != 0) + fail = TRUE; } - else + if (fail) { geany_debug("utils_write_file(): could not write to file %s (%s)", filename, g_strerror(errno)); - return errno; + return NVL(errno, EIO); } } return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5452] trunk/doc/making-a-release
by ntrel＠users.sourceforge.net 30 Nov '10

30 Nov '10

Revision: 5452 http://geany.svn.sourceforge.net/geany/?rev=5452&view=rev Author: ntrel Date: 2010-11-30 18:12:15 +0000 (Tue, 30 Nov 2010) Log Message: ----------- Add notes for making a new release. Added Paths: ----------- trunk/doc/making-a-release Added: trunk/doc/making-a-release =================================================================== --- trunk/doc/making-a-release (rev 0) +++ trunk/doc/making-a-release 2010-11-30 18:12:15 UTC (rev 5452) @@ -0,0 +1,27 @@ +Update NEWS & release date. +Add changelog entry with release date. + +Export branch into a new directory (i.e. not usual working copy). +Run 'make distcheck'. +Delete the created archive and run 'make dist' and 'make dist-bzip2'. + +Put the resulting tarballs on uvena.de - upload to home directory +and after the upload is finished move them into +/home/www/files.uvena.de/geany/. +Rename LATEST-IS-... to the new version number in +/home/www/files.uvena.de/geany/ and /home/www/www.geany.org/files. +Tag release in SVN, remove the branch if used. +Add the GPG signatures (enrico?). +Windows builds (enrico?). + +Website: update Releases, Documentation links and add a News item +Update the manual data and links in the filesystem +(/home/www/www.geany.org/manual/) and the two links on the Manual +Wiki page. + +Announce on geany, devel, i18n mailing lists (check you're subscribed). +Put a news item on Sourceforge (add a new release on Freshmeat.net +and update the information on gnomefiles.org - enrico?). + +For non-trunk releases, merge NEWS into trunk and any branch-only +commits that need to merged. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5451] branches/Geany-0_19_2/NEWS
by ntrel＠users.sourceforge.net 30 Nov '10

30 Nov '10

Revision: 5451 http://geany.svn.sourceforge.net/geany/?rev=5451&view=rev Author: ntrel Date: 2010-11-30 18:00:45 +0000 (Tue, 30 Nov 2010) Log Message: ----------- Update for 0.19.2. Modified Paths: -------------- branches/Geany-0_19_2/NEWS Modified: branches/Geany-0_19_2/NEWS =================================================================== --- branches/Geany-0_19_2/NEWS 2010-11-29 18:01:03 UTC (rev 5450) +++ branches/Geany-0_19_2/NEWS 2010-11-30 18:00:45 UTC (rev 5451) @@ -1,3 +1,10 @@ +Geany 0.19.2 (TBA) + + Fixes: + * Fix not always reporting an error message when saving a document + fails. + + Geany 0.19.1 (August 18, 2010) Fixes: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5450] branches/Geany-0_19_2/ChangeLog
by ntrel＠users.sourceforge.net 29 Nov '10

29 Nov '10

Revision: 5450 http://geany.svn.sourceforge.net/geany/?rev=5450&view=rev Author: ntrel Date: 2010-11-29 18:01:03 +0000 (Mon, 29 Nov 2010) Log Message: ----------- Add missing entry for 0.19.1 release. Modified Paths: -------------- branches/Geany-0_19_2/ChangeLog Modified: branches/Geany-0_19_2/ChangeLog =================================================================== --- branches/Geany-0_19_2/ChangeLog 2010-11-29 17:52:38 UTC (rev 5449) +++ branches/Geany-0_19_2/ChangeLog 2010-11-29 18:01:03 UTC (rev 5450) @@ -7,6 +7,11 @@ Set errno to 0 before doing disk I/O. +2010-08-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * New release: Geany 0.19.1. + + 2010-08-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * scintilla/LexMarkdown.cxx: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5449] branches/Geany-0_19_2
by ntrel＠users.sourceforge.net 29 Nov '10

29 Nov '10

Revision: 5449 http://geany.svn.sourceforge.net/geany/?rev=5449&view=rev Author: ntrel Date: 2010-11-29 17:52:38 +0000 (Mon, 29 Nov 2010) Log Message: ----------- Fix not always reporting an error message when saving a document fails. Check result of fclose(). Set errno to 0 before doing disk I/O. Modified Paths: -------------- branches/Geany-0_19_2/ChangeLog branches/Geany-0_19_2/src/document.c Modified: branches/Geany-0_19_2/ChangeLog =================================================================== --- branches/Geany-0_19_2/ChangeLog 2010-11-29 13:21:35 UTC (rev 5448) +++ branches/Geany-0_19_2/ChangeLog 2010-11-29 17:52:38 UTC (rev 5449) @@ -1,3 +1,12 @@ +2010-11-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Fix not always reporting an error message when saving a document + fails. + Check result of fclose(). + Set errno to 0 before doing disk I/O. + + 2010-08-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * scintilla/LexMarkdown.cxx: Modified: branches/Geany-0_19_2/src/document.c =================================================================== --- branches/Geany-0_19_2/src/document.c 2010-11-29 13:21:35 UTC (rev 5448) +++ branches/Geany-0_19_2/src/document.c 2010-11-29 17:52:38 UTC (rev 5449) @@ -1690,9 +1690,6 @@ static gchar *write_data_to_disk(GeanyDocument *doc, const gchar *locale_filename, const gchar *data, gint len) { - FILE *fp; - gint bytes_written; - gint err = 0; GError *error = NULL; g_return_val_if_fail(doc != NULL, g_strdup(g_strerror(EINVAL))); @@ -1700,19 +1697,30 @@ if (! file_prefs.use_safe_file_saving) { + FILE *fp; + gint bytes_written; + gboolean fail = FALSE; + + /* Use POSIX API to preserve file metadata */ + errno = 0; fp = g_fopen(locale_filename, "wb"); - if (G_UNLIKELY(fp == NULL)) - return g_strdup(g_strerror(errno)); + if (fp == NULL) + fail = TRUE; + else + { + errno = 0; + bytes_written = fwrite(data, sizeof(gchar), len, fp); - bytes_written = fwrite(data, sizeof(gchar), len, fp); + if (len != bytes_written) + fail = TRUE; - if (G_UNLIKELY(len != bytes_written)) - err = errno; - - fclose(fp); - - if (err != 0) - return g_strdup(g_strerror(err)); + if (fclose(fp) != 0) + fail = TRUE; + } + if (fail) + { + return g_strdup(g_strerror(errno)); + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5448] branches/unstable
by ntrel＠users.sourceforge.net 29 Nov '10

29 Nov '10

Revision: 5448 http://geany.svn.sourceforge.net/geany/?rev=5448&view=rev Author: ntrel Date: 2010-11-29 13:21:35 +0000 (Mon, 29 Nov 2010) Log Message: ----------- Add 'Open in New Window' command in the notebook tab menu (based on patch by Matthew Brush, thanks - #3118059). Modified Paths: -------------- branches/unstable/ChangeLog branches/unstable/src/notebook.c Modified: branches/unstable/ChangeLog =================================================================== --- branches/unstable/ChangeLog 2010-11-29 12:48:33 UTC (rev 5447) +++ branches/unstable/ChangeLog 2010-11-29 13:21:35 UTC (rev 5448) @@ -1,3 +1,10 @@ +2010-11-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/notebook.c: + Add 'Open in New Window' command in the notebook tab menu (based on + patch by Matthew Brush, thanks - #3118059). + + 2010-11-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * data/filetypes.cpp, data/filetypes.vala, data/filetypes.glsl, Modified: branches/unstable/src/notebook.c =================================================================== --- branches/unstable/src/notebook.c 2010-11-29 12:48:33 UTC (rev 5447) +++ branches/unstable/src/notebook.c 2010-11-29 13:21:35 UTC (rev 5448) @@ -193,10 +193,39 @@ } +static void on_open_in_new_window_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + gchar *geany_path; + GeanyDocument *doc = user_data; + + g_return_if_fail(doc->is_valid); + + geany_path = g_find_program_in_path("geany"); + + if (geany_path) + { + gchar *doc_path = utils_get_locale_from_utf8(doc->file_name); + gchar *argv[] = {geany_path, "-i", doc_path, NULL}; + GError *err = NULL; + + if (!utils_spawn_async(NULL, argv, NULL, 0, NULL, NULL, NULL, &err)) + { + g_printerr("Unable to open new window: %s", err->message); + g_error_free(err); + } + g_free(doc_path); + g_free(geany_path); + } + else + g_printerr("Unable to find 'geany'"); +} + + static void show_tab_bar_popup_menu(GdkEventButton *event) { GtkWidget *menu_item; static GtkWidget *menu = NULL; + GeanyDocument *doc = NULL; if (menu == NULL) menu = gtk_menu_new(); @@ -211,6 +240,20 @@ gtk_widget_show(menu_item); gtk_container_add(GTK_CONTAINER(menu), menu_item); + doc = document_get_current(); + menu_item = ui_image_menu_item_new(GTK_STOCK_OPEN, "Open in New _Window"); + gtk_widget_show(menu_item); + gtk_container_add(GTK_CONTAINER(menu), menu_item); + g_signal_connect(menu_item, "activate", + G_CALLBACK(on_open_in_new_window_activate), doc); + /* disable if not on disk */ + if (!doc->real_path) + gtk_widget_set_sensitive(menu_item, FALSE); + + menu_item = gtk_separator_menu_item_new(); + gtk_widget_show(menu_item); + gtk_container_add(GTK_CONTAINER(menu), menu_item); + menu_item = ui_image_menu_item_new(GTK_STOCK_CLOSE, _("Close Ot_her Documents")); gtk_widget_show(menu_item); gtk_container_add(GTK_CONTAINER(menu), menu_item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5447] branches/Geany-0_19_2/
by ntrel＠users.sourceforge.net 29 Nov '10

29 Nov '10

Revision: 5447 http://geany.svn.sourceforge.net/geany/?rev=5447&view=rev Author: ntrel Date: 2010-11-29 12:48:33 +0000 (Mon, 29 Nov 2010) Log Message: ----------- Create branch for 0.19.2 release from 0.19.1 tag. Added Paths: ----------- branches/Geany-0_19_2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5446] trunk
by eht16＠users.sourceforge.net 28 Nov '10

28 Nov '10

Revision: 5446 http://geany.svn.sourceforge.net/geany/?rev=5446&view=rev Author: eht16 Date: 2010-11-28 17:41:37 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Enable GIO and built-in regex support on Windows when compiling without Waf. Modified Paths: -------------- trunk/ChangeLog trunk/win32-config.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-11-28 15:37:13 UTC (rev 5445) +++ trunk/ChangeLog 2010-11-28 17:41:37 UTC (rev 5446) @@ -1,3 +1,10 @@ +2010-11-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * win32-config.h: + Enable GIO and built-in regex support on Windows + when compiling without Waf. + + 2010-11-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * geany_private.rc: Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2010-11-28 15:37:13 UTC (rev 5445) +++ trunk/win32-config.h 2010-11-28 17:41:37 UTC (rev 5446) @@ -321,6 +321,9 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1 -/* Define if GIO should be used, we don't use GIO on Windows */ -/* #define HAVE_GIO 1 */ +/* Define if GIO should be used */ +#define HAVE_GIO 1 +/* Define if include regex library should be used */ +#define USE_INCLUDED_REGEX 1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5445] branches/unstable
by eht16＠users.sourceforge.net 28 Nov '10

28 Nov '10

Revision: 5445 http://geany.svn.sourceforge.net/geany/?rev=5445&view=rev Author: eht16 Date: 2010-11-28 15:37:13 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Update for Scintilla 2.22. Modified Paths: -------------- branches/unstable/ChangeLog branches/unstable/scintilla/scintilla_changes.patch Modified: branches/unstable/ChangeLog =================================================================== --- branches/unstable/ChangeLog 2010-11-28 15:27:43 UTC (rev 5444) +++ branches/unstable/ChangeLog 2010-11-28 15:37:13 UTC (rev 5445) @@ -4,6 +4,8 @@ data/filetypes.cs, data/filetypes.c: Disable preprocessor #define tracking for the CPP lexer (enabled by default in Scintilla). + * scintilla/scintilla_changes.patch: + Update for Scintilla 2.22. 2010-11-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: branches/unstable/scintilla/scintilla_changes.patch =================================================================== --- branches/unstable/scintilla/scintilla_changes.patch 2010-11-28 15:27:43 UTC (rev 5444) +++ branches/unstable/scintilla/scintilla_changes.patch 2010-11-28 15:37:13 UTC (rev 5445) @@ -1,8 +1,8 @@ -A patch to Scintilla 2.03 containing our changes to Scintilla +A patch to Scintilla 2.22 containing our changes to Scintilla (removing unused lexers and an updated marshallers file). -diff -Naur scintilla_orig//gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c ---- scintilla_orig//gtk/scintilla-marshal.c 2004-04-04 11:59:37.000000000 +0200 -+++ scintilla/gtk/scintilla-marshal.c 2010-03-07 10:39:08.000000000 +0100 +diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c +--- scintilla_orig/gtk/scintilla-marshal.c 2010-09-04 12:03:35.000000000 +0200 ++++ scintilla/gtk/scintilla-marshal.c 2008-12-06 12:11:33.000000000 +0100 @@ -35,8 +35,8 @@ #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 @@ -27,15 +27,15 @@ gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, -diff -Naur scintilla_orig//src/KeyWords.cxx scintilla/src/KeyWords.cxx ---- scintilla_orig//src/KeyWords.cxx 2009-08-27 03:20:38.000000000 +0200 -+++ scintilla/src/KeyWords.cxx 2010-03-07 10:38:53.000000000 +0100 -@@ -327,99 +327,37 @@ +diff -Naur scintilla_orig/src/Catalogue.cxx scintilla/src/Catalogue.cxx +--- scintilla_orig/src/Catalogue.cxx 2010-09-04 12:03:35.000000000 +0200 ++++ scintilla/src/Catalogue.cxx 2010-11-21 18:00:07.000000000 +0100 +@@ -81,98 +81,41 @@ //++Autogenerated -- run src/LexGen.py to regenerate //**\(\tLINK_LEXER(\*);\n\) - LINK_LEXER(lmAbaqus); -- LINK_LEXER(lmAda); + LINK_LEXER(lmAda); - LINK_LEXER(lmAns1); - LINK_LEXER(lmAPDL); LINK_LEXER(lmAsm); @@ -61,12 +61,12 @@ LINK_LEXER(lmDiff); - LINK_LEXER(lmEiffel); - LINK_LEXER(lmEiffelkw); -- LINK_LEXER(lmErlang); + LINK_LEXER(lmErlang); - LINK_LEXER(lmErrorList); - LINK_LEXER(lmESCRIPT); LINK_LEXER(lmF77); - LINK_LEXER(lmFlagShip); -- LINK_LEXER(lmForth); + LINK_LEXER(lmForth); LINK_LEXER(lmFortran); LINK_LEXER(lmFreeBasic); - LINK_LEXER(lmGAP); @@ -76,23 +76,24 @@ - LINK_LEXER(lmInno); - LINK_LEXER(lmKix); LINK_LEXER(lmLatex); -- LINK_LEXER(lmLISP); + LINK_LEXER(lmLISP); - LINK_LEXER(lmLot); - LINK_LEXER(lmLout); LINK_LEXER(lmLua); - LINK_LEXER(lmMagikSF); LINK_LEXER(lmMake); LINK_LEXER(lmMarkdown); - LINK_LEXER(lmMatlab); +- LINK_LEXER(lmMatlab); - LINK_LEXER(lmMETAPOST); - LINK_LEXER(lmMMIXAL); - LINK_LEXER(lmMSSQL); - LINK_LEXER(lmMySQL); - LINK_LEXER(lmNimrod); - LINK_LEXER(lmNncrontab); ++ // We use Octave instead of Matlab LINK_LEXER(lmNsis); LINK_LEXER(lmNull); -- LINK_LEXER(lmOctave); + LINK_LEXER(lmOctave); - LINK_LEXER(lmOpal); LINK_LEXER(lmPascal); - LINK_LEXER(lmPB); @@ -123,11 +124,9 @@ - LINK_LEXER(lmTAL); LINK_LEXER(lmTCL); - LINK_LEXER(lmTeX); + LINK_LEXER(lmTxt2tags); - LINK_LEXER(lmVB); - LINK_LEXER(lmVBScript); -- LINK_LEXER(lmVerilog); + LINK_LEXER(lmVerilog); LINK_LEXER(lmVHDL); -+ LINK_LEXER(lmVerilog); LINK_LEXER(lmXML); - LINK_LEXER(lmYAML); - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2010