Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Sun, 12 Oct 2014 21:33:51 UTC
Commit: 6d6dd7444b57b41cf657f61f6c514afead12e598
https://github.com/geany/geany/commit/6d6dd7444b57b41cf657f61f6c514afead12e…
Log Message:
-----------
Fix doxygen warnings
Make documents_array public and accessible by doxygen and describe all
parameters of tm_source_file_new().
Modified Paths:
--------------
src/document.h
tagmanager/src/tm_source_file.h
Modified: src/document.h
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -116,6 +116,7 @@ typedef struct GeanyDocument
}
GeanyDocument;
+extern GPtrArray *documents_array;
/** Wraps @ref documents_array so it can be used with C array syntax.
* @warning Always check the returned document is valid (@c doc->is_valid).
@@ -227,8 +228,6 @@ GeanyDocument *document_find_by_id(guint id);
# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CR
#endif
-extern GPtrArray *documents_array;
-
extern GeanyFilePrefs file_prefs;
Modified: tagmanager/src/tm_source_file.h
7 lines changed, 6 insertions(+), 1 deletions(-)
===================================================================
@@ -44,7 +44,12 @@ typedef struct
gboolean inactive; /*!< Whether this file should be scanned for tags */
} TMSourceFile;
-/*! Initializes a TMSourceFile structure and returns a pointer to it. */
+/*! Initializes a TMSourceFile structure and returns a pointer to it.
+ * \param file_name The file name.
+ * \param update Update the tag array of the file.
+ * \param name Name of the used programming language, NULL for autodetection.
+ * \return The created TMSourceFile object.
+ * */
TMWorkObject *tm_source_file_new(const char *file_name, gboolean update, const char *name);
/*! Updates the source file by reparsing if the modification time is greater
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 12 Oct 2014 14:40:12 UTC
Commit: 9caa0046bd9956cdc36a36dd3e6b63a747e1f3ea
https://github.com/geany/geany/commit/9caa0046bd9956cdc36a36dd3e6b63a747e1f…
Log Message:
-----------
Prepare Windows installer for embedded GTK 2.24
Modified Paths:
--------------
geany.nsi
Modified: geany.nsi
10 lines changed, 6 insertions(+), 4 deletions(-)
===================================================================
@@ -175,8 +175,8 @@ Section "Language Files" SEC03
SetOutPath "$INSTDIR\share\locale"
File /r "${RESOURCEDIR}\share\locale\*"
!ifdef INCLUDE_GTK
- SetOutPath "$INSTDIR\share"
- File /r "gtk\share\*"
+ SetOutPath "$INSTDIR\share\locale"
+ File /r "gtk\share\locale\*"
!endif
SectionEnd
@@ -204,7 +204,7 @@ SectionEnd
; Include GTK runtime library but only if desired from command line
!ifdef INCLUDE_GTK
-Section "GTK 2.16 Runtime Environment" SEC06
+Section "GTK 2.24 Runtime Environment" SEC06
SectionIn 1
SetOverwrite ifnewer
SetOutPath "$INSTDIR\bin"
@@ -213,6 +213,8 @@ Section "GTK 2.16 Runtime Environment" SEC06
File /r "gtk\etc\*"
SetOutPath "$INSTDIR\lib"
File /r "gtk\lib\*"
+ SetOutPath "$INSTDIR\share\themes"
+ File /r "gtk\share\themes\*"
SectionEnd
!endif
@@ -323,7 +325,7 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols."
!ifdef INCLUDE_GTK
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.16 or higher), you can skip it."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.24 or higher), you can skip it."
!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'"
!insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 12 Oct 2014 14:35:46 UTC
Commit: 3966ba8c4b2656c12bed7a5bf96a39eadc49d5a7
https://github.com/geany/geany/commit/3966ba8c4b2656c12bed7a5bf96a39eadc49d…
Log Message:
-----------
Query GdkWindow reference only if available
On startup, the Geany main window doesn't have a GdkWindow yet
(probably because it is not yet mapped). This causes many
'gdkdrawable-win32.c:2013 drawable is not a pixmap or window'
warnings when resolving shortcuts on Windows.
Since we pass the SLR_NO_UI to the Windows API, we probably
don't need the parent hWnd reference at all.
Modified Paths:
--------------
src/win32.c
Modified: src/win32.c
12 lines changed, 10 insertions(+), 2 deletions(-)
===================================================================
@@ -1474,8 +1474,16 @@ gchar *win32_get_shortcut_target(const gchar *file_name)
{
gchar *path = NULL;
wchar_t *wfilename = g_utf8_to_utf16(file_name, -1, NULL, NULL, NULL);
-
- resolve_link(GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window)), wfilename, &path);
+ HWND hWnd = NULL;
+
+ if (main_widgets.window != NULL)
+ {
+ GdkWindow *window = gtk_widget_get_window(main_widgets.window);
+ if (window != NULL)
+ hWnd = GDK_WINDOW_HWND(window);
+ }
+
+ resolve_link(hWnd, wfilename, &path);
g_free(wfilename);
if (path == NULL)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Sun, 12 Oct 2014 08:27:31 UTC
Commit: 82985017179d295121b3fd8e45eee07c85ed1f83
https://github.com/geany/geany/commit/82985017179d295121b3fd8e45eee07c85ed1…
Log Message:
-----------
Merge pull request #344 from marcelocamargobr/master
Changed wrong translation of identation
Modified Paths:
--------------
po/pt_BR.po
Modified: po/pt_BR.po
34 lines changed, 17 insertions(+), 17 deletions(-)
===================================================================
@@ -11,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-03-30 20:46+0200\n"
"PO-Revision-Date: 2013-03-05 10:14-0300\n"
-"Last-Translator: Adrovane Marques Kade <adrovane(a)gmail.com>\n"
+"Last-Translator: Marcelo Camargo <marcelocamargo(a)linuxmail.org>\n"
"Language-Team: Portuguese <geany-i18n(a)uvena.de>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -715,11 +715,11 @@ msgstr "Largura:"
#: ../data/geany.glade.h:143
msgid "The width in chars of a single indent"
-msgstr "Largura em caracteres de uma única endentação"
+msgstr "Largura em caracteres de uma única indentação"
#: ../data/geany.glade.h:144
msgid "Auto-indent mode:"
-msgstr "Modo de endentação automática:"
+msgstr "Modo de indentação automática:"
#: ../data/geany.glade.h:145
msgid "Detect type from file"
@@ -730,7 +730,7 @@ msgid ""
"Whether to detect the indentation type from file contents when a file is "
"opened"
msgstr ""
-"Detectar ou não o tipo de endentação a partir do conteúdo de um arquivo "
+"Detectar ou não o tipo de indentação a partir do conteúdo de um arquivo "
"quando ele for aberto"
#: ../data/geany.glade.h:147
@@ -741,7 +741,7 @@ msgstr "T_abs e espaços"
msgid ""
"Use spaces if the total indent is less than the tab width, otherwise use both"
msgstr ""
-"Usar espaços se a endentação total for menor do que a largura da tabulação, "
+"Usar espaços se a indentação total for menor do que a largura da tabulação, "
"senão usa ambos"
#: ../data/geany.glade.h:149
@@ -750,7 +750,7 @@ msgstr "E_spaços"
#: ../data/geany.glade.h:150
msgid "Use spaces when inserting indentation"
-msgstr "Usar espaços quando inserir endentação"
+msgstr "Usar espaços quando inserir indentação"
#: ../data/geany.glade.h:151
msgid "_Tabs"
@@ -758,7 +758,7 @@ msgstr "_Tabs"
#: ../data/geany.glade.h:152
msgid "Use one tab per indent"
-msgstr "Usar um tab por endentação"
+msgstr "Usar um tab por indentação"
#: ../data/geany.glade.h:153
msgid "Detect width from file"
@@ -784,7 +784,7 @@ msgstr "Endentações da tecla Tab"
msgid ""
"Pressing tab/shift-tab indents/unindents instead of inserting a tab character"
msgstr ""
-"Pressionar tab/shift-tab insere/remove endentação em vez de inserir um "
+"Pressionar tab/shift-tab insere/remove indentação em vez de inserir um "
"caracter de tabulação"
#: ../data/geany.glade.h:158
@@ -958,7 +958,7 @@ msgstr "Exibir guias de indentação"
#: ../data/geany.glade.h:194
msgid "Shows small dotted lines to help you to use the right indentation"
msgstr ""
-"Exibir pequenas linhas pontilhadas para ajudar no uso da endentação correta"
+"Exibir pequenas linhas pontilhadas para ajudar no uso da indentação correta"
#: ../data/geany.glade.h:195
msgid "Show white space"
@@ -2160,11 +2160,11 @@ msgstr "_Fechar"
#: ../data/geany.glade.h:463
msgid "Apply the default indentation settings to all documents"
-msgstr "Aplicar configuração de endentação padrão a todos os documentos"
+msgstr "Aplicar configuração de indentação padrão a todos os documentos"
#: ../data/geany.glade.h:464
msgid "_Apply Default Indentation"
-msgstr "_Aplicar endentação padrão"
+msgstr "_Aplicar indentação padrão"
#. build the code
#: ../data/geany.glade.h:465 ../src/build.c:2566 ../src/build.c:2843
@@ -2862,12 +2862,12 @@ msgstr "Tabs e Espaços"
#: ../src/document.c:1057
#, c-format
msgid "Setting %s indentation mode for %s."
-msgstr "Definindo %s modo de endentação para %s."
+msgstr "Definindo %s modo de indentação para %s."
#: ../src/document.c:1068
#, c-format
msgid "Setting indentation width to %d for %s."
-msgstr "Definindo largura de endentação para %d para %s."
+msgstr "Definindo largura de indentação para %d para %s."
#: ../src/document.c:1222
#, c-format
@@ -3470,11 +3470,11 @@ msgstr "Diminuir indentação"
#: ../src/keybindings.c:389
msgid "Increase indent by one space"
-msgstr "Aumentar endentação em um espaço"
+msgstr "Aumentar indentação em um espaço"
#: ../src/keybindings.c:391
msgid "Decrease indent by one space"
-msgstr "Diminuir endentação em um espaço"
+msgstr "Diminuir indentação em um espaço"
#: ../src/keybindings.c:395
msgid "Send to Custom Command 1"
@@ -4975,11 +4975,11 @@ msgstr "Diminui o zoom do texto"
#: ../src/toolbar.c:73
msgid "Decrease indentation"
-msgstr "Diminuir endentação"
+msgstr "Diminuir indentação"
#: ../src/toolbar.c:74
msgid "Increase indentation"
-msgstr "Aumentar endentação"
+msgstr "Aumentar indentação"
#: ../src/toolbar.c:75 ../src/toolbar.c:380
msgid "Find the entered text in the current file"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Matthew Brush <matt(a)geany.org>
Committer: Matthew Brush <matt(a)geany.org>
Date: Sat, 11 Oct 2014 01:40:54 UTC
Commit: 41c66e0eb06358b9ab07ae5564370331ea452b52
https://github.com/geany/geany/commit/41c66e0eb06358b9ab07ae5564370331ea452…
Log Message:
-----------
Change "replace_and_find_by_default" default to true
Modified Paths:
--------------
doc/geany.txt
src/keyfile.c
Modified: doc/geany.txt
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2652,7 +2652,7 @@ extract_filetype_regex Regex to extract filetype name from file S
**Search related**
find_selection_type See `Find selection`_. 0 immediately
**Replace related**
-replace_and_find_by_default Set ``Replace & Find`` button as default so false immediately
+replace_and_find_by_default Set ``Replace & Find`` button as default so true immediately
it will be activated when the Enter key is
pressed while one of the text fields has
focus.
Modified: src/keyfile.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -232,7 +232,7 @@ static void init_pref_groups(void)
stash_group_add_string(group, &file_prefs.extract_filetype_regex,
"extract_filetype_regex", GEANY_DEFAULT_FILETYPE_REGEX);
stash_group_add_boolean(group, &search_prefs.replace_and_find_by_default,
- "replace_and_find_by_default", FALSE);
+ "replace_and_find_by_default", TRUE);
/* Note: Interface-related various prefs are in ui_init_prefs() */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).