Commit 6cc9676a authored by Jeff Garzik's avatar Jeff Garzik

s/g_copy_strings/g_strconcat/

parent 1739a537
1998-12-30 Jeff Garzik <jgarzik@pobox.com>
* plugins/perl/perl.c, src/cell.c, src/expr.c, src/plugin.c,
src/sheet-autofill.c, src/sheet.c, src/workbook.c:
s/g_copy_strings/g_strconcat/
1998-12-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* plugins/excel/boot.c: New file, this holds the probing and load
......
1998-12-30 Jeff Garzik <jgarzik@pobox.com>
* plugins/perl/perl.c, src/cell.c, src/expr.c, src/plugin.c,
src/sheet-autofill.c, src/sheet.c, src/workbook.c:
s/g_copy_strings/g_strconcat/
1998-12-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* plugins/excel/boot.c: New file, this holds the probing and load
......
1998-12-30 Jeff Garzik <jgarzik@pobox.com>
* plugins/perl/perl.c, src/cell.c, src/expr.c, src/plugin.c,
src/sheet-autofill.c, src/sheet.c, src/workbook.c:
s/g_copy_strings/g_strconcat/
1998-12-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* plugins/excel/boot.c: New file, this holds the probing and load
......
1998-12-30 Jeff Garzik <jgarzik@pobox.com>
* plugins/perl/perl.c, src/cell.c, src/expr.c, src/plugin.c,
src/sheet-autofill.c, src/sheet.c, src/workbook.c:
s/g_copy_strings/g_strconcat/
1998-12-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* plugins/excel/boot.c: New file, this holds the probing and load
......
......@@ -32,7 +32,7 @@ init_plugin(PluginData *pd)
/* Initialize the Perl interpreter. */
arg = gnome_unconditional_datadir_file("gnumeric/perl/lib");
argv[1] = g_copy_strings("-I", arg, NULL);
argv[1] = g_strconcat("-I", arg, NULL);
g_free(arg);
argv[2] = gnome_unconditional_datadir_file("gnumeric/perl/startup.pl");
gnumeric_perl_interp = perl_alloc();
......
......@@ -1503,7 +1503,7 @@ cell_get_text (Cell *cell)
char *func, *ret;
func = expr_decode_tree (cell->parsed_node, cell->sheet, cell->col->pos, cell->row->pos);
ret = g_copy_strings ("=", func, NULL);
ret = g_strconcat ("=", func, NULL);
g_free (func);
return ret;
......@@ -1542,7 +1542,7 @@ cell_get_content (Cell *cell)
char *func, *ret;
func = expr_decode_tree (cell->parsed_node, cell->sheet, cell->col->pos, cell->row->pos);
ret = g_copy_strings ("=", func, NULL);
ret = g_strconcat ("=", func, NULL);
g_free (func);
return ret;
......
......@@ -859,7 +859,7 @@ eval_expr (void *asheet, ExprTree *tree, int eval_col, int eval_row, char **erro
sa = value_string (a);
sb = value_string (b);
tmp = g_copy_strings (sa, sb, NULL);
tmp = g_strconcat (sa, sb, NULL);
res->v.str = string_get (tmp);
g_free (sa);
g_free (sb);
......@@ -1017,9 +1017,9 @@ do_expr_decode_tree (ExprTree *tree, void *sheet, int col, int row, Operation pa
op = binary_operation_names [tree->oper];
if (bigger_prec (parent_op, tree->oper))
res = g_copy_strings ("(", a, op, b, ")", NULL);
res = g_strconcat ("(", a, op, b, ")", NULL);
else
res = g_copy_strings (a, op, b, NULL);
res = g_strconcat (a, op, b, NULL);
g_free (a);
g_free (b);
......@@ -1030,7 +1030,7 @@ do_expr_decode_tree (ExprTree *tree, void *sheet, int col, int row, Operation pa
char *res, *a;
a = do_expr_decode_tree (tree->u.value, sheet, col, row, tree->oper);
res = g_copy_strings ("-", a);
res = g_strconcat ("-", a);
g_free (a);
return res;
}
......@@ -1068,7 +1068,7 @@ do_expr_decode_tree (ExprTree *tree, void *sheet, int col, int row, Operation pa
strcat (sum, ",");
}
res = g_copy_strings (
res = g_strconcat (
fd->name, "(", sum, ")", NULL);
for (i = 0; i < argc; i++)
......@@ -1077,7 +1077,7 @@ do_expr_decode_tree (ExprTree *tree, void *sheet, int col, int row, Operation pa
return res;
} else
return g_copy_strings (fd->name, "()", NULL);
return g_strconcat (fd->name, "()", NULL);
}
case OPER_CONSTANT: {
......@@ -1089,7 +1089,7 @@ do_expr_decode_tree (ExprTree *tree, void *sheet, int col, int row, Operation pa
a = cellref_name (&v->v.cell_range.cell_a, sheet, col, row);
b = cellref_name (&v->v.cell_range.cell_b, sheet, col, row);
res = g_copy_strings (a, ":", b, NULL);
res = g_strconcat (a, ":", b, NULL);
g_free (a);
g_free (b);
......@@ -1097,7 +1097,7 @@ do_expr_decode_tree (ExprTree *tree, void *sheet, int col, int row, Operation pa
return res;
} else {
if (v->type == VALUE_STRING){
return g_copy_strings ("\"", v->v.str->str, "\"", NULL);
return g_strconcat ("\"", v->v.str->str, "\"", NULL);
} else
return value_string (v);
}
......
......@@ -33,7 +33,7 @@ plugin_load (gchar *modfile)
data->handle = g_module_open (modfile, 0);
if (!data->handle) {
char *str;
str = g_copy_strings(_("unable to open module file: "), g_module_error(), NULL);
str = g_strconcat(_("unable to open module file: "), g_module_error(), NULL);
gnumeric_notice(str);
g_free(str);
g_free(data);
......@@ -91,7 +91,7 @@ plugin_load_plugins_in_dir (char *directory)
if (strncmp (e->d_name + strlen (e->d_name) - 3, ".so", 3) == 0){
char *plugin_name;
plugin_name = g_copy_strings (directory, e->d_name, NULL);
plugin_name = g_strconcat (directory, e->d_name, NULL);
plugin_load (plugin_name);
g_free (plugin_name);
}
......@@ -109,7 +109,7 @@ plugins_init(void)
return;
/* Load the user plugins */
plugin_dir = g_copy_strings (home_dir ? home_dir : "", "/.gnumeric/plugins/", NULL);
plugin_dir = g_strconcat (home_dir ? home_dir : "", "/.gnumeric/plugins/", NULL);
plugin_load_plugins_in_dir (plugin_dir);
g_free (plugin_dir);
......
......@@ -454,12 +454,12 @@ autofill_cell (Cell *cell, int idx, FillItem *fi)
while (*p && isdigit (*p))
p++;
v = g_copy_strings (buffer, p, NULL);
v = g_strconcat (buffer, p, NULL);
} else {
char *n = g_strdup (last->v.numstr.str->str);
n [last->v.numstr.pos] = 0;
v = g_copy_strings (n, buffer, NULL);
v = g_strconcat (n, buffer, NULL);
g_free (n);
}
cell_set_text (cell, v);
......
......@@ -2328,7 +2328,7 @@ sheet_verify_selection_simple (Sheet *sheet, char *command_name)
if (g_list_length (sheet->selections) == 1)
return TRUE;
msg = g_copy_strings (
msg = g_strconcat (
"The command `", command_name,
"' can not be performed with multiple selections", NULL);
gnumeric_notice (msg);
......@@ -3188,9 +3188,9 @@ cellref_name (CellRef *cell_ref, Sheet *eval_sheet, int eval_col, int eval_row)
char *s;
if (strchr (sheet->name, ' '))
s = g_copy_strings ("'", sheet->name, "'!", buffer, NULL);
s = g_strconcat ("'", sheet->name, "'!", buffer, NULL);
else
s = g_copy_strings (sheet->name, "!", buffer, NULL);
s = g_strconcat (sheet->name, "!", buffer, NULL);
return s;
}
......
......@@ -288,7 +288,7 @@ cb_sheet_check_dirty (gpointer key, gpointer value, gpointer user_data)
else
f = "";
s = g_copy_strings (_("Workbook "), f,
s = g_strconcat (_("Workbook "), f,
_(" has unsaved changes, save them?"),
NULL);
l = gtk_label_new (s);
......@@ -1164,7 +1164,7 @@ workbook_auto_expr_label_set (Workbook *wb, char *text)
g_return_if_fail (wb != NULL);
g_return_if_fail (text != NULL);
res = g_copy_strings (wb->auto_expr_desc->str, "=",
res = g_strconcat (wb->auto_expr_desc->str, "=",
text, NULL);
gnome_canvas_item_set (wb->auto_expr_label,
"text", res,
......@@ -1422,7 +1422,7 @@ workbook_set_title (Workbook *wb, char *title)
g_return_if_fail (wb != NULL);
g_return_if_fail (title != NULL);
full_title = g_copy_strings ("Gnumeric: ", title, NULL);
full_title = g_strconcat ("Gnumeric: ", title, NULL);
gtk_window_set_title (GTK_WINDOW (wb->toplevel), full_title);
g_free (full_title);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment