Branch: refs/heads/master Author: bervianto 13514047@std.stei.itb.ac.id Committer: bervianto 13514047@std.stei.itb.ac.id Date: Sun, 30 Oct 2016 16:05:20 UTC Commit: 4695f6f2aa8f72e7d16c596922eb9477fc2f021f https://github.com/geany/geany/commit/4695f6f2aa8f72e7d16c596922eb9477fc2f02...
Log Message: ----------- rebase
Modified Paths: -------------- NEWS data/filedefs/filetypes.common doc/geany.txt doc/pluginsignals.c po/ar.po po/ast.po po/be.po po/bg.po po/ca.po po/cs.po po/de.po po/el.po po/en_GB.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po po/gl.po po/he.po po/hi.po po/hu.po po/id.po po/it.po po/ja.po po/kk.po po/ko.po po/lb.po po/lt.po po/mn.po po/nl.po po/nn.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sr.po po/sv.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po src/geanyobject.c src/geanyobject.h src/highlighting.c src/plugindata.h src/plugins.c src/project.c
Modified: NEWS 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -18,6 +18,7 @@ Geany 1.29 (unreleased) (Abel Serrano Juste, PR#1134). * Performance improvements with many duplicate symbols (Jiří Techet, PR#797, Issue#577). + * Allow to configure the error indicator color (PR#1185).
Filetypes * Fix highlighting of Haxe preprocessor (Issue#936). @@ -28,10 +29,16 @@ Geany 1.29 (unreleased)
API * Update `GeanyProxyProbeResults` API (PR#1213). - * Allow a dot at the start of proxy extensions (PR#1212). + * Warn if a dot is used at the start of a proxy extension (PR#1212, + PR#1233). * Add support for custom data attached to documents through `plugin_set_document_data()`, `plugin_get_document_data()` and `plugin_set_document_data_full()` (PR#1203). + * Add "project-before-close" signal (PR#1223). + + Plugins + * Split Window: Work around a GTK bug present from 3.15.9 to 3.21.4 + that breaks the document selection popup (Issue#1149, PR#1272).
Geany 1.28 (July 10, 2016)
Modified: data/filedefs/filetypes.common 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -93,6 +93,9 @@ line_height=0;0; # 4th argument is true to override default background of calltips calltips=call_tips
+# error indicator color +indicator_error=0xff0000 + [settings] # which characters should be skipped when moving (or included when deleting) to word boundaries # should always include space and tab (\s\t)
Modified: doc/geany.txt 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -4593,6 +4593,13 @@ calltips
*Example:* ``calltips=0xc0c0c0;0xffffff;false;false``
+indicator_error + The color of the error indicator. + + Only the first argument (foreground color) is used. + + *Example:* ``indicator_error=0xff0000`` +
[settings] section ``````````````````
Modified: doc/pluginsignals.c 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -159,6 +159,15 @@ signal void (*project_save)(GObject *obj, GKeyFile *config, gpointer user_data); */ signal void (*project_close)(GObject *obj, gpointer user_data);
+/** Sent before a project is closed. + * + * @param obj a GeanyObject instance, should be ignored. + * @param user_data user data. + * + * @since 1.29 (API 230) + */ +signal void (*project_before_close)(GObject *obj, gpointer user_data); + /** Sent after a project dialog is opened but before it is displayed. Plugins * can append their own project settings tabs by using this signal. *
Modified: po/ar.po 1268 lines changed, 642 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/ast.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/be.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/bg.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/ca.po 2272 lines changed, 1227 insertions(+), 1045 deletions(-) =================================================================== No diff available, check online
Modified: po/cs.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/de.po 64 lines changed, 33 insertions(+), 31 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-24 20:07+0200\n" +"POT-Creation-Date: 2016-10-29 20:21+0200\n" "PO-Revision-Date: 2015-03-31 07:10+0200\n" "Last-Translator: Frank Lanitz frank@frank.uvena.de\n" "Language-Team: German geany-i18n@uvena.de\n" @@ -3246,29 +3246,29 @@ msgstr "Schlechter RegEx für Dateityp %s: %s" msgid "untitled" msgstr "unbenannt"
-#: ../src/highlighting.c:1226 ../src/libmain.c:850 ../src/socket.c:170 +#: ../src/highlighting.c:1229 ../src/libmain.c:850 ../src/socket.c:170 #: ../src/templates.c:232 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden."
-#: ../src/highlighting.c:1296 +#: ../src/highlighting.c:1299 msgid "Default" msgstr "Standard"
-#: ../src/highlighting.c:1337 +#: ../src/highlighting.c:1340 msgid "The current filetype overrides the default style." msgstr "" "Der aktuelle Dateityp überschreibt die Standardeinstellungen für die " "Darstellung."
-#: ../src/highlighting.c:1338 +#: ../src/highlighting.c:1341 msgid "This may cause color schemes to display incorrectly." msgstr "" "Dies kann dazu führen, dass eventuell Farbprofile nicht korrekt angezeigt " "werden."
-#: ../src/highlighting.c:1363 +#: ../src/highlighting.c:1366 msgid "Color Schemes" msgstr "Farbschemata"
@@ -3313,7 +3313,7 @@ msgstr "Ansicht" msgid "Document" msgstr "Dokument"
-#: ../src/keybindings.c:320 ../src/keybindings.c:689 ../src/project.c:511 +#: ../src/keybindings.c:320 ../src/keybindings.c:689 ../src/project.c:513 #: ../src/ui_utils.c:2195 msgid "Build" msgstr "Erstellen" @@ -4088,12 +4088,14 @@ msgstr "Plugins" msgid "Choose which plugins should be loaded at startup:" msgstr "Plugins, die beim Starten geladen werden sollen:"
-#: ../src/plugins.c:2012 -#, c-format +#: ../src/plugins.c:2060 +#, fuzzy, c-format msgid "" -"Proxy plugin extension '%s' starts with a dot, stripping. Please fix your " -"proxy plugin." -msgstr "Die Proxy-Plugin-Erweiterung »%s« beginnt mit einem Punkt. Bitte korrigiere die Erweiterung." +"Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " +"plugin." +msgstr "" +"Die Proxy-Plugin-Erweiterung »%s« beginnt mit einem Punkt. Bitte korrigiere " +"die Erweiterung."
#: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4281,11 +4283,11 @@ msgstr "" "Der Pfad der Datei repräsentiert das Projekt und beinhaltet dessen " "Einstellungen. Gewöhnlich sollte sie die »%s« Dateiendung besitzen."
-#: ../src/project.c:212 ../src/project.c:484 +#: ../src/project.c:212 ../src/project.c:486 msgid "Choose Project Base Path" msgstr "Auswahl des Projektbasisverzeichnisses"
-#: ../src/project.c:251 ../src/project.c:621 ../src/project.c:1160 +#: ../src/project.c:251 ../src/project.c:623 ../src/project.c:1162 msgid "Project file could not be written" msgstr "Projektdatei konnte nicht geschrieben werden."
@@ -4294,7 +4296,7 @@ msgstr "Projektdatei konnte nicht geschrieben werden." msgid "Project "%s" created." msgstr "Projekt »%s« erstellt."
-#: ../src/project.c:295 ../src/project.c:322 ../src/project.c:1021 +#: ../src/project.c:295 ../src/project.c:322 ../src/project.c:1023 #, c-format msgid "Project file "%s" could not be loaded." msgstr "Die Projektdatei »%s« konnte nicht geladen werden." @@ -4312,67 +4314,67 @@ msgstr "Projektdateien" msgid "Project "%s" closed." msgstr "Projekt »%s« geschlossen."
-#: ../src/project.c:624 +#: ../src/project.c:626 #, c-format msgid "Project "%s" saved." msgstr "Projekt »%s« gespeichert."
-#: ../src/project.c:657 +#: ../src/project.c:659 msgid "Do you want to close it before proceeding?" msgstr "Möchten Sie das Projekt schließen bevor Sie fortfahren?"
-#: ../src/project.c:658 +#: ../src/project.c:660 #, c-format msgid "The '%s' project is open." msgstr "Das Projekt »%s« ist geöffnet."
-#: ../src/project.c:707 +#: ../src/project.c:709 msgid "The specified project name is too short." msgstr "Der eingegebene Projektname ist zu kurz."
-#: ../src/project.c:713 +#: ../src/project.c:715 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Der eingegebene Projektname ist zu lang (max. %d Zeichen)."
-#: ../src/project.c:725 +#: ../src/project.c:727 msgid "You have specified an invalid project filename." msgstr "Sie haben einen ungültigen Dateinamen angegeben."
-#: ../src/project.c:748 +#: ../src/project.c:750 msgid "Create the project's base path directory?" msgstr "Soll das Projektbasisverzeichnis erstellt werden?"
-#: ../src/project.c:749 +#: ../src/project.c:751 #, c-format msgid "The path "%s" does not exist." msgstr "Der Pfad »%s« existiert nicht."
-#: ../src/project.c:758 +#: ../src/project.c:760 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektverzeichnis konnte nicht erstellt werden (%s)."
-#: ../src/project.c:771 +#: ../src/project.c:773 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektdatei konnte nicht geschrieben werden (%s)."
-#: ../src/project.c:777 ../src/search.c:627 +#: ../src/project.c:779 ../src/search.c:627 msgid "_Replace" msgstr "_Ersetzen"
-#: ../src/project.c:779 ../plugins/export.c:331 +#: ../src/project.c:781 ../plugins/export.c:331 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei »%s« existiert bereits. Soll sie überschrieben werden?"
#. initialise the dialog -#: ../src/project.c:925 ../src/project.c:936 +#: ../src/project.c:927 ../src/project.c:938 msgid "Choose Project Filename" msgstr "Auswahl des Projektdateinamens"
-#: ../src/project.c:1011 +#: ../src/project.c:1013 #, c-format msgid "Project "%s" opened." msgstr "Projekt »%s« geöffnet." @@ -5062,8 +5064,8 @@ msgid "" "Cannot execute template command "%s". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" -"Kann das Kommando »%s« nicht ausführen. Tipp: Oft sind falsche Pfade " -"eine mögliche Ursache. Fehler: %s" +"Kann das Kommando »%s« nicht ausführen. Tipp: Oft sind falsche Pfade eine " +"mögliche Ursache. Fehler: %s"
#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58
Modified: po/el.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/en_GB.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/es.po 1285 lines changed, 653 insertions(+), 632 deletions(-) =================================================================== No diff available, check online
Modified: po/et.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/eu.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/fa.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/fi.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/fr.po 54 lines changed, 27 insertions(+), 27 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-27 10:19+0200\n" +"POT-Creation-Date: 2016-10-29 20:21+0200\n" "PO-Revision-Date: 2016-10-27 10:27+0200\n" "Last-Translator: Colomban Wendling ban@herbesfolles.org\n" "Language-Team: French geany-i18n@uvena.de\n" @@ -3259,25 +3259,25 @@ msgstr "Mauvaise expression régulière pour le type de fichier %s : %s" msgid "untitled" msgstr "sans titre"
-#: ../src/highlighting.c:1226 ../src/libmain.c:850 ../src/socket.c:170 +#: ../src/highlighting.c:1229 ../src/libmain.c:850 ../src/socket.c:170 #: ../src/templates.c:232 #, c-format msgid "Could not find file '%s'." msgstr "Impossible de trouver le fichier « %s »."
-#: ../src/highlighting.c:1296 +#: ../src/highlighting.c:1299 msgid "Default" msgstr "Par défaut"
-#: ../src/highlighting.c:1337 +#: ../src/highlighting.c:1340 msgid "The current filetype overrides the default style." msgstr "Le type de fichier actuel remplace le style par défaut."
-#: ../src/highlighting.c:1338 +#: ../src/highlighting.c:1341 msgid "This may cause color schemes to display incorrectly." msgstr "Ceci peut entraîner un affichage incorrect des jeux de couleurs."
-#: ../src/highlighting.c:1363 +#: ../src/highlighting.c:1366 msgid "Color Schemes" msgstr "Jeux de couleurs"
@@ -3322,7 +3322,7 @@ msgstr "Affichage" msgid "Document" msgstr "Document"
-#: ../src/keybindings.c:320 ../src/keybindings.c:689 ../src/project.c:511 +#: ../src/keybindings.c:320 ../src/keybindings.c:689 ../src/project.c:513 #: ../src/ui_utils.c:2195 msgid "Build" msgstr "Construire" @@ -4100,11 +4100,11 @@ msgstr "Plugins" msgid "Choose which plugins should be loaded at startup:" msgstr "Choisissez les plugins à charger au démarrage :"
-#: ../src/plugins.c:2012 +#: ../src/plugins.c:2060 #, c-format msgid "" -"Proxy plugin extension '%s' starts with a dot, stripping. Please fix your " -"proxy plugin." +"Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " +"plugin." msgstr ""
#: ../src/pluginutils.c:411 @@ -4292,11 +4292,11 @@ msgstr "" "Chemin du fichier qui représente le projet et contient ses préférences. Il " "devrait normalement avoir l'extension « %s »."
-#: ../src/project.c:212 ../src/project.c:484 +#: ../src/project.c:212 ../src/project.c:486 msgid "Choose Project Base Path" msgstr "Choisir le dossier de base du projet"
-#: ../src/project.c:251 ../src/project.c:621 ../src/project.c:1160 +#: ../src/project.c:251 ../src/project.c:623 ../src/project.c:1162 msgid "Project file could not be written" msgstr "Le fichier de projet n'a pas pu être écrit"
@@ -4305,7 +4305,7 @@ msgstr "Le fichier de projet n'a pas pu être écrit" msgid "Project "%s" created." msgstr "Projet « %s » créé."
-#: ../src/project.c:295 ../src/project.c:322 ../src/project.c:1021 +#: ../src/project.c:295 ../src/project.c:322 ../src/project.c:1023 #, c-format msgid "Project file "%s" could not be loaded." msgstr "Le fichier de projet « %s » n'a pu être chargé." @@ -4323,67 +4323,67 @@ msgstr "Fichiers de projet" msgid "Project "%s" closed." msgstr "Projet « %s » fermé."
-#: ../src/project.c:624 +#: ../src/project.c:626 #, c-format msgid "Project "%s" saved." msgstr "Projet « %s » enregistré."
-#: ../src/project.c:657 +#: ../src/project.c:659 msgid "Do you want to close it before proceeding?" msgstr "Voulez-vous le fermer avant de continuer ?"
-#: ../src/project.c:658 +#: ../src/project.c:660 #, c-format msgid "The '%s' project is open." msgstr "Le projet « %s » est ouvert."
-#: ../src/project.c:707 +#: ../src/project.c:709 msgid "The specified project name is too short." msgstr "Le nom de projet spécifié est trop court."
-#: ../src/project.c:713 +#: ../src/project.c:715 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Le nom de projet spécifié est trop long (maximum %d caractères)."
-#: ../src/project.c:725 +#: ../src/project.c:727 msgid "You have specified an invalid project filename." msgstr "Vous avez spécifié un nom de fichier de projet invalide."
-#: ../src/project.c:748 +#: ../src/project.c:750 msgid "Create the project's base path directory?" msgstr "Créer le dossier de base du projet ?"
-#: ../src/project.c:749 +#: ../src/project.c:751 #, c-format msgid "The path "%s" does not exist." msgstr "Le chemin « %s » est inexistant."
-#: ../src/project.c:758 +#: ../src/project.c:760 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Le dossier de base du projet n'a pu être créé (%s)."
-#: ../src/project.c:771 +#: ../src/project.c:773 #, c-format msgid "Project file could not be written (%s)." msgstr "Le fichier de projet n'a pas pu être écrit (%s)."
-#: ../src/project.c:777 ../src/search.c:627 +#: ../src/project.c:779 ../src/search.c:627 msgid "_Replace" msgstr "R_emplacer"
-#: ../src/project.c:779 ../plugins/export.c:331 +#: ../src/project.c:781 ../plugins/export.c:331 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Le fichier « %s » existe déjà. Voulez-vous l'écraser ?"
#. initialise the dialog -#: ../src/project.c:925 ../src/project.c:936 +#: ../src/project.c:927 ../src/project.c:938 msgid "Choose Project Filename" msgstr "Choix du nom du fichier du projet"
-#: ../src/project.c:1011 +#: ../src/project.c:1013 #, c-format msgid "Project "%s" opened." msgstr "Projet « %s » ouvert."
Modified: po/gl.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/he.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/hi.po 1267 lines changed, 641 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/hu.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/id.po 1347 lines changed, 691 insertions(+), 656 deletions(-) =================================================================== No diff available, check online
Modified: po/it.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/ja.po 1289 lines changed, 657 insertions(+), 632 deletions(-) =================================================================== No diff available, check online
Modified: po/kk.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/ko.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/lb.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/lt.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/mn.po 1267 lines changed, 641 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/nl.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/nn.po 1267 lines changed, 641 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/pl.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/pt.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/pt_BR.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/ro.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/ru.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/sk.po 1276 lines changed, 649 insertions(+), 627 deletions(-) =================================================================== No diff available, check online
Modified: po/sl.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/sr.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/sv.po 1278 lines changed, 650 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/tr.po 1279 lines changed, 651 insertions(+), 628 deletions(-) =================================================================== No diff available, check online
Modified: po/uk.po 1268 lines changed, 642 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/vi.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: po/zh_CN.po 1276 lines changed, 649 insertions(+), 627 deletions(-) =================================================================== No diff available, check online
Modified: po/zh_TW.po 1269 lines changed, 643 insertions(+), 626 deletions(-) =================================================================== No diff available, check online
Modified: src/geanyobject.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -156,6 +156,12 @@ static void create_signals(GObjectClass *g_object_class) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + geany_object_signals[GCB_PROJECT_BEFORE_CLOSE] = g_signal_new ( + "project-before-close", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); geany_object_signals[GCB_PROJECT_DIALOG_OPEN] = g_signal_new ( "project-dialog-open", G_OBJECT_CLASS_TYPE (g_object_class),
Modified: src/geanyobject.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -47,6 +47,7 @@ typedef enum GCB_PROJECT_OPEN, GCB_PROJECT_SAVE, GCB_PROJECT_CLOSE, + GCB_PROJECT_BEFORE_CLOSE, GCB_PROJECT_DIALOG_OPEN, GCB_PROJECT_DIALOG_CONFIRMED, GCB_PROJECT_DIALOG_CLOSE,
Modified: src/highlighting.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -97,6 +97,7 @@ enum /* Geany common styling */ GCS_MARKER_TRANSLUCENCY, GCS_LINE_HEIGHT, GCS_CALLTIPS, + GCS_INDICATOR_ERROR, GCS_MAX };
@@ -560,6 +561,7 @@ static void styleset_common_init(GKeyFile *config, GKeyFile *config_home) get_keyfile_style(config, config_home, "marker_search", &common_style_set.styling[GCS_MARKER_SEARCH]); get_keyfile_style(config, config_home, "marker_mark", &common_style_set.styling[GCS_MARKER_MARK]); get_keyfile_style(config, config_home, "calltips", &common_style_set.styling[GCS_CALLTIPS]); + get_keyfile_style(config, config_home, "indicator_error", &common_style_set.styling[GCS_INDICATOR_ERROR]);
get_keyfile_ints(config, config_home, "styling", "folding_style", 1, 1, &common_style_set.fold_marker, &common_style_set.fold_lines); @@ -649,7 +651,8 @@ static void styleset_common(ScintillaObject *sci, guint ft_id)
/* Error indicator */ SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_ERROR, INDIC_SQUIGGLEPIXMAP); - SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR, invert(0x0000FF /* red, in BGR */)); + SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR, + invert(common_style_set.styling[GCS_INDICATOR_ERROR].foreground));
/* Search indicator, used for 'Mark' matches */ SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_SEARCH, INDIC_ROUNDBOX);
Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -59,7 +59,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 229 +#define GEANY_API_VERSION 230
/* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins * with GTK3-linked Geany leads to crash */
Modified: src/plugins.c 20 lines changed, 7 insertions(+), 13 deletions(-) =================================================================== @@ -2005,18 +2005,6 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) }
-static const gchar *fix_extension(const gchar *ext) -{ - if (*ext == '.') - { - g_warning(_("Proxy plugin extension '%s' starts with a dot, " - "stripping. Please fix your proxy plugin."), ext); - ext++; - } - return ext; -} - - /** Register the plugin as a proxy for other plugins * * Proxy plugins register a list of file extensions and a set of callbacks that are called @@ -2067,8 +2055,14 @@ gboolean geany_plugin_register_proxy(GeanyPlugin *plugin, const gchar **extensio
foreach_strv(ext, extensions) { + if (**ext == '.') + { + g_warning(_("Proxy plugin '%s' extension '%s' starts with a dot. " + "Please fix your proxy plugin."), p->info.name, *ext); + } + proxy = g_new(PluginProxy, 1); - g_strlcpy(proxy->extension, fix_extension(*ext), sizeof(proxy->extension)); + g_strlcpy(proxy->extension, *ext, sizeof(proxy->extension)); proxy->plugin = p; /* prepend, so that plugins automatically override core providers for a given extension */ g_queue_push_head(&active_proxies, proxy);
Modified: src/project.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -425,6 +425,8 @@ static void destroy_project(gboolean open_default)
g_return_if_fail(app->project != NULL);
+ g_signal_emit_by_name(geany_object, "project-before-close"); + /* remove project filetypes build entries */ if (app->project->priv->build_filetypes_list != NULL) {
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).