Bump version to 3.11.2

Update NEWS.
doc: Fix file globs
2013-11-13 20:50:11 +01:00 · 2013-11-13 20:49:52 +01:00 · 2013-11-09 11:46:01 -05:00 · 2013-11-05 09:15:23 -05:00 · 2013-11-04 10:39:49 -05:00 · 2013-11-04 13:52:06 +00:00
7 changed files with 22 additions and 18 deletions
--- a/10
+++ b/10
@@ -1,9 +1,17 @@
+3.11.2
+======
+* Fix resize operations using mouse-button-modifier [Lionel; #710251]
+* Misc. fixes and cleanups [Jasper, Rico, Florian; #711731]
+
+Contributors:
+  Lionel Landwerlin, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz
+
 3.11.1
 ======
 * Don't require at least one output device to be connected [Giovanni; #709009]
 * Name the guard window [Andrew; #710346]
 * Use new UPower API [Bastien]
-* Expose min-backlight-stea [Asad; #710380]
+* Expose min-backlight-step [Asad; #710380]
 * Don't focus the no-focus-window for globally active windows [Jasper; #710296]
 * Misc. fixes and cleanups [Jasper, Rico, Olav, Magdalen; #709776]

--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [11])
-m4_define([mutter_micro_version], [1])
+m4_define([mutter_micro_version], [2])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -49,8 +49,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h
-CFILE_GLOB=$(top_srcdir)/src/*.c
+HFILE_GLOB=$(top_srcdir)/src/*/*.h
+CFILE_GLOB=$(top_srcdir)/src/*/*.c

 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,7 +168,9 @@ libmutter_la_SOURCES =				\
 	ui/theme.c				\
 	meta/theme.h				\
 	ui/theme-private.h			\
-	ui/ui.c					\
+	ui/ui.c
+
+nodist_libmutter_la_SOURCES =			\
 	$(mutter_built_sources)

 libmutter_la_LDFLAGS = -no-undefined
@@ -249,7 +251,7 @@ Meta-$(api_version).gir: libmutter.la
@META_GIR@_FILES =				\
 	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_la_SOURCES))
+	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error

 endif
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -685,15 +685,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  clutter_actor_add_child (info->stage, info->window_group);
  clutter_actor_add_child (info->stage, info->top_window_group);

-  info->plugin_mgr = meta_plugin_manager_new (screen);
-
-  /*
-   * Delay the creation of the overlay window as long as we can, to avoid
-   * blanking out the screen. This means that during the plugin loading, the
-   * overlay window is not accessible; if the plugin needs to access it
-   * directly, it should hook into the "show" signal on stage, and do
-   * its stuff there.
-   */
  info->output = get_output_window (screen);
  XReparentWindow (xdisplay, xwin, info->output, 0, 0);

@@ -714,6 +705,8 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
      info->pending_input_region = None;
    }

+  info->plugin_mgr = meta_plugin_manager_new (screen);
+
  /* Map overlay window before redirecting windows offscreen so we catch their
   * contents until we show the stage.
   */
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -859,9 +859,9 @@ meta_screen_free (MetaScreen *screen,
                  screen->wm_sn_selection_window);
  
  if (screen->work_area_later != 0)
-    g_source_remove (screen->work_area_later);
+    meta_later_remove (screen->work_area_later);
  if (screen->check_fullscreen_later != 0)
-    g_source_remove (screen->check_fullscreen_later);
+    meta_later_remove (screen->check_fullscreen_later);

  if (screen->monitor_infos)
    g_free (screen->monitor_infos);
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -9706,7 +9706,8 @@ meta_window_handle_mouse_grab_op_event (MetaWindow *window,
  switch (xev->evtype)
    {
    case XI_ButtonRelease:
-      if (xev->detail == 1)
+      if (xev->detail == 1 ||
+          xev->detail == meta_prefs_get_mouse_button_resize ())
        {
          meta_display_check_threshold_reached (window->display,
                                                xev->root_x,
Author	SHA1	Message	Date
Florian Müllner	21c46852cd	Bump version to 3.11.2 Update NEWS.	2013-11-13 20:50:11 +01:00
Florian Müllner	10036832dd	doc: Fix file globs Any files matching the previously used globs are no longer distributed, breaking distcheck. Match the actual sources in compositor/, core/, meta/ and ui/ instead.	2013-11-13 20:49:52 +01:00
Jasper St. Pierre	25b5ea8b4f	screen: Laters are not GSources This warns with the new GLib when we destroy the screen. https://bugzilla.gnome.org/show_bug.cgi?id=711731	2013-11-09 11:46:01 -05:00
Jasper St. Pierre	20beaf7fe1	compositor: Clean up comment So it seems that we were intentionally delaying the output window, although I wonder why...	2013-11-05 09:15:23 -05:00
Jasper St. Pierre	e72af50420	compositor: Initialize the plugin manager after initializing the output window Plugins like gnome-shell may want to grab the output window immediately before bouncing back to the mainloop.	2013-11-04 10:39:49 -05:00
Lionel Landwerlin	ef4417b717	window: don't ignore resize button release event for move/resize actions https://bugzilla.gnome.org/show_bug.cgi?id=710251	2013-11-04 13:52:06 +00:00
Rico Tzschichholz	cf943627e2	build: Make sure built-sources are introspected as needed	2013-10-31 00:09:15 +01:00
Rico Tzschichholz	96543cb009	build: Do not ship generated source-files in tarball	2013-10-30 23:42:12 +01:00
Florian Müllner	fbb2207f8c	Fix typo	2013-10-30 17:14:16 +01:00