Commits June 2016

commits@lists.geany.org

1 participants
104 discussions

[geany/geany-osx] e74e03: Sign installation image
by Jiří Techet 23 Jun '16

23 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 23 Jun 2016 18:39:19 UTC Commit: e74e0325972b68bd660c2be196ad274e6c8dc8b0 https://github.com/geany/geany-osx/commit/e74e0325972b68bd660c2be196ad274e6… Log Message: ----------- Sign installation image This is needed for macOS 10.12 so resource path randomization doesn't happen when launched outside /Application. Modified Paths: -------------- README.md create_dmg.sh Modified: README.md 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -193,7 +193,8 @@ Distribution ./create_dmg.sh ``` - from within the geany-osx directory. + from within the geany-osx directory. If the APPLICATION_CERT variable is + defined, the image gets signed by the specified certificate. Maintenance ----------- Modified: create_dmg.sh 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -26,3 +26,8 @@ create-dmg \ "$TMPDIR" rm -rf "${TMPDIR}" + +if [ -n "$APPLICATION_CERT" ] +then + codesign -s "$APPLICATION_CERT" "$DMGNAME" +fi -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c5f950: Merge pull request #1071 from erikd/master
by Colomban Wendling 23 Jun '16

23 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 23 Jun 2016 18:02:45 UTC Commit: c5f9507207b1610609bcea1ad9e71f40efabb7fc https://github.com/geany/geany/commit/c5f9507207b1610609bcea1ad9e71f40efabb… Log Message: ----------- Merge pull request #1071 from erikd/master geany.desktop.in: Add Keywords field entry Modified Paths: -------------- geany.desktop.in Modified: geany.desktop.in 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -10,3 +10,4 @@ Terminal=false Categories=GTK;Development;IDE; MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff; StartupNotify=true +_Keywords=Text;Editor; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 586e64: Merge pull request #527 from techee/eol_undo
by Colomban Wendling 23 Jun '16

23 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 23 Jun 2016 17:38:25 UTC Commit: 586e64b842b2a77958bafd8f8b443b2436997c49 https://github.com/geany/geany/commit/586e64b842b2a77958bafd8f8b443b2436997… Log Message: ----------- Merge pull request #527 from techee/eol_undo Fix undo of line end type change Modified Paths: -------------- src/callbacks.c src/document.c src/documentprivate.h Modified: src/callbacks.c 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -487,8 +487,15 @@ static void convert_eol(gint mode) g_return_if_fail(doc != NULL); + /* sci_convert_eols() adds UNDO_SCINTILLA action in on_editor_notify(). + * It is added to the undo stack before sci_convert_eols() finishes + * so after adding UNDO_EOL, UNDO_EOL will be at the top of the stack + * and UNDO_SCINTILLA below it. */ sci_convert_eols(doc->editor->sci, mode); + document_undo_add(doc, UNDO_EOL, GINT_TO_POINTER(sci_get_eol_mode(doc->editor->sci))); + sci_set_eol_mode(doc->editor->sci, mode); + ui_update_statusbar(doc, -1); } Modified: src/document.c 50 lines changed, 42 insertions(+), 8 deletions(-) =================================================================== @@ -3036,12 +3036,29 @@ void document_undo(GeanyDocument *doc) document_redo_add(doc, UNDO_ENCODING, g_strdup(doc->encoding)); document_set_encoding(doc, (const gchar*)action->data); + g_free(action->data); - ignore_callback = TRUE; - encodings_select_radio_item((const gchar*)action->data); - ignore_callback = FALSE; + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + break; + } + case UNDO_EOL: + { + undo_action *next_action; - g_free(action->data); + document_redo_add(doc, UNDO_EOL, GINT_TO_POINTER(sci_get_eol_mode(doc->editor->sci))); + + sci_set_eol_mode(doc->editor->sci, GPOINTER_TO_INT(action->data)); + + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + + /* When undoing, UNDO_EOL is always followed by UNDO_SCINTILLA + * which undos the line endings in the editor and should be + * performed together with UNDO_EOL. */ + next_action = g_trash_stack_peek(&doc->priv->undo_actions); + if (next_action && next_action->type == UNDO_SCINTILLA) + document_undo(doc); break; } case UNDO_RELOAD: @@ -3108,9 +3125,18 @@ void document_redo(GeanyDocument *doc) { case UNDO_SCINTILLA: { + undo_action *next_action; + document_undo_add_internal(doc, UNDO_SCINTILLA, NULL); sci_redo(doc->editor->sci); + + /* When redoing an EOL change, the UNDO_SCINTILLA which changes + * the line ends in the editor is followed by UNDO_EOL + * which should be performed together with UNDO_SCINTILLA. */ + next_action = g_trash_stack_peek(&doc->priv->redo_actions); + if (next_action != NULL && next_action->type == UNDO_EOL) + document_redo(doc); break; } case UNDO_BOM: @@ -3127,12 +3153,20 @@ void document_redo(GeanyDocument *doc) document_undo_add_internal(doc, UNDO_ENCODING, g_strdup(doc->encoding)); document_set_encoding(doc, (const gchar*)action->data); + g_free(action->data); - ignore_callback = TRUE; - encodings_select_radio_item((const gchar*)action->data); - ignore_callback = FALSE; + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + break; + } + case UNDO_EOL: + { + document_undo_add_internal(doc, UNDO_EOL, GINT_TO_POINTER(sci_get_eol_mode(doc->editor->sci))); - g_free(action->data); + sci_set_eol_mode(doc->editor->sci, GPOINTER_TO_INT(action->data)); + + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); break; } case UNDO_RELOAD: Modified: src/documentprivate.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -35,6 +35,7 @@ enum UNDO_ENCODING, UNDO_BOM, UNDO_RELOAD, + UNDO_EOL, UNDO_ACTIONS_MAX }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 775902: Update name of the most innovative operating system
by Jiří Techet 23 Jun '16

23 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 23 Jun 2016 16:53:49 UTC Commit: 77590232cde2cc225e058a64ca98ff815ab4d633 https://github.com/geany/geany-osx/commit/77590232cde2cc225e058a64ca98ff815… Log Message: ----------- Update name of the most innovative operating system Plus some minor updates. Modified Paths: -------------- README.md Modified: README.md 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -1,12 +1,12 @@ -Geany OS X -========== -Geany OS X is a project that contains all the necessary configuration +Geany for macOS +=============== +Geany for macOS is a project that contains all the necessary configuration files, themes, scripts and instructions to create the Geany app bundle and -a dmg installer image for OS X. +a dmg installer image for macOS. Binaries -------- -The OS X binaries can be downloaded from the Geany Releases page: +The macOS binaries can be downloaded from the Geany Releases page: <http://www.geany.org/Download/Releases> @@ -21,20 +21,20 @@ A brief description of the contents of the project directory: * *iconbuilder.iconset*: contains source icons for the Geany.icns file. Not needed for normal build, present just in case the icns file needs to be recreated for some reason. -* *patches*: patches fixing VTE under OS X and enabling VTE bundling. +* *patches*: patches fixing VTE under macOS and enabling VTE bundling. ### Configuration files * *geany.modules*: JHBuild modules file with Geany dependencies. * *geany.bundle*: configuration file describing the contents of the app bundle. -* *Info.plist*: OS X application configuration file containing some basic +* *Info.plist*: macOS application configuration file containing some basic information such as application name, version, etc. but also additional configuration including file types the application can open. * *gtkrc.theme, close.png*: GTK theme based on the Greybird theme and - modified to match the OS X Yosemite theme better. + modified to match the macOS theme better. * *gtkrc*: GTK configuration file including the theme file and changing some Geany gtkrc settings. -* *Geany.icns*: OS X Geany icon file. +* *Geany.icns*: macOS Geany icon file. ### Scripts * *launcher.sh*: launcher script from the gtk-mac-bundler project setting @@ -49,7 +49,7 @@ A brief description of the contents of the project directory: General Instructions -------------------- -For more general instructions about building and bundling OS X applications +For more general instructions about building and bundling macOS applications please visit <https://wiki.gnome.org/Projects/GTK%2B/OSX/> @@ -59,8 +59,8 @@ building and bundling Geany. Prerequisities -------------- -* OS X 10.7 or later (tested with OS X 10.10) -* Xcode and command-line tools (tested with Xcode 6.1.1) +* OS X 10.7 or later +* Xcode and command-line tools JHBuild Installation -------------------- @@ -97,7 +97,7 @@ To create the bundle, you need to first install JHBuild and GTK as described bel Instead of meta-gtk-osx-core (GTK 2) you can also use `meta-gtk-osx-gtk3` to install GTK 3. Note that both GTK 2 and GTK 3 cannot be installed at the - same time. Also note that there seem to be various problems with the OS X + same time. Also note that there seem to be various problems with the macOS support in GTK 3; for this reason I have not spent more time with the GTK 3 backend so there is no GTK3-specific theme or bundling support at this moment. @@ -220,4 +220,4 @@ have to be performed during normal bundle/installer creation: --- -Jiri Techet, 2015 +Jiri Techet, 2016 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d097e8: Make UNDO_ENCODING updates similar to other updates
by Jiří Techet 23 Jun '16

23 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 23 Jun 2016 16:15:21 UTC Commit: d097e8cd05c5af53dedf340f421adc066af25a38 https://github.com/geany/geany/commit/d097e8cd05c5af53dedf340f421adc066af25… Log Message: ----------- Make UNDO_ENCODING updates similar to other updates Simply call ui_update_statusbar() and ui_document_show_hide() like in other undo actions. Modified Paths: -------------- src/document.c Modified: src/document.c 16 lines changed, 6 insertions(+), 10 deletions(-) =================================================================== @@ -2945,12 +2945,10 @@ void document_undo(GeanyDocument *doc) document_redo_add(doc, UNDO_ENCODING, g_strdup(doc->encoding)); document_set_encoding(doc, (const gchar*)action->data); - - ignore_callback = TRUE; - encodings_select_radio_item((const gchar*)action->data); - ignore_callback = FALSE; - g_free(action->data); + + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); break; } case UNDO_EOL: @@ -3064,12 +3062,10 @@ void document_redo(GeanyDocument *doc) document_undo_add_internal(doc, UNDO_ENCODING, g_strdup(doc->encoding)); document_set_encoding(doc, (const gchar*)action->data); - - ignore_callback = TRUE; - encodings_select_radio_item((const gchar*)action->data); - ignore_callback = FALSE; - g_free(action->data); + + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); break; } case UNDO_EOL: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6a3a53: Fix undo of line end type change
by Jiří Techet 23 Jun '16

23 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 23 Jun 2016 16:10:50 UTC Commit: 6a3a53f421a6868ca041352ac04c91e67886b458 https://github.com/geany/geany/commit/6a3a53f421a6868ca041352ac04c91e67886b… Log Message: ----------- Fix undo of line end type change At the moment undo of line end type change only undos the changes made in the document but the different line ending settings remains active. This patch fixes the issue by combining the line end scintilla undo action with a new UNDO_EOL action responsible for updating the line ending settings. Fixes #409 Modified Paths: -------------- src/callbacks.c src/document.c src/documentprivate.h Modified: src/callbacks.c 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -497,8 +497,15 @@ static void convert_eol(gint mode) g_return_if_fail(doc != NULL); + /* sci_convert_eols() adds UNDO_SCINTILLA action in on_editor_notify(). + * It is added to the undo stack before sci_convert_eols() finishes + * so after adding UNDO_EOL, UNDO_EOL will be at the top of the stack + * and UNDO_SCINTILLA below it. */ sci_convert_eols(doc->editor->sci, mode); + document_undo_add(doc, UNDO_EOL, GINT_TO_POINTER(sci_get_eol_mode(doc->editor->sci))); + sci_set_eol_mode(doc->editor->sci, mode); + ui_update_statusbar(doc, -1); } Modified: src/document.c 38 lines changed, 38 insertions(+), 0 deletions(-) =================================================================== @@ -2953,6 +2953,25 @@ void document_undo(GeanyDocument *doc) g_free(action->data); break; } + case UNDO_EOL: + { + undo_action *next_action; + + document_redo_add(doc, UNDO_EOL, GINT_TO_POINTER(sci_get_eol_mode(doc->editor->sci))); + + sci_set_eol_mode(doc->editor->sci, GPOINTER_TO_INT(action->data)); + + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + + /* When undoing, UNDO_EOL is always followed by UNDO_SCINTILLA + * which undos the line endings in the editor and should be + * performed together with UNDO_EOL. */ + next_action = g_trash_stack_peek(&doc->priv->undo_actions); + if (next_action && next_action->type == UNDO_SCINTILLA) + document_undo(doc); + break; + } case UNDO_RELOAD: { UndoReloadData *data = (UndoReloadData*)action->data; @@ -3017,9 +3036,18 @@ void document_redo(GeanyDocument *doc) { case UNDO_SCINTILLA: { + undo_action *next_action; + document_undo_add_internal(doc, UNDO_SCINTILLA, NULL); sci_redo(doc->editor->sci); + + /* When redoing an EOL change, the UNDO_SCINTILLA which changes + * the line ends in the editor is followed by UNDO_EOL + * which should be performed together with UNDO_SCINTILLA. */ + next_action = g_trash_stack_peek(&doc->priv->redo_actions); + if (next_action != NULL && next_action->type == UNDO_EOL) + document_redo(doc); break; } case UNDO_BOM: @@ -3044,6 +3072,16 @@ void document_redo(GeanyDocument *doc) g_free(action->data); break; } + case UNDO_EOL: + { + document_undo_add_internal(doc, UNDO_EOL, GINT_TO_POINTER(sci_get_eol_mode(doc->editor->sci))); + + sci_set_eol_mode(doc->editor->sci, GPOINTER_TO_INT(action->data)); + + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + break; + } case UNDO_RELOAD: { UndoReloadData *data = (UndoReloadData*)action->data; Modified: src/documentprivate.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -35,6 +35,7 @@ enum UNDO_ENCODING, UNDO_BOM, UNDO_RELOAD, + UNDO_EOL, UNDO_ACTIONS_MAX }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c6f1fa: plugin api: export scnotification_get_type
by Thomas Martitz 22 Jun '16

22 Jun '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 22 Jun 2016 14:18:35 UTC Commit: c6f1fadf0bd1517ae426f71fc702e691f1050f21 https://github.com/geany/geany/commit/c6f1fadf0bd1517ae426f71fc702e691f1050… Log Message: ----------- plugin api: export scnotification_get_type Updated scintilla_changes.patch accordingly Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx scintilla/scintilla_changes.patch Modified: scintilla/gtk/ScintillaGTK.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -3250,6 +3250,7 @@ void scintilla_release_resources(void) { static void *copy_(void *src) { return src; } static void free_(void *doc) { } +GEANY_API_SYMBOL GType scnotification_get_type(void) { static gsize type_id = 0; if (g_once_init_enter(&type_id)) { Modified: scintilla/scintilla_changes.patch 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -50,6 +50,14 @@ index 0871ca2..49dc278 100644 GtkWidget *scintilla_object_new() { return scintilla_new(); } +@@ -3250,6 +3250,7 @@ void scintilla_release_resources(void) { + static void *copy_(void *src) { return src; } + static void free_(void *doc) { } + ++GEANY_API_SYMBOL + GType scnotification_get_type(void) { + static gsize type_id = 0; + if (g_once_init_enter(&type_id)) { diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx index ed47aa8..e58f1ab 100644 --- scintilla/src/Catalogue.cxx -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2acba3: plugin api: export geanyobject
by Thomas Martitz 22 Jun '16

22 Jun '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 22 Jun 2016 14:10:32 UTC Commit: 2acba3dc3193176f447a06d4ac03c561da1ad978 https://github.com/geany/geany/commit/2acba3dc3193176f447a06d4ac03c561da1ad… Log Message: ----------- plugin api: export geanyobject geanyobject can be used by plugins to connect to plugin signals directly (required for GI-based plugins). Access through GeanyData::object. The related doxygen comments are @gironly for now, since plugin_signal_connect() is still preferred. Finally, the useless function pointer prototypes are removed from the GeanyObjectClass structure as they became useless (they have been unused and generally wrong since ever). Modified Paths: -------------- src/geanyobject.c src/geanyobject.h src/plugindata.h src/plugins.c Modified: src/geanyobject.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -52,6 +52,12 @@ struct _GeanyObjectPrivate gchar dummy; }; +/** @gironly + * Get the GObject-derived GType for GeanyObject + * + * @return GeanyObject type */ +GEANY_API_SYMBOL +GType geany_object_get_type(void); G_DEFINE_TYPE(GeanyObject, geany_object, G_TYPE_OBJECT) Modified: src/geanyobject.h 25 lines changed, 4 insertions(+), 21 deletions(-) =================================================================== @@ -74,6 +74,8 @@ GeanyCallbackId; typedef struct _GeanyObject GeanyObject; typedef struct _GeanyObjectClass GeanyObjectClass; +/** @gironly + * Instance structure for GeanyObject */ struct _GeanyObject { GObject parent; @@ -82,30 +84,11 @@ struct _GeanyObject extern GObject *geany_object; +/** @gironly + * Class structure for @a GeanyObject */ struct _GeanyObjectClass { GObjectClass parent_class; - - void (*document_new)(GeanyDocument *doc); - void (*document_open)(GeanyDocument *doc); - void (*document_reload)(GeanyDocument *doc); - void (*document_before_save)(GeanyDocument *doc); - void (*document_save)(GeanyDocument *doc); - void (*document_filetype_set)(GeanyDocument *doc, GeanyFiletype *filetype_old); - void (*document_activate)(GeanyDocument *doc); - void (*document_close)(GeanyDocument *doc); - void (*project_open)(GKeyFile *keyfile); - void (*project_save)(GKeyFile *keyfile); - void (*project_close)(void); - void (*project_dialog_open)(GtkWidget *notebook); - void (*project_dialog_confirmed)(GtkWidget *notebook); - void (*project_dialog_close)(GtkWidget *notebook); - void (*update_editor_menu)(const gchar *word, gint click_pos, GeanyDocument *doc); - gboolean (*editor_notify)(GeanyEditor *editor, gpointer scnt); - void (*geany_startup_complete)(void); - void (*build_start)(void); - void (*save_settings)(GKeyFile *keyfile); - void (*load_settings)(GKeyFile *keyfile); }; GType geany_object_get_type (void); Modified: src/plugindata.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -183,6 +183,12 @@ typedef struct GeanyData struct GeanyTemplatePrefs *template_prefs; /**< Template settings */ gpointer *_compat; /* Remove field on next ABI break (abi-todo) */ GSList *filetypes_by_title; /**< See filetypes.h#filetypes_by_title. */ + /** @gironly + * Global object signalling events via signals + * + * This is mostly for language bindings. Otherwise prefer to use + * plugin_signal_connect() instead this which adds automatic cleanup. */ + GObject *object; } GeanyData; Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -120,7 +120,8 @@ geany_data_init(void) &tool_prefs, &template_prefs, NULL, /* Remove field on next ABI break (abi-todo) */ - filetypes_by_title + filetypes_by_title, + geany_object, }; geany_data = gd; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] be64b1: plugin api: convert GeanyEditor to GBoxed internally
by Thomas Martitz 22 Jun '16

22 Jun '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 22 Jun 2016 14:10:31 UTC Commit: be64b177ca0308ba1fa4b8a14d6b22bd2326e6ef https://github.com/geany/geany/commit/be64b177ca0308ba1fa4b8a14d6b22bd2326e… Log Message: ----------- plugin api: convert GeanyEditor to GBoxed internally GeanyObject signals require GTypes to be gobject-introspection compatible. Modified Paths: -------------- src/editor.c src/editor.h Modified: src/editor.c 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -5309,3 +5309,15 @@ void editor_insert_snippet(GeanyEditor *editor, gint pos, const gchar *snippet) editor_insert_text_block(editor, pattern->str, pos, -1, -1, TRUE); g_string_free(pattern, TRUE); } + +static void *copy_(void *src) { return src; } +static void free_(void *doc) { } + +/** @gironly + * Gets the GType of GeanyEditor + * + * @return the GeanyEditor type */ +GEANY_API_SYMBOL +GType editor_get_type (void); + +G_DEFINE_BOXED_TYPE(GeanyEditor, editor, copy_, free_); Modified: src/editor.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -139,6 +139,10 @@ typedef struct GeanyEditorPrefs } GeanyEditorPrefs; + +#define GEANY_TYPE_EDITOR (editor_get_type()) +GType editor_get_type (void); + /** Editor-owned fields for each document. */ typedef struct GeanyEditor { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7702a4: plugin api: convert GeanyFiletype to GBoxed internally
by Thomas Martitz 22 Jun '16

22 Jun '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 22 Jun 2016 14:10:11 UTC Commit: 7702a4639b5ce711ce1560bb14d4c94cf5e5de28 https://github.com/geany/geany/commit/7702a4639b5ce711ce1560bb14d4c94cf5e5d… Log Message: ----------- plugin api: convert GeanyFiletype to GBoxed internally GeanyObject signals require GTypes to be gobject-introspection compatible. Modified Paths: -------------- src/filetypes.c src/filetypes.h Modified: src/filetypes.c 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -1585,3 +1585,15 @@ gboolean filetype_get_comment_open_close(const GeanyFiletype *ft, gboolean singl return !EMPTY(*co); } + +static void *copy_(void *src) { return src; } +static void free_(void *doc) { } + +/** @gironly + * Gets the GType of GeanyFiletype + * + * @return the GeanyFiletype type */ +GEANY_API_SYMBOL +GType filetype_get_type (void); + +G_DEFINE_BOXED_TYPE(GeanyFiletype, filetype, copy_, free_); Modified: src/filetypes.h 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -186,6 +186,9 @@ const gchar *filetypes_get_display_name(GeanyFiletype *ft); const GSList *filetypes_get_sorted_by_name(void); +#define GEANY_TYPE_FILETYPE (filetype_get_type()) + +GType filetype_get_type (void); #ifdef GEANY_PRIVATE -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2016