Skip to content

Commit

Permalink
New upstream release
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikix
mikix authored and Bazaar Package Importer committed Apr 6, 2011
2 parents 2448ffe + efc26b6 commit 90e9e68
Show file tree
Hide file tree
Showing 147 changed files with 8,675 additions and 5,887 deletions.
95 changes: 65 additions & 30 deletions .pc/10_ubuntu_show_embedded_menus.patch/gladeui/glade-widget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,8 @@ reset_object_property (GladeProperty *property,
GladeProject *project)
{
if (glade_property_class_is_object (property->klass,
glade_project_get_format (project)))
project ? glade_project_get_format (project) :
GLADE_PROJECT_FORMAT_LIBGLADE))
glade_property_reset (property);
}

Expand Down Expand Up @@ -1948,6 +1949,7 @@ glade_widget_show (GladeWidget *widget)
GladeDesignView *view;
GtkWidget *layout;
GladeProperty *property;
GladeProject *project;

g_return_if_fail (GLADE_IS_WIDGET (widget));

Expand All @@ -1969,16 +1971,14 @@ glade_widget_show (GladeWidget *widget)
return;
}

project = glade_widget_get_project (widget);
if (!project) return;

view = glade_design_view_get_from_project (glade_widget_get_project (widget));

if (!view)
return;
view = glade_design_view_get_from_project (project);
if (!view) return;

layout = GTK_WIDGET (glade_design_view_get_layout (view));

if (!layout)
return;
if (!layout) return;

if (gtk_widget_get_realized (layout))
glade_widget_add_to_layout (widget, layout);
Expand Down Expand Up @@ -2334,15 +2334,28 @@ glade_widget_rebuild (GladeWidget *gwidget)
{
GObject *new_object, *old_object;
GladeWidgetAdaptor *adaptor;
GladeProject *project = NULL;
GList *children;
gboolean reselect = FALSE, inproject;
GList *restore_properties = NULL;
GList *save_properties, *l;

GList *save_properties, *l;
GladeWidget *parent = NULL;


g_return_if_fail (GLADE_IS_WIDGET (gwidget));

adaptor = gwidget->adaptor;

if (gwidget->project &&
glade_project_has_object (gwidget->project, gwidget->object))
project = gwidget->project;

if (gwidget->parent &&
glade_widget_adaptor_has_child (gwidget->parent->adaptor,
gwidget->parent->object,
gwidget->object))
parent = gwidget->parent;

g_object_ref (gwidget);

/* Extract and keep the child hierarchies aside... */
Expand All @@ -2355,16 +2368,15 @@ glade_widget_rebuild (GladeWidget *gwidget)
(glade_project_has_object
(gwidget->project, gwidget->object) ? TRUE : FALSE) : FALSE;

if (inproject)
if (project)
{
if (glade_project_is_selected (gwidget->project,
gwidget->object))
if (glade_project_is_selected (project, gwidget->object))
{
reselect = TRUE;
glade_project_selection_remove
(gwidget->project, gwidget->object, FALSE);
(project, gwidget->object, FALSE);
}
glade_project_remove_object (gwidget->project, gwidget->object);
glade_project_remove_object (project, gwidget->object);
}

/* parentless_widget and object properties that reffer to this widget
Expand Down Expand Up @@ -2398,6 +2410,11 @@ glade_widget_rebuild (GladeWidget *gwidget)
}
g_list_free (save_properties);

/* Remove old object from parent
*/
if (parent)
glade_widget_remove_child (parent, gwidget);

/* Hold a reference to the old widget while we transport properties
* and children from it
*/
Expand All @@ -2407,12 +2424,6 @@ glade_widget_rebuild (GladeWidget *gwidget)
/* Only call this once the object has a proper GladeWidget */
glade_widget_adaptor_post_create (adaptor, new_object, GLADE_CREATE_REBUILD);

/* Replace old object with new object in parent
*/
if (gwidget->parent)
glade_widget_replace (gwidget->parent,
old_object, new_object);

/* Must call dispose for cases like dialogs and toplevels */
if (GTK_IS_WINDOW (old_object))
gtk_widget_destroy (GTK_WIDGET (old_object));
Expand All @@ -2425,7 +2436,12 @@ glade_widget_rebuild (GladeWidget *gwidget)
glade_widget_push_superuser ();
glade_widget_insert_children (gwidget, children);
glade_widget_pop_superuser ();


/* Add new object to parent
*/
if (parent)
glade_widget_add_child (parent, gwidget, FALSE);

/* Custom properties aren't transfered in build_object, since build_object
* is only concerned with object creation.
*/
Expand Down Expand Up @@ -2459,13 +2475,11 @@ glade_widget_rebuild (GladeWidget *gwidget)
/* If the widget was in a project (and maybe the selection), then
* restore that stuff.
*/
if (inproject)
if (project)
{
glade_project_add_object (gwidget->project, NULL,
gwidget->object);
glade_project_add_object (project, NULL, gwidget->object);
if (reselect)
glade_project_selection_add
(gwidget->project, gwidget->object, TRUE);
glade_project_selection_add (project, gwidget->object, TRUE);
}

/* We shouldnt show if its not already visible */
Expand Down Expand Up @@ -3247,14 +3261,34 @@ glade_widget_child_set_property (GladeWidget *widget,
const gchar *property_name,
const GValue *value)
{
GList *old_order = NULL;

g_return_if_fail (GLADE_IS_WIDGET (widget));
g_return_if_fail (GLADE_IS_WIDGET (child));
g_return_if_fail (property_name != NULL && value != NULL);


if (widget->project &&
widget->in_project)
old_order = glade_widget_get_children (widget);

glade_widget_adaptor_child_set_property (widget->adaptor,
widget->object,
child->object,
property_name, value);

/* After setting a child property... it's possible the order of children
* in the parent has been effected.
*
* If this is the case then we need to signal the GladeProject that
* it's rows have been reordered so that any connected views update
* themselves properly.
*/
if (widget->project &&
widget->in_project)
glade_project_check_reordered (widget->project, widget, old_order);

g_list_free (old_order);
}

/**
Expand Down Expand Up @@ -3774,13 +3808,13 @@ glade_widget_read (GladeProject *project,

if (glade_project_load_cancelled (project))
return NULL;

glade_widget_push_superuser ();

if (!glade_xml_node_verify
(node, GLADE_XML_TAG_WIDGET (glade_project_get_format (project))))
return NULL;

glade_widget_push_superuser ();

if ((klass =
glade_xml_get_property_string_required
(node, GLADE_XML_TAG_CLASS, NULL)) != NULL)
Expand Down Expand Up @@ -3809,7 +3843,7 @@ glade_widget_read (GladeProject *project,
"internal child %s of %s",
internal,
glade_widget_get_name (parent));
return FALSE;
goto out;
}

if (!(widget =
Expand Down Expand Up @@ -3839,6 +3873,7 @@ glade_widget_read (GladeProject *project,
g_free (klass);
}

out:
glade_widget_pop_superuser ();

glade_project_push_progress (project);
Expand Down
4 changes: 2 additions & 2 deletions .pc/90_linking_doc_in_natty.patch/doc/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Expand Down
Loading

0 comments on commit 90e9e68

Please sign in to comment.