GitLab

	  got "fallout" from the offscreen branches.

	  loading project dependancies are not satisfied and there is an early return.

Conflicts:

	ChangeLog

	  line wrapping kicks in.

	  properties.

	  instead the invisible editor-property gets tied to the life-cycle of the table
	  it would have been added to (since recently glade_editor_property() explicitly
	  shows/hides properties according to if thier widget actually has an instance
	  of the property).

	  widget lookup event redirection for events we're not interested in.

	  so that embedded toplevels dont "pop out" of the workspace

	  it loops less and actually finds the widgets.

	  this was never needed before since treeview columns did not have construct-only properties
	  (so they did not hit "rebuild" codepaths).

	  (for setting construct properties during a load process).

	  moved glade-3.desktop.in.in to glade.desktop.in.in, new app name is 'glade'.

	  with a GtkEventBox (the child gets a separate allocation and we use the border,
	  we're really better with priv->event_window).

	* gladeui/glade-widget.c: Fixed to not access GLADE_DESIGN_LAYOUT (widget)->child which
	  doesnt (and shouldnt) exist.

	  the fixed_layout stuff

	* plugins/gtk+/gtk+.xml.in: Removing Ruler classes, added GtkBox, GtkPaned, GtkButtonBox
	  base classes that are now instantiatable

	  also making libgladeui library libgladeui-2.

Conflicts:
	ChangeLog
	gladeui/Makefile.am
	gladeui/glade-widget.c

	* gladeui/glade-design-view.c: Hide workspace and show load progress
	  while loading so that one cannot access project widgets during the load
	  (insensitive workspace was problematic and causing some loaded project
	  windows to be permanently insensitive).

	* src/glade-window.c: Avoid any messups during project load, cannot close
	  projects while they are loading, etc.

	* gladeui/glade-app.c: Protect against commands executed on loading projects

	* src/glade-window.c: Added load progressbar to notebook tabs.

	* src/main.c: Display window before loading command line specified projects.

	* gladeui/glade-project.[ch]: Added dialog that pops up when about to load
	  a large project with glade_project_push_project() to push the progress and
	  glade_project_load_cancelled() to check and abort while loading the project.

	* gladeui/glade-widget.c, gladeui/glade-widget-adaptor.c: Push progress and
	  abort loading when project indicates the user cancelled the load.

	  plugins/gtk+/glade-gtk.c: Fixing some discrepincies searching for properties as
	  regular properties or packing properties. Now the conflicting "position" property
	  on a GtkPaned widget packed into a GtkBox widget works properly (bug 637475).

	  widgets unload (patch by Marco Diego Aurélio Mesquita, bug 637541).

	  make the project preview only preview toplevels.

	  glade_column_type_new() to create a GladeColumnType struct properly using
	  g_slice_new0(). An occurance of allocating the struct with g_new0 was causing
	  Glade to crash when freeing the block with g_slice_free (bug 637563). Many
	  big thanks to Benjamin Otte for tracking down the problem.