Commits September 2019

commits@lists.geany.org

1 participants
50 discussions

[geany/geany] 82590a: Add missing HAVE_SOCKET guard on in main_lib()

by Enrico Tröger

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Mon, 30 Sep 2019 14:41:06 UTC Commit: 82590af4cc2d52fc0060eda872ddb2a5782e6e6c https://github.com/geany/geany/commit/82590af4cc2d52fc0060eda872ddb2a5782e6… Log Message: ----------- Add missing HAVE_SOCKET guard on in main_lib() Modified Paths: -------------- src/libmain.c Modified: src/libmain.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1178,13 +1178,15 @@ gint main_lib(gint argc, gchar **argv) ui_set_statusbar(TRUE, message, g_strerror(config_dir_result)); g_warning(message, g_strerror(config_dir_result)); } +#ifdef HAVE_SOCKET if (socket_info.lock_socket == -1) { const gchar *message = _("IPC socket could not be created, see Help->Debug Messages for details."); ui_set_statusbar(TRUE, "%s", message); g_warning("%s", message); } +#endif /* apply all configuration options */ apply_settings(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany-osx] 22fcef: 1.36

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 29 Sep 2019 21:08:19 UTC Commit: 22fcef99bd449aa2f3b4edbf185cd64d3c683293 https://github.com/geany/geany-osx/commit/22fcef99bd449aa2f3b4edbf185cd64d3… Log Message: ----------- 1.36 Modified Paths: -------------- Info.plist create_dmg.sh geany.modules Modified: Info.plist 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -3,11 +3,11 @@ <plist version="1.0"> <dict> <key>CFBundleShortVersionString</key> - <string>1.35</string> + <string>1.36</string> <key>CFBundleVersion</key> - <string>1.35</string> + <string>1.36</string> <key>CFBundleGetInfoString</key> - <string>1.35 (C) 2019 The Geany Team, https://www.geany.org</string> + <string>1.36 (C) 2019 The Geany Team, https://www.geany.org</string> <key>NSHumanReadableCopyright</key> <string>Copyright 2019 The Geany Team, GNU General Public License</string> Modified: create_dmg.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ #!/bin/sh -VERSION="1.35" +VERSION="1.36" NAME="Geany" ICONNAME="Geany.icns" Modified: geany.modules 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -156,7 +156,7 @@ <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-${version}" - version="1.35"/> + version="1.36"/> <dependencies> <dep package="geany-deps-gtk2" /> </dependencies> @@ -168,7 +168,7 @@ <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-${version}" - version="1.35"/> + version="1.36"/> <dependencies> <dep package="geany-deps-gtk3" /> </dependencies> @@ -212,7 +212,7 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-${version}" - version="1.35"/> + version="1.36"/> <dependencies> <dep package="geany-release-gtk2" /> <dep package="geany-plugins-deps" /> @@ -224,7 +224,7 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-${version}" - version="1.35"/> + version="1.36"/> <dependencies> <dep package="geany-release-gtk3" /> <dep package="geany-plugins-deps" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany-osx] 464579: README updates reflecting changes in gtk-osx

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 29 Sep 2019 21:07:29 UTC Commit: 4645796bdfe091308cf37c43decd585cc6a1f029 https://github.com/geany/geany-osx/commit/4645796bdfe091308cf37c43decd585cc… Log Message: ----------- README updates reflecting changes in gtk-osx Modified Paths: -------------- README.md Modified: README.md 17 lines changed, 12 insertions(+), 5 deletions(-) =================================================================== @@ -107,11 +107,11 @@ To create the bundle, you need to first install JHBuild and GTK as described bel commands: * **GTK 2** ``` - jhbuild bootstrap-gtk-osx && jhbuild build python python3 meta-gtk-osx-bootstrap meta-gtk-osx-core + jhbuild bootstrap-gtk-osx && jhbuild build python3 meta-gtk-osx-freetype meta-gtk-osx-bootstrap meta-gtk-osx-core ``` * **GTK 3** ``` - jhbuild bootstrap-gtk-osx && jhbuild build python python3 meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 + jhbuild bootstrap-gtk-osx && jhbuild build python3 meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 ``` This is the moment when you have to make a decision whether to build Geany with GTK 2 or GTK 3 - they cannot be installed side by side. @@ -122,7 +122,7 @@ Geany Installation 1. Docutils will fail if you do not set the following environment variables: ``` - export LC_ALL=en_US.UTF-8; export LANG=en_US.UTF-8 + export LC_ALL=en_US.UTF-8; export LANG=en_US.UTF-8; export PYTHON=python3 ``` 2. To build Geany, plugins and all of their dependencies, run one of @@ -180,11 +180,11 @@ Bundling the app bundle. * **GTK 2** ``` - gtk-mac-bundler geany-gtk2.bundle + ~/.local/bin/gtk-mac-bundler geany-gtk2.bundle ``` * **GTK 3** ``` - gtk-mac-bundler geany-gtk3.bundle + ~/.local/bin/gtk-mac-bundler geany-gtk3.bundle ``` 5. Optionally if you have a development account at Apple and want to sign the @@ -256,6 +256,13 @@ have to be performed during normal bundle/installer creation: `Info.plist` and `create_dmg.sh`. Also update the `-release` targets in `geany.modules` file to point to the new release. Dependencies inside `geany.modules` can also be updated to newer versions. + +* To make sure nothing is left from the previous build when making a + new release, run + + ``` + rm -rf .new_local Source gtk .cache/jhbuild + ``` --- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany-osx] 99ea06: Fix gtk-mac-bundler build with new jhbuild

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 29 Sep 2019 21:06:27 UTC Commit: 99ea06417987377094cf7999fb620e52713f467e https://github.com/geany/geany-osx/commit/99ea06417987377094cf7999fb620e527… Log Message: ----------- Fix gtk-mac-bundler build with new jhbuild Modified Paths: -------------- geany.modules Modified: geany.modules 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -97,6 +97,7 @@ <autotools id="gtk-mac-bundler" skip-autogen="true" skip-install="true" + supports-non-srcdir-builds="no" makeargs="install">  <branch repo="gitlab.gnome.org" module="gtk-mac-bundler"/> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany-osx] 87b4df: Update module versions

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 29 Sep 2019 21:05:45 UTC Commit: 87b4dfe0c6fe7e6a7503973a9d6fa9c80324d7da https://github.com/geany/geany-osx/commit/87b4dfe0c6fe7e6a7503973a9d6fa9c80… Log Message: ----------- Update module versions Modified Paths: -------------- geany.modules Modified: geany.modules 12 lines changed, 7 insertions(+), 5 deletions(-) =================================================================== @@ -18,22 +18,24 @@ href="https://github.com/"/> <repository type="tarball" name="download.geany.org" href="https://download.geany.org/"/> + <repository type="tarball" name="files.pythonhosted.org" + href="https://files.pythonhosted.org/"/> <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx…" />  <distutils id="docutils"> - <branch repo="sourceforge" - module="docutils/docutils-${version}.tar.gz" - version="0.12"/> + <branch repo="files.pythonhosted.org" + module="packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61/docutils-${version}.tar.gz" + version="0.15.2"/> </distutils>  <autotools id="pcre2" autogenargs="--enable-jit --enable-pcre2-8"> <branch repo="pcre" module="pcre2-${version}.tar.bz2" - version="10.30"/> + version="10.33"/> </autotools>  @@ -77,7 +79,7 @@ <branch repo="download.github.com" module="libgit2/libgit2/archive/v${version}.tar.gz" checkoutdir="libgit2-${version}" - version="0.27.7"/> + version="0.28.3"/> </cmake>  -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany-osx] 5d2e74: Fix signing script

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 29 Sep 2019 21:03:58 UTC Commit: 5d2e74c0d861ac8a1c5acd637077a14f24e32b2e https://github.com/geany/geany-osx/commit/5d2e74c0d861ac8a1c5acd637077a14f2… Log Message: ----------- Fix signing script Modified Paths: -------------- sign.sh Modified: sign.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,5 +7,5 @@ export -f sign sign "./Geany.app/Contents/MacOS/geany-bin" sign "./Geany.app/Contents/Resources/libexec/gnome-pty-helper" -find . -name "*.dylib" -o -name "*.so" -exec sh -c 'sign "$0"' {} \; +find ./Geany.app $ -name "*.dylib" -or -name "*.so" $ -exec sh -c 'sign "$0"' {} \; sign "./Geany.app" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany-osx] a3d75c: Remove (now unused) libsoup modules from bundle file

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 29 Sep 2019 21:02:03 UTC Commit: a3d75cda9fe7a83f41c58ff52b0cb695e7879267 https://github.com/geany/geany-osx/commit/a3d75cda9fe7a83f41c58ff52b0cb695e… Log Message: ----------- Remove (now unused) libsoup modules from bundle file Modified Paths: -------------- geany-gtk2.bundle geany-gtk3.bundle Modified: geany-gtk2.bundle 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -96,11 +96,6 @@ ${prefix}/lib/enchant/*.so </binary> -  - <binary> - ${prefix}/lib/gio/modules/*.so - </binary> -  <binary> ${prefix}/lib/geany/*.so Modified: geany-gtk3.bundle 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -76,11 +76,6 @@ ${prefix}/lib/enchant/*.so </binary> -  - <binary> - ${prefix}/lib/gio/modules/*.so - </binary> -  <binary> ${prefix}/lib/geany/*.so -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany] bcbae3: Make New Project dialog cancellable without closing existing session

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sun, 29 Sep 2019 16:26:43 UTC Commit: bcbae3d49abdb6d27d3627c686bb3b96b338b997 https://github.com/geany/geany/commit/bcbae3d49abdb6d27d3627c686bb3b96b338b… Log Message: ----------- Make New Project dialog cancellable without closing existing session Move logic to handle_current_session(), run_new_dialog(). Modified Paths: -------------- src/project.c Modified: src/project.c 83 lines changed, 45 insertions(+), 38 deletions(-) =================================================================== @@ -86,6 +86,7 @@ static gboolean write_config(void); static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e); static void on_entries_changed(GtkEditable *editable, PropertyDialogElements *e); static void on_radio_long_line_custom_toggled(GtkToggleButton *radio, GtkWidget *spin_long_line); +static void run_new_dialog(PropertyDialogElements *e); static void apply_editor_prefs(void); static void init_stash_prefs(void); static void destroy_project(gboolean open_default); @@ -109,20 +110,8 @@ static gboolean have_session_docs(void) } -/* TODO: this should be ported to Glade like the project preferences dialog, - * then we can get rid of the PropertyDialogElements struct altogether as - * widgets pointers can be accessed through ui_lookup_widget(). */ -void project_new(void) +static gboolean handle_current_session(void) { - GtkWidget *vbox; - GtkWidget *table; - GtkWidget *image; - GtkWidget *button; - GtkWidget *bbox; - GtkWidget *label; - gchar *tooltip; - PropertyDialogElements e = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, FALSE }; - if (!app->project && project_prefs.project_session) { /* save session in case the dialog is cancelled */ @@ -139,15 +128,29 @@ void project_new(void) else { if (!document_close_all()) - return; + return FALSE; } } } + if (app->project) + return project_close(FALSE); + return TRUE; +} - if (! project_ask_close()) - return; - g_return_if_fail(app->project == NULL); +/* TODO: this should be ported to Glade like the project preferences dialog, + * then we can get rid of the PropertyDialogElements struct altogether as + * widgets pointers can be accessed through ui_lookup_widget(). */ +void project_new(void) +{ + GtkWidget *vbox; + GtkWidget *table; + GtkWidget *image; + GtkWidget *button; + GtkWidget *bbox; + GtkWidget *label; + gchar *tooltip; + PropertyDialogElements e = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, FALSE }; e.dialog = gtk_dialog_new_with_buttons(_("New Project"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -224,25 +227,21 @@ void project_new(void) g_signal_connect(e.base_path, "changed", G_CALLBACK(on_entries_changed), &e); gtk_widget_show_all(e.dialog); + run_new_dialog(&e); + gtk_widget_destroy(e.dialog); + document_new_file_if_non_open(); + ui_focus_current_document(); +} + - while (1) +static void run_new_dialog(PropertyDialogElements *e) +{ + if (gtk_dialog_run(GTK_DIALOG(e->dialog)) != GTK_RESPONSE_OK || + !handle_current_session()) + return; + do { - if (gtk_dialog_run(GTK_DIALOG(e.dialog)) != GTK_RESPONSE_OK) - { - // any open docs were meant to be moved into the project - // rewrite default session because it was cleared - if (have_session_docs()) - configuration_save_default_session(); - else - { - // reload any documents that were closed - configuration_reload_default_session(); - configuration_open_files(); - } - break; - } - // dialog confirmed - if (update_config(&e, TRUE)) + if (update_config(e, TRUE)) { // app->project is now set if (!write_config()) @@ -254,13 +253,21 @@ void project_new(void) { ui_set_statusbar(TRUE, _("Project \"%s\" created."), app->project->name); ui_add_recent_project_file(app->project->file_name); - break; + return; } } } - gtk_widget_destroy(e.dialog); - document_new_file_if_non_open(); - ui_focus_current_document(); + while (gtk_dialog_run(GTK_DIALOG(e->dialog)) == GTK_RESPONSE_OK); + // any open docs were meant to be moved into the project + // rewrite default session because it was cleared + if (have_session_docs()) + configuration_save_default_session(); + else + { + // reload any documents that were closed + configuration_reload_default_session(); + configuration_open_files(); + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany] ad5a68: Make Open Project dialog cancellable without closing existing session

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sun, 29 Sep 2019 16:26:43 UTC Commit: ad5a684c32e2474d00846e4a3edf0c5b8e2a1d47 https://github.com/geany/geany/commit/ad5a684c32e2474d00846e4a3edf0c5b8e2a1… Log Message: ----------- Make Open Project dialog cancellable without closing existing session Modified Paths: -------------- src/project.c Modified: src/project.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -286,8 +286,9 @@ static void run_open_dialog(GtkDialog *dialog) { gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + if (app->project && !project_close(FALSE)) {} /* try to load the config */ - if (! project_load_file_with_session(filename)) + else if (! project_load_file_with_session(filename)) { gchar *utf8_filename = utils_get_utf8_from_locale(filename); @@ -307,16 +308,15 @@ void project_open(void) { const gchar *dir = local_prefs.project_file_path; - if (! project_ask_close()) return; - #ifdef G_OS_WIN32 if (interface_prefs.use_native_windows_dialogs) { gchar *file = win32_show_project_open_dialog(main_widgets.window, _("Open Project"), dir, FALSE, TRUE); if (file != NULL) { + if (app->project && !project_close(FALSE)) {} /* try to load the config */ - if (! project_load_file_with_session(file)) + else if (! project_load_file_with_session(file)) { SHOW_ERR1(_("Project file \"%s\" could not be loaded."), file); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

[geany/geany] f40569: Opening recent projects: Don't ask whether to close current project

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sun, 29 Sep 2019 16:26:43 UTC Commit: f40569d1c327af162726dbab14a78fd83ca5e0b8 https://github.com/geany/geany/commit/f40569d1c327af162726dbab14a78fd83ca5e… Log Message: ----------- Opening recent projects: Don't ask whether to close current project Unlikely to be done accidentally. Modified Paths: -------------- src/ui_utils.c Modified: src/ui_utils.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1191,7 +1191,8 @@ static void recent_project_activate_cb(GtkMenuItem *menuitem, G_GNUC_UNUSED gpoi gchar *utf8_filename = ui_menu_item_get_text(menuitem); gchar *locale_filename = utils_get_locale_from_utf8(utf8_filename); - if (project_ask_close() && project_load_file_with_session(locale_filename)) + if (app->project && !project_close(FALSE)) {} + else if (project_load_file_with_session(locale_filename)) recent_file_loaded(utf8_filename, recent_get_recent_projects()); g_free(locale_filename); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

4 years, 2 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2019