[glade3/signal-tree-model] Remaning merge conflicts
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3/signal-tree-model] Remaning merge conflicts
- Date: Thu, 30 Dec 2010 21:29:28 +0000 (UTC)
commit 5d3a0549bf7715ec32350bb4d218383f05abecd6
Author: Johannes Schmid <jhs gnome org>
Date: Thu Dec 30 22:29:03 2010 +0100
Remaning merge conflicts
gladeui/glade-base-editor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index a46e1c9..f107f05 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -1804,7 +1804,7 @@ glade_base_editor_init (GladeBaseEditor * editor)
e->table);
/* Signal Editor */
- e->signal_editor = glade_signal_editor_new (NULL);
+ e->signal_editor = glade_signal_editor_new ();
gtk_widget_show (GTK_WIDGET (e->signal_editor));
gtk_widget_set_size_request (GTK_WIDGET (e->signal_editor), -1, 96);
gtk_paned_pack2 (GTK_PANED (paned), GTK_WIDGET (e->signal_editor), FALSE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]