aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@ximian.com>2003-01-24 13:03:54 +0800
committerHans Petter <hansp@src.gnome.org>2003-01-24 13:03:54 +0800
commit2c11fe24f24e6ef4c016a113e8f5a0c2c73d81d9 (patch)
tree34611a119073b6ed8217e7f58bb7ffdcbf8a65b3 /calendar/gui
parent09e6aacd2d5af2573cd9640e20df02067231b697 (diff)
downloadgsoc2013-evolution-2c11fe24f24e6ef4c016a113e8f5a0c2c73d81d9.tar.gz
gsoc2013-evolution-2c11fe24f24e6ef4c016a113e8f5a0c2c73d81d9.tar.zst
gsoc2013-evolution-2c11fe24f24e6ef4c016a113e8f5a0c2c73d81d9.zip
Add a terminating NULL to the concatenation.
2003-01-23 Hans Petter Jansson <hpj@ximian.com> * gui/dialogs/comp-editor.c (comp_editor_merge_ui): Add a terminating NULL to the concatenation. svn path=/trunk/; revision=19612
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 24fdf3396f..4b2e4fa882 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1101,7 +1101,7 @@ comp_editor_merge_ui (CompEditor *editor,
priv = editor->priv;
- path = g_strconcat (EVOLUTION_UIDIR "/", filename);
+ path = g_strconcat (EVOLUTION_UIDIR "/", filename, NULL);
bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, path, "evolution-calendar", NULL);
bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
class='rem' style='width: 15.2%;'/> -rw-r--r--core/blockchain_test.go30
-rw-r--r--core/database_util.go179
-rw-r--r--core/database_util_test.go80
-rw-r--r--core/genesis.go6
-rw-r--r--core/headerchain.go97
-rw-r--r--core/vm_env.go2
-rw-r--r--eth/api.go26
-rw-r--r--eth/backend.go118
-rw-r--r--eth/backend_test.go2
-rw-r--r--eth/db_upgrade.go343
-rw-r--r--eth/filters/api.go2
-rw-r--r--eth/filters/filter.go7
-rw-r--r--eth/filters/filter_test.go4
-rw-r--r--eth/gasprice.go2
-rw-r--r--eth/handler.go32
-rw-r--r--eth/handler_test.go10
-rw-r--r--eth/sync.go3
-rw-r--r--miner/worker.go4
-rw-r--r--tests/block_test_util.go4
24 files changed, 726 insertions, 365 deletions
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index 4f47de5d7..274ad1809 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -170,7 +170,7 @@ func dump(ctx *cli.Context) {
for _, arg := range ctx.Args() {
var block *types.Block
if hashish(arg) {
- block = chain.GetBlock(common.HexToHash(arg))
+ block = chain.GetBlockByHash(common.HexToHash(arg))
} else {
num, _ := strconv.Atoi(arg)
block = chain.GetBlockByNumber(uint64(num))
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index c476e1c77..6547aae42 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go