Revision: 4904 http://geany.svn.sourceforge.net/geany/?rev=4904&view=rev Author: ntrel Date: 2010-05-11 14:55:47 +0000 (Tue, 11 May 2010)
Log Message: ----------- Add Build prefix for TableFields, TableData.
Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h trunk/src/project.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-11 14:38:42 UTC (rev 4903) +++ trunk/ChangeLog 2010-05-11 14:55:47 UTC (rev 4904) @@ -10,6 +10,8 @@ Add 'Refresh' popup menu item (part of geany-plugins #2999858). * src/build.c, src/build.h, src/project.c: Make some ugly build.h global variables static. + * src/build.c, src/build.h, src/project.c: + Add Build prefix for TableFields, TableData.
2010-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-05-11 14:38:42 UTC (rev 4903) +++ trunk/src/build.c 2010-05-11 14:55:47 UTC (rev 4904) @@ -886,10 +886,10 @@ else #endif { - gchar *locale_term_cmd = NULL; - gchar **term_argv = NULL; - guint term_argv_len, i; - gchar **argv = NULL; + gchar *locale_term_cmd = NULL; + gchar **term_argv = NULL; + guint term_argv_len, i; + gchar **argv = NULL;
/* get the terminal path */ locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); @@ -923,12 +923,12 @@ /* command line arguments only for cmd.exe */ if (strstr(argv[0], "cmd.exe") != NULL) { - argv[term_argv_len ] = g_strdup("/Q /C"); + argv[term_argv_len] = g_strdup("/Q /C"); argv[term_argv_len + 1] = g_strdup(RUN_SCRIPT_CMD); } else { - argv[term_argv_len ] = g_strdup(RUN_SCRIPT_CMD); + argv[term_argv_len] = g_strdup(RUN_SCRIPT_CMD); argv[term_argv_len + 1] = NULL; } #else @@ -1863,21 +1863,21 @@ }
-typedef struct TableFields +typedef struct BuildTableFields { RowWidgets **rows; GtkWidget *fileregex; GtkWidget *nonfileregex; gchar **fileregexstring; gchar **nonfileregexstring; -} TableFields; +} BuildTableFields;
-GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data, +GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildTableData *table_data, GeanyFiletype *ft) { GtkWidget *label, *sep, *clearicon, *clear; - TableFields *fields; + BuildTableFields *fields; GtkTable *table; const gchar **ch; gchar *txt; @@ -1888,7 +1888,7 @@ guint sep_padding = entry_y_padding + 3;
table = GTK_TABLE(gtk_table_new(build_items_count + 12, 5, FALSE)); - fields = g_new0(TableFields, 1); + fields = g_new0(BuildTableFields, 1); fields->rows = g_new0(RowWidgets*, build_items_count); for (ch = colheads, col = 0; *ch != NULL; ch++, col++) { @@ -1999,7 +1999,7 @@ }
-void build_free_fields(TableData table_data) +void build_free_fields(BuildTableData table_data) { gint cmdindex;
@@ -2032,7 +2032,7 @@ }
-static gboolean read_row(BuildDestination *dst, TableData table_data, gint drow, gint grp, gint cmd) +static gboolean read_row(BuildDestination *dst, BuildTableData table_data, gint drow, gint grp, gint cmd) { gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; gboolean changed = FALSE; @@ -2126,7 +2126,7 @@ }
-static gboolean build_read_commands(BuildDestination *dst, TableData table_data, gint response) +static gboolean build_read_commands(BuildDestination *dst, BuildTableData table_data, gint response) { gint cmdindex, cmd; gboolean changed = FALSE; @@ -2146,7 +2146,7 @@ }
-void build_read_project(GeanyFiletype *ft, TableData build_properties) +void build_read_project(GeanyFiletype *ft, BuildTableData build_properties) { BuildDestination menu_dst;
@@ -2175,7 +2175,7 @@ GeanyFiletype *ft = NULL; gchar *title = _("Set Build Commands"); gint response; - TableData table_data; + BuildTableData table_data; BuildDestination prefdsts;
if (doc != NULL) @@ -2227,7 +2227,7 @@
/* set non_ft working directory entries to %p for project */ -void build_set_non_ft_wd_to_proj(TableData table_data) +void build_set_non_ft_wd_to_proj(BuildTableData table_data) { gint i, start, end;
Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2010-05-11 14:38:42 UTC (rev 4903) +++ trunk/src/build.h 2010-05-11 14:55:47 UTC (rev 4904) @@ -156,20 +156,20 @@ } BuildDestination;
/* opaque pointers returned from build functions and passed back to them */ -typedef struct TableFields *TableData; +typedef struct BuildTableFields *BuildTableData;
void build_init(void);
void build_finalize(void);
/* menu configuration dialog functions */ -GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *data, GeanyFiletype *ft); +GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildTableData *data, GeanyFiletype *ft);
-void build_read_project(GeanyFiletype *ft, TableData build_properties); +void build_read_project(GeanyFiletype *ft, BuildTableData build_properties);
-void build_free_fields(TableData data); +void build_free_fields(BuildTableData data);
-void build_set_non_ft_wd_to_proj(TableData table_data); +void build_set_non_ft_wd_to_proj(BuildTableData table_data);
/* build response decode assistance function */ gboolean build_parse_make_dir(const gchar *string, gchar **prefix);
Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2010-05-11 14:38:42 UTC (rev 4903) +++ trunk/src/project.c 2010-05-11 14:55:47 UTC (rev 4904) @@ -77,7 +77,7 @@ GtkWidget *file_name; GtkWidget *base_path; GtkWidget *patterns; - TableData build_properties; + BuildTableData build_properties; } PropertyDialogElements;
@@ -383,7 +383,7 @@
static void on_set_use_base_path_clicked(GtkWidget *unused1, gpointer user_data) { - build_set_non_ft_wd_to_proj((TableData)user_data); + build_set_non_ft_wd_to_proj((BuildTableData)user_data); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.