[glade3: 44/44] Merge branch 'master' into signal-tree-model
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3: 44/44] Merge branch 'master' into signal-tree-model
- Date: Mon, 10 Jan 2011 09:03:23 +0000 (UTC)
commit 7be60d7441f57088dde6e4cbb646c53c5f724731
Merge: 5a2aa19 db4732e
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Mon Jan 10 18:06:38 2011 +0900
Merge branch 'master' into signal-tree-model
Conflicts:
ChangeLog
ChangeLog | 16 +
gladeui/glade-app.c | 26 -
gladeui/glade-app.h | 3 -
gladeui/glade-base-editor.c | 2 +-
gladeui/glade-widget.c | 3 +-
plugins/gtk+/glade-gtk.c | 31 +-
plugins/gtk+/gtk+.xml.in | 3 +-
po/sv.po | 3790 ++++++++++++++++++++----------------------
src/glade-window.c | 83 +-
9 files changed, 1902 insertions(+), 2055 deletions(-)
---
diff --cc ChangeLog
index 85c874c,4b0d554..89fe01f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,10 +1,21 @@@
2011-01-10 Tristan Van Berkom <tristanvb openismus com>
+ * gladeui/glade-signal-model.[ch]:
+ - Fixed indentation
+ - Relicense as LGPL as Johannes Schmid said that was ok.
+
+ * gladeui/glade-signal-editor.c:
+ - Fixed <click here> column to always show up italic insensitive when
+ no object is selected.
+ - Fixed the <type here> text to come back and not add any signal when
+ the first signal of a type is added with a NULL handler
+ - Fixed devhelp icon visibility to not show when !glade_util_have_devhelp()
+
+ * gladeui/glade-widget.c: Dont set packing properties onto internal widgets.
+
+ * plugins/gtk+/gtk+.xml.in, plugins/gtk+/glade-gtk.c: Expose internal GtkTreeSelection
+ child of GtkTreeView so that "changed" signal can be connected to. Fixes bug 383766.
+
2011-01-09 Tristan Van Berkom <tristanvb openismus com>
* gladeui/glade-design-layout.c: Fixed to not hide widgets when removing
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]