ChangeLog 18 KB
Newer Older
1 2 3 4 5
2007-12-10  Tor Lillqvist  <tml@novell.com>

	* gtk-zip.sh.in: Include bin/gtk-builder-convert in the dev
	package. (#502850)

6 7 8 9 10
2007-12-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_real_remove): Another fix
	to avoid further fallout from the fix for bug 388321.

11 12 13 14 15 16 17 18 19 20 21 22 23
2007-12-09 09:56:06  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>

	* gdk/directfb/gdkgc-directfb.c:
	* gdk/directfb/gdkdrawable-directfb.c:
	* gdk/directfb/gdkdirectfb.h:
	* gdk/directfb/gdkwindow-directfb.c:
	* gdk/directfb/gdkprivate-directfb.h: Committed several patches
	(window_flip_group, no_background_pixmap_fix, opt_temp_region2,
	blit_after_cairo_fix, rect_clip_fix, fast_blend, opt_temp_region_etc,
	opt_clip_region_and_fill_rects, no_state_resets) by Denis Oliver Knopp
	which are expected to improve the performance of the DirectFB backend.
	Experimental pieces of code (GDK_DIRECTFB_NO_EXPERIMENTS) are disabled.

24 25 26 27 28
2007-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcontainer.c: Correct the documentation of child
	property getter arguments.  (#501992, David Brigada)

29 30 31 32 33
2007-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Don't
	leak pixbufs.  (#502250, Yevgen Muntyan)

34 35 36 37
2007-12-07  Yevgen Muntyan  <muntyan@tamu.edu>

	* gtk/gtkprintunixdialog.c:
	* gtk/gtkpagesetupunixdialog.c: added alternative button order in
Yevgen Muntyan's avatar
Yevgen Muntyan committed
38
	Print and Page Setup dialogs (#502202).
39

40 41 42 43 44 45
2007-12-07 13:16:33  Tim Janik  <timj@imendio.com>

	* Makefile.decl: skip tests if gdktarget!=x11, since GUI tests need
	Xvfb. only start Xvfb if TEST_PROGS is not empty. moved "set -e" out
	of XVFB_START, since it's the GTESTER invokation that needs this.

46 47 48 49 50 51 52
2007-12-06  Tommi Komulainen  <tommi.komulainen@iki.fi>

	* gdk-pixbuf/gdk-pixbuf.symbols:
	* gdk/gdk.symbols:
	* gdk/gtk.symbols: Remove trailing whitespace that can trigger false
	positives in abicheck.sh

53 54 55 56 57
2007-12-06 18:45:06  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>

	* gdk/directfb/gdkevents-directfb.c: Committed a patch by DOK to fix
	GDK events generations in the DirectFB backend.

58 59 60 61 62
2007-12-06 13:55:06  Tim Janik  <timj@imendio.com>

	* Makefile.decl: replaced seq(1) invokation for X11 ids with a hardcoded
	set of likely unused display ids, because MacOS has no seq(1) command.

63 64 65 66 67 68
2007-12-06  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c:
	(synthesize_crossing_events_for_ns_event): Fix warning when
	switching spaces in leopard.

69 70 71 72 73 74
2007-12-06 13:38:36  Tim Janik  <timj@imendio.com>

	* tests/floatingtest.c: ported to new testing framework.

	* tests/Makefile.am: run floatingtest as testing framework test.

75 76 77 78 79 80 81 82 83 84 85
2007-12-06 10:44:52  Tim Janik  <timj@imendio.com>

	* tests/autotestfilechooser.c: majorly speed up execution by reducing
	timeouts and converting main loop sleeps to pending/iterate loops with
	very low priority async handlers. eliminate output for non-verbose
	tests. assert successfull subtests in all test functions. use testing
	framework in main().

	* tests/Makefile.am: add autotestfilechooser to TEST_PROGS, so it's
	executed inside Xvfb upon make check.

86 87 88 89 90
2007-12-06 08:23:38  Tim Janik  <timj@imendio.com>

	* tests/objecttests.c: use string comparisons for string property
	values and get rid of referencing symbols in array initialization.

91 92 93 94 95 96 97 98 99 100 101 102 103 104
2007-12-05 18:59:59  Tim Janik  <timj@imendio.com>

	* gtk+/Makefile.decl: run tests in current dir after setting up the
	logging directory, so their results get properly merged into the
	resulting test log.

	* gtk+/gtk/gtktestutils.[hc]: added gtk_test_list_all_types() for
	tests to loop over registered Gdk/Gtk+ types.

	* gtk+/tests/objecttests.c: new test program, implements automated
	property tests. several properties are blacklisted because they
	seem to trigger Gdk/Gtk+ bugs. ./objecttests -m thorough --verbose
	can be used to test blacklisted properties and see which proprty failed.

105 106 107 108 109
2007-12-04  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_init):
	Fully initialize the root window, fixes bug #501583.

110 111 112 113 114
2007-12-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtknotebook.c: Modify the tab-label-destroy fix to not
	crash epiphany.

115 116 117 118 119 120
2007-12-03  Richard Hult  <richard@imendio.com>

	* gtk/gtkquartz.c: (_gtk_quartz_set_selection_data_for_pasteboard):
	Don't crash when dragging from a source that doesn't support uri
	lists (bug #499868, Paul Davis).

121 122 123 124 125 126 127
2007-12-03  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c:
	(gdk_window_impl_quartz_begin_paint_region): Don't crash when a
	parent relative bg pixmap is set, and no parent has a bg
	pixmap. Fixes bug #500804.

128 129 130 131 132 133 134 135 136 137 138 139 140 141
2007-12-03  Matthias Clasen  <mclasen@redhat.com>

	Two optimizations for icon cache lookups.

	* gtk/gtkiconcache.[hc]:
	* gtk/gtkicontheme.c: Remember the directory index for
	subdirectories, instead of running over the directory list
	again and again.

	* gtk/gtkiconcache.c (find_image_offset): Remember the last 
	chain and try it first; this helps with the the usage patterns
	in gtkicontheme.c, where the same icon is queried for a lot
	of subdirectories.

142 143 144 145 146 147
2007-12-03 15:18:17  Tim Janik  <timj@imendio.com>

	* gtk/Makefile.am (gtktypefuncs.c): use 'grep -o' to extract _get_type
	functions from header files. this should be portable across linux and
	Mac OS, unlike the previpous sed expression.

148 149 150 151 152 153 154 155 156 157
2007-12-1  Cody Russell  <bratsche@gnome.org>

	* gtk/gtkpaned.c: (gtk_paned_set_position) [Win32]:
	On Windows, queue a redraw of child2 whenever we set
	the pane handle position.  This is unfortunately kind
	of hacky, but solves the visual artifacts that were
	occuring on at least certain types of child widgets
	(e.g., text views and tree views) that are inside
	horizontal or vertical panes. (#144269)

Matthias Clasen's avatar
Matthias Clasen committed
158 159 160 161
2007-11-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkrc.c: Fix doc typos.  (#500672, David Lambert)

Matthias Clasen's avatar
Matthias Clasen committed
162
2007-11-29  Matthias Clasen  <mclasen@redhat.com>
163

Matthias Clasen's avatar
Matthias Clasen committed
164 165 166
	* gtk/gtkmenuitem.c (gtk_menu_item_paint): Remove leftover
	debug spew.

Matthias Clasen's avatar
Matthias Clasen committed
167 168 169 170
2007-11-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/Makefile.am: Fix ordering of subdirs.

171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189
2007-11-28  Tor Lillqvist  <tml@novell.com>

	A proper build of GNU libintl is supposed to export the variable
	_nl_msg_cat_cntr. configure looks for that variable in order to
	recognize GNU gettext. If it sees that it is indeed GNU gettext
	that is used, it decides to install message catalogs in
	share/locale, otherwise in lib/locale. Until now on Windows I have
	built GTK+ against a build of GNU gettext that did not export
	_nl_msg_cat_cntr. But this will change, so we can't assume message
	catalogs are always in lib/locale.

	* gtk/gtkmain.c: (_gtk_get_localedir) [Win32]: Rework to handle
	GTK_LOCALEDIR being either in "lib" or "share". Move the function
	before the inclusion of gtkprivate.h so that it sees the original
	GTK_LOCALEDIR.

	* gtk-zip.sh.in: Check whether the message catalogs are in
	share/locale or lib/locale.

190 191 192
	* config.h.win32.in: Tack on "/share/locale" to GTK_LOCALEDIR so
	that the code in _gtk_get_localedir() will find the slashes.

193 194 195 196 197 198
2007-11-28  Tor Lillqvist  <tml@novell.com>

	* gtk/Makefile.am: Improve portability. The -o option is present
	only in newish GNU egreps. Use one more sed in the pipeline
	instead.

199 200 201 202 203 204 205 206 207 208 209 210
2007-11-28  Tor Lillqvist  <tml@novell.com>

	Fix #375893, patch by Ben Hague:

	* gtk/gtkfilesystemwin32.c (get_viewable_logical_drives): Wrapper
	around GetLogicalDrives() that takes also the viewable drive
	restrictions in the Registry (which are usually the result of an
	Active Directory Group Policy) into account.

	(check_volumes, gtk_file_system_win32_list_volumes) Call
	get_viewable_logical_drives() instead of GetLogicalDrives().

211 212 213 214 215
2007-11-27  Matthias Clasen <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_move_resize): Zero some
	variables to silence valgrind.  (#495124, Morten Welinder)

216 217 218 219 220 221 222 223 224 225 226 227 228
2006-11-26  Ryan Lortie  <desrt@desrt.ca>

	* docs/reference/gtk/tmpl/gtkbuildable.sgml: add clarification stating
	that the construct_child function is responsible for returning a
	reference.
	* gtkbuilder.c (_gtk_builder_construct): remove g_object_ref() for
	objects from constructors
	* gtkuimanager.c (gtk_ui_manager_buildable_construct_child): add
	g_object_ref() to this construction function (it's the only
	implementer in GTK)

	Fixes #496645.

229 230 231 232 233
2006-11-26  Ryan Lortie  <desrt@desrt.ca>

	* gtkbuilder.c: remove concept of root objects and just refcount
	all objects in the builder.  Fixes #496651.

Allison Karlitskaya's avatar
Allison Karlitskaya committed
234 235 236 237
2007-11-26  Ryan Lortie  <desrt@desrt.ca>

	* tests/buildertest.c (test_window): fix invalid free

238 239 240 241 242 243 244 245 246 247 248 249 250 251 252
2007-11-26  Josselin Mouette <joss@malsain.org>

	reviewed by: Federico Mena Quintero

	* gtk/gtkfilechooserdefault.c: (shortcuts_append_paths),
	(shortcuts_add_bookmarks), (shortcuts_selection_changed_cb),
	(shortcuts_list_create), (gtk_file_chooser_default_should_respond):
	Make the shortcuts activate with a single click. (#148828)
        Fix a few things affected by the change:
	  - Set selection mode to GTK_SELECTION_SINGLE to allow a case 
	    where no shortcut is selected.
	  - Don't activate a shortcut in the response callback.
	  - Filter out duplicate entries in volumes and bookmarks to 
	    avoid the selection to change when reordering them with DnD.

253 254 255 256 257 258 259 260 261
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c:
	* gtk/gtknotebook.c:
	* gtk/gtkplugprivate.h:
	* gtk/gtksocket.c:
	* gtk/gtksocketprivate.h:
	* gtk/gtktable.c: Fix up some doc comments to shut up gtk-doc.

262 263 264 265 266
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config.
	(#495574, Richard Hult)

267 268 269 270 271
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprintunixdialog.c: Change some labels to be clearer.
	String change !   (#376361, Sven Neumann)

272 273 274 275 276 277 278
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_update_labels): Short-circuit on
	destroy.
	(gtk_notebook_destroy): Destroy tab_label widgets. (#388321, Morten
	Welinder)

279 280 281 282 283
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkassistant.c: Improve alternative button
	ordering.  (#476827, Yevgen Muntyan, patch by Carlos Garnacho)

284 285 286 287 288
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcalendar.c: Fix a theming problem with colors
	in GtkCalendar.  (#499703, Michael Hofmann)

Matthias Clasen's avatar
Matthias Clasen committed
289 290 291 292
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Bump glib requirement to 2.15.0 (for g_test_init)

293 294 295 296 297 298 299 300 301 302 303 304 305 306 307
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	Use templates for glib-mkenums calls instead of 
	complicated commandlines in Makefiles.  (#429910)

	* gdk-pixbuf/Makefile.am:
	* gdk/Makefile.am: 
	* gtk/Makefile.am: 
	* perf/Makefile.am: Use templates for glib-mkenums

	* gdk-pixbuf/gdk-pixbuf-enum-types.[ch].template:
	* gdk/gdkenumtypes.[ch].template: 
	* gtk/gtktypebuiltings.[ch].template: 
	* perf/typebuiltins.[ch].template: The templates

308 309 310 311 312 313
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c:
	* gtk/gtktoolbar.c: Don't use guint8 for bitfields, since
	some compilers choke on that.  (#467722)

314 315 316 317 318
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_website): Add a note
	about hook setup.  (#425004, Emmanuele Bassi)

319 320 321 322 323 324
2007-11-26  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkwindow-win32.c (gdk_window_fullscreen): Use the
	monitor the window currently is on, not always the primary
	monitor. (#463865, Tim Evans)

325 326 327 328 329 330
2007-11-26  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdktestutils-win32.c: New file, dummy implementations.

	* gdk/win32/Makefile.am: Add it.

331 332 333 334
2007-11-26  Tor Lillqvist  <tml@novell.com>

	* configure.in: Don't add jasper to all_loaders if no libjasper.

335 336 337 338 339
2007-11-25  Bastien Nocera  <hadess@hadess.net>

	* configure.in: Add detection for libjasper, used by the
	gdk-pixbuf JPEG2000 loader

Matthias Clasen's avatar
Matthias Clasen committed
340 341 342 343 344 345
2007-11-25  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Require gtk-doc 1.8

	* */*.c: Use gtk-doc abbreviations for examples in docs.

Matthias Clasen's avatar
Matthias Clasen committed
346 347 348 349 350
2007-11-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_set_show_expanders): Fix a
	typo.  (#498922)

351 352 353 354 355 356
2007-11-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkdialog.c: Move signal and property documentation inline,
	fix a problem with the ::response signal docs.  (#499133, Josselin
	Mouette)

357 358 359 360 361 362 363 364
2007-11-22 15:48:26  Tim Janik  <timj@imendio.com>

        * Makefile.decl: initialize automake variables EXTRA_DIST and
	TEST_PROGS for unconditional appending via += in other makefiles.
	define recursive test targets: test, test-report, perf-report,
	full-report, as described here:
      http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html
	the test targets will execute Gtk+ test programs within an Xvfb session.
365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394

        * gtk/gtktestutils.c: call g_test_init() from gtk_test_init().

        * gtk/tests/testing.c: use g_test_add_func() to register tests and use
	g_test_run() to run the tests to integrate with the testing framework.

        * gtk/tests/Makefile.am: removed exemplary testing rules.

        * Makefile.am, gtk/tests/Makefile.am, gtk/Makefile.am:
        * gtk/xdgmime/Makefile.am, gtk/theme-bits/Makefile.am:
        * tests/Makefile.am, docs/reference/gdk-pixbuf/Makefile.am:
        * docs/reference/gdk/Makefile.am, docs/reference/gtk/Makefile.am:
        * docs/reference/Makefile.am, docs/tools/Makefile.am:
        * docs/tutorial/Makefile.am, docs/faq/Makefile.am, docs/Makefile.am:
        * gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/Makefile.am:
        * demos/gtk-demo/Makefile.am, demos/Makefile.am:
        * modules/input/Makefile.am, modules/printbackends/file/Makefile.am:
        * modules/printbackends/test/Makefile.am, modules/printbackends/Makefile.am:
        * modules/printbackends/cups/Makefile.am, modules/printbackends/lpr/Makefile.am:
        * modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am:
        * modules/engines/ms-windows/Theme/Makefile.am:
        * modules/engines/ms-windows/Makefile.am:
        * modules/engines/Makefile.am,  modules/engines/pixbuf/Makefile.am:
        * modules/Makefile.am, m4macros/Makefile.am, perf/Makefile.am:
        * contrib/Makefile.am, contrib/gdk-pixbuf-xlib/Makefile.am:
        * gdk/directfb/Makefile.am, gdk/linux-fb/Makefile.am:
        * gdk/quartz/Makefile.am, gdk/win32/rc/Makefile.am:
        * gdk/win32/Makefile.am, gdk/x11/Makefile.am, gdk/Makefile.am:
	include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments.

395 396 397 398 399
2007-11-22  Matthias Clasen  <mclasen@redhat.com>

	* modules/printbackends/cups/gtkcupsutils.c: Fix a casting problem.
	(#485662, patch by Herbert Valerio Riedel)

400 401 402 403
2007-11-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextiter.c: Fix an aliasing problem.  (#347585, Ed Catmur)

404 405 406 407 408
2007-11-21  Richard Hult  <richard@imendio.com>

	* gdk/quartz/Makefile.am: * gdk/quartz/gdktestutils-quartz.c: Add
	stubs for the testing functions to fix the build.

409 410 411 412 413
2007-11-21  Behdad Esfahbod  <behdad@gnome.org>

	* tests/testrichtext.c (setup_buffer): Fix C89 compilation issue.
	(#467711, The Written Word)

414 415 416 417 418
2007-11-21  Ross Burton  <ross@openedhand.com>

	* gdk/x11/gdksettings.c:
	Add xsetting for gtk-scrolled-window-placement (#458103).

419 420 421 422 423 424
2007-11-21  Behdad Esfahbod  <behdad@gnome.org>

	* gtk/gtkmenuitem.c (gtk_menu_item_class_init),
	(gtk_menu_item_paint): Make GtkMenuItem's arrow size themeable.
	(#469239, Michael Natterer)

425 426 427 428 429 430 431
2007-11-21  Behdad Esfahbod  <behdad@gnome.org>

	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): Add
	Gtk/EnableAccels and Gtk/EnableMnemonics xsettings for
	gtk-enable-accels and gtk-enable-mnemonics GtkSettings respectively.
	(#436536, Tommi Komulainen)

432 433 434 435 436
2007-11-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktoolbar.c: Fix the default value of the toolbar-style
	property.  (#489782, Jan Janech)

437 438 439 440 441
2007-11-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.c (animation_timeout): Avoid drawing one too many
	frames.  (#107398, Owen Taylor, Miguel Gomez)

442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501
Tue Nov 20 15:19:42 2007 +0100 Tim Janik

	Moved Gdk test functions from Gtk+ to Gdk test utils.

	* gdk/Makefile.am: added gdktestutils.h to public includes.

	* gdk/gdk.h: added gdktestutils.h to public includes.

	* gdk/gdk.symbols: added gdk_test_simulate_button, gdk_test_simulate_key,
	gdk_test_render_sync.

	* gdk/gdktestutils.h: new file, added prototypes for gdk_test_simulate_button,
	gdk_test_simulate_key, gdk_test_render_sync.

	* gdk/x11/Makefile.am: build gdktestutils-x11.c.

	* gdk/x11/gdktestutils-x11.c: implemented gdk_test_simulate_button,
	gdk_test_simulate_key, gdk_test_render_sync.

	* gtk/gtktestutils.c:
	* gtk/gtktestutils.h:
	* gtk/gtk.symbols: removed gtk_test_simulate_button
	gtk_test_simulate_key, gtk_test_xserver_render_sync.

	* gtk/tests/testing.c: call gdk_test_render_sync.

Thu Nov 15 13:11:39 2007 +0100 Tim Janik

	Added unit tests for Gtk+ testing utilities.

	* gtk/tests/testing.c: added a sample test program that tests Gtk+ test
	utility functions. some g_test_* related portions are disabled and need
	to be enabled once Gtk+ depends on a new glib with the GLib testing
	framework integrated.

	* gtk/tests/Makefile.am: new subdirectory to include quick Gtk+ tests.
	added exemplary test rules to run tests inside Xvfb. this needs to depend
	on gtester for full fledged testing.

	* gtk/Makefile.am: build gtk+/gtk/tests, define -DGTK_ENABLE_BROKEN when
	collecting _get_type functions to catch e.g. gtk_text_get_type().

	* configure.in: create gtk/tests/Makefile.in and gtk/tests/Makefile.

Thu Nov 15 11:55:34 2007 +0100 Tim Janik

	Added Gtk+ testing utilities.

	* gtk/gtktestutils.h, gtk/gtktestutils.c: added unit test utility functions.
	for the most part, the functions herein involve navigating and interacting
	with dialog elements programatically, to automate user interaction tests of
	dialogs and widgets.

	* gtk/gtk.h: include gtk/gtktestutils.h as public API.

	* gtk/gtk.symbols: added gtk_test_* symbols.

	* gtk/Makefile.am: include gtktestutils.h and gtktestutils.c into the build.
	generate gtktypefuncs.c which contains a list of all _get_type functions in
	Gtk+ and Gdk.
502 503 504 505 506
2007-11-20  Bastien Nocera  <hadess@hadess.net>

	* configure.in: add support for conditional icns gdk-pixbuf loader
	(Closes: #395738)

507 508 509 510 511 512 513 514
2007-11-19 10:31:26  Tim Janik  <timj@imendio.com>

	* configure.in: updated version number to 2.15.0 for development.

2007-11-19 10:27:39  Tim Janik  <timj@imendio.com>

	=== Branch for 2.12 ===