Commits July 2012

commits@lists.geany.org

1 participants
381 discussions

[geany/geany] 01fea3: Remove possible '/' from display name when building socket filename
by Colomban Wendling 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Feb 2012 00:18:30 Commit: 01fea3e7470756b51d1616e9b732a641f500de1b https://github.com/geany/geany/commit/01fea3e7470756b51d1616e9b732a641f500d… Log Message: ----------- Remove possible '/' from display name when building socket filename MacOS X seems to have slashes in the display name, which prevent the socket file from being created. So, replace such characters that may not appear in a filename with an underscore. Modified Paths: -------------- src/socket.c Modified: src/socket.c 8 files changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -281,8 +281,12 @@ gint socket_init(gint argc, gchar **argv) /* these lines are taken from dcopc.c in kdelibs */ if ((p = strrchr(display_name, '.')) > strrchr(display_name, ':') && p != NULL) *p = '\0'; - while ((p = strchr(display_name, ':')) != NULL) - *p = '_'; + /* remove characters that may not be acceptable in a filename */ + for (p = display_name; *p; p++) + { + if (*p == ':' || *p == '/') + *p = '_'; + } if (socket_info.file_name == NULL) socket_info.file_name = g_strdup_printf("%s%cgeany_socket_%s_%s", @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] e7befb: Remove utils_make_filename() - use g_strconcat instead
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 06 Feb 2012 16:36:51 Commit: e7befb410c895b0136a6c38a3b3d534395592729 https://github.com/geany/geany/commit/e7befb410c895b0136a6c38a3b3d534395592… Log Message: ----------- Remove utils_make_filename() - use g_strconcat instead Modified Paths: -------------- src/filetypes.c src/utils.c src/utils.h Modified: src/filetypes.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1276,10 +1276,10 @@ static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user) gchar *f; if (user) - f = utils_make_filename(app->configdir, + f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S, "filetypes.", ext, NULL); else - f = utils_make_filename(app->datadir, "filetypes.", ext, NULL); + f = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.", ext, NULL); g_free(ext); return f; Modified: src/utils.c 24 files changed, 0 insertions(+), 24 deletions(-) =================================================================== @@ -1793,30 +1793,6 @@ gchar *utils_build_path(const gchar *first, ...) } -/* Concatenates a path with other strings. - * @param path A path, which will have a separator added before the other strings. - * @param ... Strings to concatenate (no directory separators will be - * inserted between them). - * E.g. filename = utils_make_filename(app->datadir, "filetypes.", ext, NULL); */ -gchar *utils_make_filename(const gchar *path, ...) -{ - static GString *buffer = NULL; - va_list args; - - if (! buffer) - buffer = g_string_new(path); - else - g_string_assign(buffer, path); - - g_string_append_c(buffer, G_DIR_SEPARATOR); - - va_start(args, path); - utils_string_vappend(buffer, NULL, args); - va_end(args); - return g_strdup(buffer->str); -} - - /* Retrieves the path for the given URI. * It returns: * - the path which was determined by g_filename_from_uri() or GIO Modified: src/utils.h 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -266,8 +266,6 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl gchar *utils_build_path(const gchar *first, ...) G_GNUC_NULL_TERMINATED; -gchar *utils_make_filename(const gchar *path, ...) G_GNUC_NULL_TERMINATED; - gchar *utils_get_path_from_uri(const gchar *uri); gboolean utils_is_uri(const gchar *uri); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 8f453d: Update of Traditional Chinese translation provided by Matthew Lien.
by Frank Lanitz 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 06 Feb 2012 10:26:50 Commit: 8f453d14cfa375a71b0687c79ed387752d2783d5 https://github.com/geany/geany/commit/8f453d14cfa375a71b0687c79ed387752d278… Log Message: ----------- Update of Traditional Chinese translation provided by Matthew Lien. Modified Paths: -------------- po/ChangeLog po/zh_TW.po Modified: po/ChangeLog 7 files changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,11 @@ +2012-02-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * zh_TW.po: Update of Traditional Chinese translation provided by Matthew Lien. + + 2012-01-26 Frank Lanitz <frlan(a)frank.uvena.de> - * id.po: Added Indonesian translation, provided by Fajar Wahyu. + * id.po: Added Indonesian translation, provided by Fajar Wahyu. 2011-12-30 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: po/zh_TW.po 1390 files changed, 733 insertions(+), 657 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 402249: Revert "Don't append file truncation warning if file doesn't exist"
by Nick Treleaven 26 Jul '12

26 Jul '12

1 0

[geany/geany] cc6e85: Added C++11 keywords to syntax highlighter.
by Alex Charron 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Alex Charron <classixretrox(a)gmail.com> Committer: Alex Charron <classixretrox(a)gmail.com> Date: Sun, 05 Feb 2012 21:30:22 Commit: cc6e85f454a0af91f2e4606cc428757605d5ecc9 https://github.com/geany/geany/commit/cc6e85f454a0af91f2e4606cc428757605d5e… Log Message: ----------- Added C++11 keywords to syntax highlighter. Modified Paths: -------------- data/filetypes.cpp Modified: data/filetypes.cpp 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -3,10 +3,10 @@ [keywords] # all items must be in one line -primary=and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq +primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const constexpr const_cast continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq secondary= # these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo tparam typedef var version warning union [lexer_properties] styling.within.preprocessor=1 @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 6e2d26: Merge pull request #22 from RetroX/patch-1
by elextr 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: elextr <elextr(a)gmail.com> Committer: elextr <elextr(a)gmail.com> Date: Sun, 05 Feb 2012 22:39:02 Commit: 6e2d26b12498fe6b1a982eaf6f49f51205608524 https://github.com/geany/geany/commit/6e2d26b12498fe6b1a982eaf6f49f51205608… Log Message: ----------- Merge pull request #22 from RetroX/patch-1 Added C++11 keywords to syntax highlighter. Modified Paths: -------------- data/filetypes.cpp Modified: data/filetypes.cpp 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -3,10 +3,10 @@ [keywords] # all items must be in one line -primary=and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq +primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const constexpr const_cast continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq secondary= # these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo tparam typedef var version warning union [lexer_properties] styling.within.preprocessor=1 @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 0a22e8: Improve error handling in build_create_shellscript()
by Colomban Wendling 26 Jul '12

26 Jul '12

1 0

[geany/geany] e68668: Don't set error twice (oops)
by Colomban Wendling 26 Jul '12

26 Jul '12

1 0

[geany/geany] ca340a: Properly handle remote URIs received through drag 'n drop
by Colomban Wendling 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 31 Jan 2012 14:22:20 Commit: ca340a8aa332e0c9ff4e5a5f54de944d6a091a74 https://github.com/geany/geany/commit/ca340a8aa332e0c9ff4e5a5f54de944d6a091… Log Message: ----------- Properly handle remote URIs received through drag 'n drop Closes #2966770, #3479567. Modified Paths: -------------- src/document.c Modified: src/document.c 7 files changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -1246,10 +1246,11 @@ void document_open_file_list(const gchar *data, gsize length) list = g_strsplit(data, utils_get_eol_char(utils_get_line_endings(data, length)), 0); - for (i = 0; list[i] != NULL; i++) + /* stop at the end or first empty item, because last item is empty but not null */ + for (i = 0; list[i] != NULL && list[i][0] != '\0'; i++) { - filename = g_filename_from_uri(list[i], NULL, NULL); - if (G_UNLIKELY(filename == NULL)) + filename = utils_get_path_from_uri(list[i]); + if (filename == NULL) continue; document_open_file(filename, FALSE, NULL, NULL); g_free(filename); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] ce21bd: Use g_set_error() rather than manualy creating the GError
by Colomban Wendling 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 05 Feb 2012 18:15:44 Commit: ce21bdfb215f60c270817b641b52ba954303ce9f https://github.com/geany/geany/commit/ce21bdfb215f60c270817b641b52ba954303c… Log Message: ----------- Use g_set_error() rather than manualy creating the GError Modified Paths: -------------- src/win32.c Modified: src/win32.c 42 files changed, 14 insertions(+), 28 deletions(-) =================================================================== @@ -875,8 +875,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return FALSE; } @@ -889,8 +888,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return FALSE; } @@ -911,8 +909,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Stdout pipe creation failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return FALSE; } @@ -925,8 +922,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Stderr pipe creation failed"); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return FALSE; } @@ -939,8 +935,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Stdin pipe creation failed"); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return FALSE; } @@ -1003,8 +998,7 @@ static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **err { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: Alloc failed"); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR, "%s", msg); g_free(msg); return FALSE; } @@ -1014,8 +1008,7 @@ static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **err { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: Cannot read tempfile"); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); g_free(msg); return FALSE; } @@ -1024,8 +1017,7 @@ static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **err { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: CloseHandle failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); g_free(msg); g_free(buffer); *content = NULL; @@ -1094,8 +1086,7 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("CreateChildProcess: CreateProcess failed (%s)", msg); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "%s", msg); g_free(msg); return FALSE; } @@ -1113,8 +1104,7 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetExitCodeProcess failed: %s", msg); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); g_free(msg); } CloseHandle(piProcInfo.hProcess); @@ -1136,8 +1126,7 @@ static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **err { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("ReadFromPipe: Closing handle failed"); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return; } @@ -1172,8 +1161,7 @@ static HANDLE GetTempFileHandle(GError **error) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetTempFileHandle: GetTempPath failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return NULL; } @@ -1187,8 +1175,7 @@ static HANDLE GetTempFileHandle(GError **error) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetTempFileName failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return NULL; } @@ -1205,8 +1192,7 @@ static HANDLE GetTempFileHandle(GError **error) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetTempFileHandle: Second CreateFile failed (%d)", (gint) GetLastError()); - if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); + g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return NULL; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2012