[gdl] bgo#597996 - usage of private API in the gdl_dock_placeholder_new function
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdl] bgo#597996 - usage of private API in the gdl_dock_placeholder_new function
- Date: Sat, 24 Apr 2010 12:20:02 +0000 (UTC)
commit f29cbcde8dff6cccdfa61b0a404d3c6768d8a872
Author: Johannes Schmid <jhs gnome org>
Date: Sun Apr 18 22:00:05 2010 +0200
bgo#597996 - usage of private API in the gdl_dock_placeholder_new function
gdl/gdl-dock-placeholder.c | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/gdl/gdl-dock-placeholder.c b/gdl/gdl-dock-placeholder.c
index d3fd1fb..b265b09 100644
--- a/gdl/gdl-dock-placeholder.c
+++ b/gdl/gdl-dock-placeholder.c
@@ -220,6 +220,8 @@ gdl_dock_placeholder_instance_init (GdlDockPlaceholder *ph)
GTK_WIDGET_UNSET_FLAGS (ph, GTK_CAN_FOCUS);
ph->_priv = g_new0 (GdlDockPlaceholderPrivate, 1);
+
+ GDL_DOCK_OBJECT_UNSET_FLAGS (ph, GDL_DOCK_AUTOMATIC);
}
static void
@@ -549,22 +551,9 @@ gdl_dock_placeholder_new (const gchar *name,
ph = GDL_DOCK_PLACEHOLDER (g_object_new (GDL_TYPE_DOCK_PLACEHOLDER,
"name", name,
"sticky", sticky,
+ "next-placement", position,
+ "host", object,
NULL));
- GDL_DOCK_OBJECT_UNSET_FLAGS (ph, GDL_DOCK_AUTOMATIC);
-
- if (object) {
- gdl_dock_placeholder_attach (ph, object);
- if (position == GDL_DOCK_NONE)
- position = GDL_DOCK_CENTER;
- g_object_set (G_OBJECT (ph), "next-placement", position, NULL);
- if (GDL_IS_DOCK (object)) {
- /* the top placement will be consumed by the toplevel
- dock, so add a dummy placement */
- g_object_set (G_OBJECT (ph), "next-placement", GDL_DOCK_CENTER, NULL);
- }
- /* try a recursion */
- do_excursion (ph);
- }
return GTK_WIDGET (ph);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]