Commits February 2012

commits@lists.geany.org

1 participants
36 discussions

[geany/geany] c348cc: Include build.h in headers installed for plugin use
by Lex Trotman 16 Feb '12

16 Feb '12

Branch: refs/heads/master Author: Lex Trotman <elextr(a)gmail.com> Committer: Lex Trotman <elextr(a)gmail.com> Date: Thu, 16 Feb 2012 22:02:34 Commit: c348ccae5841014a841f3649f194e9dd35691985 https://github.com/geany/geany/commit/c348ccae5841014a841f3649f194e9dd35691… Log Message: ----------- Include build.h in headers installed for plugin use Modified Paths: -------------- wscript Modified: wscript 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -395,7 +395,7 @@ def build(bld): src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h src/prefs.h src/project.h src/search.h src/stash.h src/support.h - src/templates.h src/toolbar.h src/ui_utils.h src/utils.h + src/templates.h src/toolbar.h src/ui_utils.h src/utils.h src/build.h plugins/geanyplugin.h plugins/geanyfunctions.h''') bld.install_files('${PREFIX}/include/geany/scintilla', ''' scintilla/include/SciLexer.h scintilla/include/Scintilla.h -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 510bbf: Add .mm extension for Objective-C filetype
by Matthew Brush 16 Feb '12

16 Feb '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 16 Feb 2012 01:05:25 Commit: 510bbfbb05bcec2e08bc2178fb05b142f3dd45bb https://github.com/geany/geany/commit/510bbfbb05bcec2e08bc2178fb05b142f3dd4… Log Message: ----------- Add .mm extension for Objective-C filetype Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,7 @@ Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; Markdown=*.mdml;*.markdown;*.md;*.mkd; Matlab/Octave=*.m; NSIS=*.nsi;*.nsh; -Objective-C=*.m;*.h; +Objective-C=*.m;*.mm;*.h; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] fa118f: Add build command access to plugin interface
by Lex Trotman 15 Feb '12

15 Feb '12

Branch: refs/heads/master Author: Lex Trotman <elextr(a)gmail.com> Committer: Lex Trotman <elextr(a)gmail.com> Date: Wed, 15 Feb 2012 03:18:34 Commit: fa118fb12a0a2a98c6d80939d489cc57c5dcf23b https://github.com/geany/geany/commit/fa118fb12a0a2a98c6d80939d489cc57c5dcf… Log Message: ----------- Add build command access to plugin interface Add ability for plugins to read and edit the fields of the build commands. Modified Paths: -------------- plugins/geanyfunctions.h src/build.c src/build.h src/plugindata.h src/plugins.c Modified: plugins/geanyfunctions.h 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -420,5 +420,15 @@ geany_functions->p_stash->stash_group_update #define symbols_get_context_separator \ geany_functions->p_symbols->symbols_get_context_separator +#define build_activate_menu_item \ + geany_functions->p_build->build_activate_menu_item +#define build_get_current_menu_item \ + geany_functions->p_build->build_get_current_menu_item +#define build_remove_menu_item \ + geany_functions->p_build->build_remove_menu_item +#define build_set_menu_item \ + geany_functions->p_build->build_set_menu_item +#define build_get_group_count \ + geany_functions->p_build->build_get_group_count #endif Modified: src/build.c 162 files changed, 130 insertions(+), 32 deletions(-) =================================================================== @@ -132,7 +132,7 @@ static void show_build_result_message(gboolean failure); static void process_build_output_line(const gchar *line, gint color); static void show_build_commands_dialog(void); - +static void on_build_menu_item(GtkWidget *w, gpointer user_data); void build_finalize(void) { @@ -422,8 +422,7 @@ static void printfcmds(void) } -/* get pointer to the command group array */ -static GeanyBuildCommand *get_build_group(GeanyBuildSource src, GeanyBuildGroup grp) +static GeanyBuildCommand **get_build_group_pointer(const GeanyBuildSource src, const GeanyBuildGroup grp) { GeanyDocument *doc; GeanyFiletype *ft = NULL; @@ -435,23 +434,22 @@ static void printfcmds(void) return NULL; if ((ft = doc->file_type) == NULL) return NULL; - switch (src) { - case GEANY_BCS_DEF: return ft->ftdefcmds; - case GEANY_BCS_FT: return ft->filecmds; - case GEANY_BCS_HOME_FT: return ft->homefilecmds; - case GEANY_BCS_PREF: return ft->homefilecmds; - case GEANY_BCS_PROJ: return ft->projfilecmds; + case GEANY_BCS_DEF: return &(ft->ftdefcmds); + case GEANY_BCS_FT: return &(ft->filecmds); + case GEANY_BCS_HOME_FT: return &(ft->homefilecmds); + case GEANY_BCS_PREF: return &(ft->homefilecmds); + case GEANY_BCS_PROJ: return &(ft->projfilecmds); default: return NULL; } break; case GEANY_GBG_NON_FT: switch (src) { - case GEANY_BCS_DEF: return non_ft_def; - case GEANY_BCS_PREF: return non_ft_pref; - case GEANY_BCS_PROJ: return non_ft_proj; + case GEANY_BCS_DEF: return &(non_ft_def); + case GEANY_BCS_PREF: return &(non_ft_pref); + case GEANY_BCS_PROJ: return &(non_ft_proj); default: return NULL; } break; @@ -460,12 +458,12 @@ static void printfcmds(void) ft = doc->file_type; switch (src) { - case GEANY_BCS_DEF: return exec_def; - case GEANY_BCS_FT: return ft ? ft->execcmds: NULL; - case GEANY_BCS_HOME_FT: return ft ? ft->homeexeccmds: NULL; - case GEANY_BCS_PROJ_FT: return ft ? ft->projexeccmds: NULL; - case GEANY_BCS_PREF: return exec_pref; - case GEANY_BCS_PROJ: return exec_proj; + case GEANY_BCS_DEF: return &(exec_def); + case GEANY_BCS_FT: return ft ? &(ft->execcmds): NULL; + case GEANY_BCS_HOME_FT: return ft ? &(ft->homeexeccmds): NULL; + case GEANY_BCS_PROJ_FT: return ft ? &(ft->projexeccmds): NULL; + case GEANY_BCS_PREF: return &(exec_pref); + case GEANY_BCS_PROJ: return &(exec_proj); default: return NULL; } break; @@ -475,7 +473,16 @@ static void printfcmds(void) } -/* * Remove the specified Build menu item. +/* get pointer to the command group array */ +static GeanyBuildCommand *get_build_group(const GeanyBuildSource src, const GeanyBuildGroup grp) +{ + GeanyBuildCommand **g = get_build_group_pointer(src, grp); + if (g == NULL) return NULL; + return *g; +}; + + +/** Remove the specified Build menu item. * * Makes the specified menu item configuration no longer exist. This * is different to setting fields to blank because the menu item @@ -490,9 +497,10 @@ static void printfcmds(void) * * If any parameter is out of range does nothing. * - * @see build_menu_update + * Updates the menu. + * **/ -void build_remove_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd) +void build_remove_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, const gint cmd) { GeanyBuildCommand *bc; guint i; @@ -539,30 +547,109 @@ void build_remove_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd) } -/* * Get the @a GeanyBuildCommand structure for the menu item. +/** Get the string for the menu item field. * * Get the current highest priority command specified by @a grp and @a cmd. This is the one * that the menu item will use if activated. * * @param grp the group of the specified menu item. * @param cmd the index of the command within the group. - * @param src pointer to @a gint to return which source provided the command. Ignored if @a NULL. - * Values are one of @a GeanyBuildSource but returns a signed type not the enum. + * @param fld the field to return * - * @return a pointer to the @a GeanyBuildCommand structure or @a NULL if it doesn't exist. + * @return a pointer to the constant string or @a NULL if it doesn't exist. * This is a pointer to an internal structure and must not be freed. * - * @see build_menu_update **/ -/* parameter checked version of get_build_cmd for external interface */ -GeanyBuildCommand *build_get_current_menu_item(GeanyBuildGroup grp, guint cmd, guint *src) +const gchar *build_get_current_menu_item(const GeanyBuildGroup grp, const guint cmd, + const GeanyBuildCmdEntries fld) { - g_return_val_if_fail(*src < GEANY_BCS_COUNT, NULL); + GeanyBuildCommand *c; + gchar *str = NULL; + g_return_val_if_fail(grp < GEANY_GBG_COUNT, NULL); + g_return_val_if_fail(fld < GEANY_BC_CMDENTRIES_COUNT, NULL); g_return_val_if_fail(cmd < build_groups_count[grp], NULL); - return get_build_cmd(NULL, grp, cmd, src); -} + c = get_build_cmd(NULL, grp, cmd, NULL); + if (c == NULL) return NULL; + switch (fld) + { + case GEANY_BC_COMMAND: + str = c->command; + break; + case GEANY_BC_LABEL: + str = c->label; + break; + case GEANY_BC_WORKING_DIR: + str = c->working_dir; + break; + default: + break; + } + return str; +}; + +/** Set the string for the menu item field. + * + * Set the specified field of the command specified by @a src, @a grp and @a cmd. + * + * @param src the source of the menu item + * @param grp the group of the specified menu item. + * @param cmd the index of the menu item within the group. + * @param fld the field in the menu item command to set + * @param val the value to set the field to, is copied + * + **/ + +void build_set_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, + const guint cmd, const GeanyBuildCmdEntries fld, const gchar *val) +{ + GeanyBuildCommand **g; + + g_return_if_fail(src < GEANY_BCS_COUNT); + g_return_if_fail(grp < GEANY_GBG_COUNT); + g_return_if_fail(fld < GEANY_BC_CMDENTRIES_COUNT); + g_return_if_fail(cmd < build_groups_count[grp]); + + g = get_build_group_pointer(src, grp); + if (g == NULL) return; + if (*g == NULL ) + { + *g = g_new0(GeanyBuildCommand, build_groups_count[grp]); + } + switch (fld) + { + case GEANY_BC_COMMAND: + SETPTR((*g)[cmd].command, g_strdup(val)); + (*g)[cmd].exists = TRUE; + break; + case GEANY_BC_LABEL: + SETPTR((*g)[cmd].label, g_strdup(val)); + (*g)[cmd].exists = TRUE; + break; + case GEANY_BC_WORKING_DIR: + SETPTR((*g)[cmd].working_dir, g_strdup(val)); + (*g)[cmd].exists = TRUE; + break; + default: + break; + } + build_menu_update(NULL); +}; + +/** Set the string for the menu item field. + * + * Set the specified field of the command specified by @a src, @a grp and @a cmd. + * + * @param grp the group of the specified menu item. + * @param cmd the index of the command within the group. + * + **/ + +void build_activate_menu_item(const GeanyBuildGroup grp, const guint cmd) +{ + on_build_menu_item(NULL, GRP_CMD_TO_POINTER(grp, cmd)); +}; /* Clear all error indicators in all documents. */ @@ -2688,8 +2775,19 @@ void build_set_group_count(GeanyBuildGroup grp, gint count) } -guint build_get_group_count(GeanyBuildGroup grp) +/** Get the count of commands for the group + * + * Get the number of commands in the group specified by @a grp. + * + * @param grp the group of the specified menu item. + * + * @return a count of the number of commands in the group + * + **/ + +guint build_get_group_count(const GeanyBuildGroup grp) { + g_return_val_if_fail(grp < GEANY_GBG_COUNT, 0); return build_groups_count[grp]; } Modified: src/build.h 22 files changed, 14 insertions(+), 8 deletions(-) =================================================================== @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* * @file build.h Interface to the Build menu functionality. */ +/** @file build.h Interface to the Build menu functionality. */ #ifndef GEANY_BUILD_H #define GEANY_BUILD_H 1 @@ -40,7 +40,7 @@ GEANY_GBO_COUNT /* *< count of how many */ } GeanyBuildType; -/* * Groups of Build menu items. */ +/** Groups of Build menu items. */ typedef enum { GEANY_GBG_FT, /* *< filetype items */ @@ -92,7 +92,7 @@ enum GeanyBuildFixedMenuItems GBF_COUNT }; -/* * Build menu item sources in increasing priority */ +/** Build menu item sources in increasing priority */ typedef enum { GEANY_BCS_DEF, /* *< Default values. */ @@ -117,7 +117,7 @@ enum GeanyBuildFixedMenuItems extern GeanyBuildInfo build_info; -/* * The entries of a command for a menu item */ +/** The entries of a command for a menu item */ typedef enum GeanyBuildCmdEntries { GEANY_BC_LABEL, /* *< The menu item label, _ marks mnemonic */ @@ -177,11 +177,17 @@ enum GeanyBuildFixedMenuItems void build_toolbutton_build_clicked(GtkAction *action, gpointer user_data); -void build_remove_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd); +void build_remove_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, const gint cmd); -GeanyBuildCommand *build_get_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, guint cmd); +GeanyBuildCommand *build_get_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, const guint cmd); -GeanyBuildCommand *build_get_current_menu_item(GeanyBuildGroup grp, guint cmd, guint *src); +const gchar *build_get_current_menu_item(const GeanyBuildGroup grp, const guint cmd, + const GeanyBuildCmdEntries field); + +void build_set_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, + const guint cmd, const GeanyBuildCmdEntries field, const gchar *value); + +void build_activate_menu_item(const GeanyBuildGroup grp, const guint cmd); BuildMenuItems *build_get_menu_items(gint filetype_idx); @@ -192,7 +198,7 @@ enum GeanyBuildFixedMenuItems void build_set_group_count(GeanyBuildGroup grp, gint count); -guint build_get_group_count(GeanyBuildGroup grp); +guint build_get_group_count(const GeanyBuildGroup grp); gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, guint *from); Modified: src/plugindata.h 25 files changed, 20 insertions(+), 5 deletions(-) =================================================================== @@ -39,6 +39,7 @@ #define GEANY(symbol_name) geany->symbol_name #include "editor.h" /* GeanyIndentType */ +#include "build.h" /* GeanyBuildGroup, GeanyBuildSource, GeanyBuildCmdEntries enums */ /** The Application Programming Interface (API) version, incremented @@ -52,7 +53,7 @@ * @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 212 +#define GEANY_API_VERSION 213 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ -266,14 +267,15 @@ struct SearchFuncs *p_search; /**< See search.h */ struct HighlightingFuncs *p_highlighting; /**< See highlighting.h */ struct FiletypeFuncs *p_filetypes; /**< See filetypes.h */ - struct NavQueueFuncs *p_navqueue; /**< See navqueue.h */ - struct EditorFuncs *p_editor; /**< See editor.h */ - struct MainFuncs *p_main; /**< See main.h */ - struct PluginFuncs *p_plugin; /**< See pluginutils.c */ + struct NavQueueFuncs *p_navqueue; /**< See navqueue.h */ + struct EditorFuncs *p_editor; /**< See editor.h */ + struct MainFuncs *p_main; /**< See main.h */ + struct PluginFuncs *p_plugin; /**< See pluginutils.c */ struct ScintillaFuncs *p_scintilla; /**< See ScintillaFuncs */ struct MsgWinFuncs *p_msgwin; /**< See msgwindow.h */ struct StashFuncs *p_stash; /**< See stash.h */ struct SymbolsFuncs *p_symbols; /**< See symbols.h */ + struct BuildFuncs *p_build; /**< See build.h */ } GeanyFunctions; @@ -708,6 +710,19 @@ } SymbolsFuncs; +/* See build.h */ +typedef struct BuildFuncs +{ + void (*build_activate_menu_item)(const GeanyBuildGroup grp, const guint cmd); + const gchar *(*build_get_current_menu_item)(const GeanyBuildGroup grp, const guint cmd, + const GeanyBuildCmdEntries field); + void (*build_remove_menu_item)(const GeanyBuildSource src, const GeanyBuildGroup grp, + const gint cmd); + void (*build_set_menu_item)(const GeanyBuildSource src, const GeanyBuildGroup grp, + const guint cmd, const GeanyBuildCmdEntries field, const gchar *value); + guint (*build_get_group_count)(const GeanyBuildGroup grp); +} +BuildFuncs; /* Deprecated aliases */ #ifndef GEANY_DISABLE_DEPRECATED Modified: src/plugins.c 13 files changed, 11 insertions(+), 2 deletions(-) =================================================================== @@ -46,7 +46,7 @@ #include "msgwindow.h" #include "prefs.h" #include "geanywraplabel.h" -#include "build.h" +/* #include "build.h" included in plugindata.h so it can use enums */ #include "encodings.h" #include "search.h" #include "highlighting.h" @@ -353,6 +353,14 @@ &symbols_get_context_separator }; +static BuildFuncs build_funcs = { + &build_activate_menu_item, + &build_get_current_menu_item, + &build_remove_menu_item, + &build_set_menu_item, + &build_get_group_count +}; + static GeanyFunctions geany_functions = { &doc_funcs, &sci_funcs, @@ -375,7 +383,8 @@ &scintilla_funcs, &msgwin_funcs, &stash_funcs, - &symbols_funcs + &symbols_funcs, + &build_funcs }; static GeanyData geany_data; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 589fff: Add Scintilla wrapper function sci_set_lexer()
by Matthew Brush 13 Feb '12

13 Feb '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Mon, 13 Feb 2012 06:35:08 Commit: 589ffff377bdaa930bd4b547c98b8b84db3a46c9 https://github.com/geany/geany/commit/589ffff377bdaa930bd4b547c98b8b84db3a4… Log Message: ----------- Add Scintilla wrapper function sci_set_lexer() When the lexer is changed it clears all styling information and resets the folding state. Closes #3486917 and #3486918 Modified Paths: -------------- src/highlighting.c src/sciwrappers.c src/sciwrappers.h Modified: src/highlighting.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -872,7 +872,7 @@ static void styleset_from_mapping(ScintillaObject *sci, guint ft_id, guint lexer g_assert(ft_id != GEANY_FILETYPES_NONE); /* lexer */ - SSM(sci, SCI_SETLEXER, lexer, 0); + sci_set_lexer(sci, lexer); /* styles */ styleset_common(sci, ft_id); @@ -906,7 +906,7 @@ static void styleset_from_mapping(ScintillaObject *sci, guint ft_id, guint lexer static void styleset_default(ScintillaObject *sci, guint ft_id) { - SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0); + sci_set_lexer(sci, SCLEX_NULL); /* we need to set STYLE_DEFAULT before we call SCI_STYLECLEARALL in styleset_common() */ set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_NONE, GCS_DEFAULT); Modified: src/sciwrappers.c 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -529,6 +529,13 @@ gint sci_get_lexer(ScintillaObject *sci) } +void sci_set_lexer(ScintillaObject *sci, guint lexer_id) +{ + SSM(sci, SCI_SETLEXER, lexer_id, 0); + SSM(sci, SCI_CLEARDOCUMENTSTYLE, 0, 0); +} + + /** Gets line length. * @param sci Scintilla widget. * @param line Line number. Modified: src/sciwrappers.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -146,6 +146,7 @@ void sci_set_keywords (ScintillaObject *sci, guint k, const gchar *text); gint sci_get_lexer (ScintillaObject *sci); +void sci_set_lexer (ScintillaObject *sci, guint lexer_id); void sci_set_readonly (ScintillaObject *sci, gboolean readonly); gint sci_get_zoom (ScintillaObject *sci); void sci_send_command (ScintillaObject *sci, gint cmd); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] b0b0eb: Make sure not to emit activation/change signals twice from entry action
by Colomban Wendling 10 Feb '12

10 Feb '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Feb 2012 17:24:10 Commit: b0b0ebb469a6b7eb74d321e6f5d7fe6f0bfcf6ba https://github.com/geany/geany/commit/b0b0ebb469a6b7eb74d321e6f5d7fe6f0bfcf… Log Message: ----------- Make sure not to emit activation/change signals twice from entry action If connect_proxy() get called twice, then the handlers would have been connected twice, leading to wrongly emit activation/change signals twice for a single input signal. For whatever reason connect_proxy() is actually called twice for the quick search entry on Windows (but not on Linux), so this fixes the search entry behavior on Windows. Modified Paths: -------------- src/geanyentryaction.c Modified: src/geanyentryaction.c 22 files changed, 15 insertions(+), 7 deletions(-) =================================================================== @@ -40,6 +40,7 @@ struct _GeanyEntryActionPrivate { GtkWidget *entry; gboolean numeric; + gboolean connected; }; enum @@ -108,13 +109,19 @@ static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widge { GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action); - if (priv->numeric) - g_signal_connect(priv->entry, "insert-text", - G_CALLBACK(ui_editable_insert_text_callback), NULL); - g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action); - g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action); - g_signal_connect(priv->entry, "activate-backward", - G_CALLBACK(delegate_entry_activate_backward_cb), action); + /* make sure not to connect handlers twice */ + if (! priv->connected) + { + if (priv->numeric) + g_signal_connect(priv->entry, "insert-text", + G_CALLBACK(ui_editable_insert_text_callback), NULL); + g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action); + g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action); + g_signal_connect(priv->entry, "activate-backward", + G_CALLBACK(delegate_entry_activate_backward_cb), action); + + priv->connected = TRUE; + } GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget); } @@ -167,6 +174,7 @@ static void geany_entry_action_init(GeanyEntryAction *action) priv = action->priv; priv->entry = NULL; priv->numeric = FALSE; + priv->connected = FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

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

10 Feb '12

Branch: refs/heads/master 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", -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 942610: Remove utils_build_path() - use g_build_filename instead
by Nick Treleaven 06 Feb '12

06 Feb '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 06 Feb 2012 16:41:18 Commit: 9426104f0b18dcca295c7615abd99dc3f207463f https://github.com/geany/geany/commit/9426104f0b18dcca295c7615abd99dc3f2074… Log Message: ----------- Remove utils_build_path() - use g_build_filename instead Modified Paths: -------------- src/editor.c src/filetypes.c src/highlighting.c src/keyfile.c src/symbols.c src/templates.c src/toolbar.c src/utils.c src/utils.h Modified: src/editor.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4734,7 +4734,7 @@ void editor_destroy(GeanyEditor *editor) static void on_document_save(GObject *obj, GeanyDocument *doc) { - gchar *f = utils_build_path(app->configdir, "snippets.conf", NULL); + gchar *f = g_build_filename(app->configdir, "snippets.conf", NULL); g_return_if_fail(NZV(doc->real_path)); @@ -4781,7 +4781,7 @@ void editor_init(void) * handler (on_editor_notify) is called */ g_signal_connect_after(geany_object, "editor-notify", G_CALLBACK(on_editor_notify), NULL); - f = utils_build_path(app->configdir, "snippets.conf", NULL); + f = g_build_filename(app->configdir, "snippets.conf", NULL); ui_add_config_file_menu_item(f, NULL, NULL); g_free(f); g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); Modified: src/filetypes.c 14 files changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -644,7 +644,7 @@ void filetypes_init_types() filetype_add(filetypes[ft_id]); } init_custom_filetypes(app->datadir); - f = utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL); + f = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL); init_custom_filetypes(f); g_free(f); @@ -662,12 +662,12 @@ static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) g_return_if_fail(NZV(doc->real_path)); - f = utils_build_path(app->configdir, "filetype_extensions.conf", NULL); + f = g_build_filename(app->configdir, "filetype_extensions.conf", NULL); if (utils_str_equal(doc->real_path, f)) filetypes_reload_extensions(); g_free(f); - f = utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL); + f = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL); if (utils_str_equal(doc->real_path, f)) { guint i; @@ -687,9 +687,9 @@ static void setup_config_file_menus(void) { gchar *f; - f = utils_build_path(app->configdir, "filetype_extensions.conf", NULL); + f = g_build_filename(app->configdir, "filetype_extensions.conf", NULL); ui_add_config_file_menu_item(f, NULL, NULL); - SETPTR(f, utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL)); + SETPTR(f, g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL)); ui_add_config_file_menu_item(f, NULL, NULL); g_free(f); @@ -808,11 +808,11 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) #endif SETPTR(lfn, utils_get_locale_from_utf8(lfn)); - path = utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.", NULL); + path = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.", NULL); if (g_str_has_prefix(lfn, path)) found = TRUE; - SETPTR(path, utils_build_path(app->datadir, "filetypes.", NULL)); + SETPTR(path, g_build_filename(app->datadir, "filetypes.", NULL)); if (g_str_has_prefix(lfn, path)) found = TRUE; Modified: src/highlighting.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1230,9 +1230,9 @@ static void add_color_scheme_item(GtkWidget *menu, const gchar *fname) gchar *path, *theme_name, *tooltip; gchar *theme_fn = utils_get_utf8_from_locale(fname); - path = utils_build_path(app->configdir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL); + path = g_build_filename(app->configdir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL); hkeyfile = utils_key_file_new(path); - SETPTR(path, utils_build_path(app->datadir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL)); + SETPTR(path, g_build_filename(app->datadir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL)); skeyfile = utils_key_file_new(path); theme_name = utils_get_setting(locale_string, hkeyfile, skeyfile, "theme_info", "name", theme_fn); Modified: src/keyfile.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -978,7 +978,7 @@ void configuration_save_default_session(void) */ void configuration_reload_default_session(void) { - const gchar *configfile = utils_build_path(app->configdir, "geany.conf", NULL); + const gchar *configfile = g_build_filename(app->configdir, "geany.conf", NULL); GKeyFile *config = g_key_file_new(); g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); @@ -991,14 +991,14 @@ void configuration_reload_default_session(void) gboolean configuration_load(void) { - gchar *configfile = utils_build_path(app->configdir, "geany.conf", NULL); + gchar *configfile = g_build_filename(app->configdir, "geany.conf", NULL); GKeyFile *config = g_key_file_new(); if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR)) { /* config file does not (yet) exist, so try to load a global config file which may be */ /* created by distributors */ geany_debug("No user config file found, trying to use global configuration."); - SETPTR(configfile, utils_build_path(app->datadir, "geany.conf", NULL)); + SETPTR(configfile, g_build_filename(app->datadir, "geany.conf", NULL)); } g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); g_free(configfile); Modified: src/symbols.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1732,7 +1732,7 @@ void symbols_show_load_tags_dialog(void) GHashTable *lang_hash; gchar *dir; - dir = utils_build_path(app->configdir, "tags", NULL); + dir = g_build_filename(app->configdir, "tags", NULL); /* create the user tags dir for next time if it doesn't exist */ if (! g_file_test(dir, G_FILE_TEST_IS_DIR)) { @@ -1740,7 +1740,7 @@ void symbols_show_load_tags_dialog(void) } file_list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); - SETPTR(dir, utils_build_path(app->datadir, "tags", NULL)); + SETPTR(dir, g_build_filename(app->datadir, "tags", NULL)); list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); g_free(dir); @@ -2171,7 +2171,7 @@ static void create_taglist_popup_menu(void) static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) { - gchar *f = utils_build_path(app->configdir, "ignore.tags", NULL); + gchar *f = g_build_filename(app->configdir, "ignore.tags", NULL); g_return_if_fail(NZV(doc->real_path)); @@ -2188,7 +2188,7 @@ void symbols_init(void) create_taglist_popup_menu(); - f = utils_build_path(app->configdir, "ignore.tags", NULL); + f = g_build_filename(app->configdir, "ignore.tags", NULL); ui_add_config_file_menu_item(f, NULL, NULL); g_free(f); Modified: src/templates.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -298,7 +298,7 @@ static void on_file_menu_hide(GtkWidget *item) /* reload templates if any file in the templates path is saved */ static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) { - gchar *path = utils_build_path(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); + gchar *path = g_build_filename(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); g_return_if_fail(NZV(doc->real_path)); Modified: src/toolbar.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -215,7 +215,7 @@ void toolbar_item_ref(GtkToolItem *item) else { /* Load the toolbar UI XML file from disk (first from config dir, then try data dir) */ - filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); + filename = g_build_filename(app->configdir, "ui_toolbar.xml", NULL); merge_id = gtk_ui_manager_add_ui_from_file(uim, filename, &error); if (merge_id == 0) { @@ -224,7 +224,7 @@ void toolbar_item_ref(GtkToolItem *item) g_error_free(error); error = NULL; - SETPTR(filename, utils_build_path(app->datadir, "ui_toolbar.xml", NULL)); + SETPTR(filename, g_build_filename(app->datadir, "ui_toolbar.xml", NULL)); merge_id = gtk_ui_manager_add_ui_from_file(uim, filename, &error); } g_free(filename); @@ -897,7 +897,7 @@ static void tb_editor_write_markup(TBEditorWidget *tbw) toolbar_reload(str->str); - filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); + filename = g_build_filename(app->configdir, "ui_toolbar.xml", NULL); utils_write_file(filename, str->str); g_free(filename); Modified: src/utils.c 39 files changed, 0 insertions(+), 39 deletions(-) =================================================================== @@ -1754,45 +1754,6 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl } -static gboolean utils_string_vappend(GString *buffer, const gchar *sep, va_list args) -{ - const gchar *str = va_arg(args, const gchar *); - - if (!str) - return FALSE; - do - { - g_string_append(buffer, str); - str = va_arg(args, const gchar *); - if (str && sep) - g_string_append(buffer, sep); - } - while (str); - - return TRUE; -} - - -/* Like g_build_path() but without first argument. */ -gchar *utils_build_path(const gchar *first, ...) -{ - static GString *buffer = NULL; - va_list args; - - if (! buffer) - buffer = g_string_new(first); - else - g_string_assign(buffer, first); - - g_string_append_c(buffer, G_DIR_SEPARATOR); - - va_start(args, first); - utils_string_vappend(buffer, G_DIR_SEPARATOR_S, 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(-) =================================================================== @@ -264,8 +264,6 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl gint utils_str_casecmp(const gchar *s1, const gchar *s2); -gchar *utils_build_path(const gchar *first, ...) G_GNUC_NULL_TERMINATED; - gchar *utils_get_path_from_uri(const gchar *uri); gboolean utils_is_uri(const gchar *uri); -------------- 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 06 Feb '12

06 Feb '12

1 0

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

06 Feb '12

1 0

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

06 Feb '12

Branch: refs/heads/master 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 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2012