Add _DBUS_UNIQUE_NAME and _OBJECT_PATH properties

https://bugzilla.gnome.org/show_bug.cgi?id=664851
Load _DBUS_APPLICATION_ID property, expose it via API
2011-12-05 12:54:29 -05:00 · 2011-12-05 12:52:29 -05:00
28 changed files with 1728 additions and 1607 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ libtool
 ltmain.sh
 missing
 .deps
-src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter.desktop
 *.o
--- a/20
+++ b/20
@@ -1,23 +1,3 @@
-3.3.3
-=====
-* Add keybindings for tiling to left or right [Florian; #648700]
-* Support GTK+'s hide-titlebar-when-maximized hint [Florian; #665617]
-* Load _DBUS_APPLICATION_ID, _DBUS_UNIQUE_NAME, _DBUS_OBJECT_PATH
-  property [Colin, Ryan; #664851]
-* Handle changes to workspaces-only-on-primary GSetting [Florian; #664853]
-* Don't use the Clutter default stage [Jasper; #664028]
-* Fix compilation with --disable-introspection [Lionel; #661871]
-* Fix problem where stage could end up mis-sized on startup with
-  multiple monitors [Lionel]
-* Misc bug fixes [Adel, Lionel, Jasper; #666015]
-
-Contributors:
- Adel Gadllah, Lionel Landwerlin, Florian Müllner, Jasper St. Pierre
-
-Translations:
- Daniel Mustieles [es], Yaron Shahrabani [he], Kjartan Maraas [nb],
- Matej Urbančič [sk], Muhammet Kara [tr]
-
 3.3.2
 =====

--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)

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

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/50-mutter-windows.xml.in
 src/compositor/compositor.c
 src/core/bell.c
 src/core/core.c
--- a/po/es.po
+++ b/po/es.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 22:59+0100\n"
-"PO-Revision-Date: 2011-12-14 22:59+0100\n"
+"POT-Creation-Date: 2011-12-01 20:27+0100\n"
+"PO-Revision-Date: 2011-12-01 20:29+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -15,18 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "View split on left"
-msgstr "Visning delt til venstre"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "View split on right"
-msgstr "Visning delt til høyre"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "Vinduer"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -70,12 +58,12 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tvungen nedstenging"

-#: ../src/core/display.c:361
+#: ../src/core/display.c:365
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Mangler utvidelsen %s som kreves for komposittfunksjon"

-#: ../src/core/display.c:427
+#: ../src/core/display.c:431
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"
@@ -184,12 +172,12 @@ msgstr ""
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"

-#: ../src/core/screen.c:730
+#: ../src/core/screen.c:741
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"

-#: ../src/core/screen.c:746
+#: ../src/core/screen.c:757
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -198,19 +186,19 @@ msgstr ""
 "Skjerm %d på display «%s» har allerede en vindushåndterer; prøv å bruke "
 "flagget --replace for å erstatte aktiv vindushåndterer.\n"

-#: ../src/core/screen.c:773
+#: ../src/core/screen.c:784
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Kunne ikke hente utvalg fra vinduhåndterer på skjerm %d, display «%s»\n"

-#: ../src/core/screen.c:828
+#: ../src/core/screen.c:839
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allerede en vinduhåndterer\n"

-#: ../src/core/screen.c:1013
+#: ../src/core/screen.c:1024
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunne ikke slippe skjerm %d på display «%s»\n"
@@ -430,11 +418,7 @@ msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
-msgstr ""
-"Maksimerer vinduer vertikalt og endrer størrelse horisontalt slik at de "
-"dekker halve det tilgjengeligeområdet hvis de slippes på vertikale "
-"skjermkanter. Hvis vindu slippes på øverste kant av skjermen maksimeres de "
-"fullstendig."
+msgstr "Maksimerer vinduer vertikalt og endrer størrelse horisontalt slik at de dekker halve det tilgjengeligeområdet hvis de slippes på vertikale skjermkanter. Hvis vindu slippes på øverste kant av skjermen maksimeres de fullstendig."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Live Hidden Windows"
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-16 13:21+0000\n"
-"PO-Revision-Date: 2011-12-16 21:47+0100\n"
+"POT-Creation-Date: 2011-11-22 00:22+0000\n"
+"PO-Revision-Date: 2011-11-25 20:53+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
@@ -23,18 +23,6 @@ msgstr ""
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"

-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "View split on left"
-msgstr "Poglej razdelek na levi"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "View split on right"
-msgstr "Poglej razdelek na desni"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "Okna"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -72,12 +60,12 @@ msgstr "_Počakaj"
 msgid "_Force Quit"
 msgstr "_Vsili konec"

-#: ../src/core/display.c:361
+#: ../src/core/display.c:365
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Manjka razširitev %s, ki je ključna za sestavljanje"

-#: ../src/core/display.c:427
+#: ../src/core/display.c:431
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
@@ -122,7 +110,7 @@ msgstr "Ni mogoče preiskati mape tem: %s\n"
 msgid "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr "Ni mogoče najti teme! Prepričajte se, da %s obstaja in vsebuje običajni zapis teme.\n"

-#: ../src/core/mutter.c:40
+#: ../src/core/mutter.c:42
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -135,11 +123,11 @@ msgstr ""
 "To je prosta programska oprema; za pogoje kopiranja si poglejte izvorno kodo.\n"
 "Program je na voljo BREZ KAKRŠNIHKOLI ZAGOTOVIL.\n"

-#: ../src/core/mutter.c:54
+#: ../src/core/mutter.c:56
 msgid "Print version"
 msgstr "Izpiši različico"

-#: ../src/core/mutter.c:60
+#: ../src/core/mutter.c:62
 msgid "Comma-separated list of compositor plugins"
 msgstr "Z vejico ločen seznam vstavkov sestavljanja"

@@ -168,27 +156,27 @@ msgstr "\"%s\", najden v podatkovni zbirki nastavitev, ni veljaven ključ za tip
 msgid "Workspace %d"
 msgstr "Delovna površina %d"

-#: ../src/core/screen.c:730
+#: ../src/core/screen.c:741
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"

-#: ../src/core/screen.c:746
+#: ../src/core/screen.c:757
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"
 msgstr "Zaslon %d na prikazu \"%s\" je že upravljan z upravljalnikom oken; poskušajte uporabiti možnost --replace za zamenjavo trenutnega.\n"

-#: ../src/core/screen.c:773
+#: ../src/core/screen.c:784
 #, c-format
 msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Ni mogoče dobiti izbire upravljalnika oken na zaslonu %d prikaza \"%s\"\n"

-#: ../src/core/screen.c:828
+#: ../src/core/screen.c:839
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Zaslon %d na prikazu \"%s\"  je že upravljan z upravljalnikom oken\n"

-#: ../src/core/screen.c:1013
+#: ../src/core/screen.c:1024
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Ni mogoče opustiti zaslona %d na prikazu \"%s\"\n"
@@ -288,7 +276,7 @@ msgid "Window manager error: "
 msgstr "Napaka upravljalnika oken: "

 #. first time through
-#: ../src/core/window.c:7180
+#: ../src/core/window.c:7124
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Okno %s nastavi svoj SM_CLIENT_ID, namesto, da bi nastavilo WM_CLIENT_LEADER kot je zavedeno v ICCCM.\n"
@@ -300,7 +288,7 @@ msgstr "Okno %s nastavi svoj SM_CLIENT_ID, namesto, da bi nastavilo WM_CLIENT_LE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7843
+#: ../src/core/window.c:7787
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Okno %s določi namig MWM, ki pove, da ni mogoče spremeniti velikosti, hkrati pa določi najmanjšo velikost na %d x %d in največjo na %d x %d; vrednost ni smiselna.\n"
--- a/po/tr.po
+++ b/po/tr.po
--- a/src/50-mutter-windows.xml.in
+++ b/src/50-mutter-windows.xml.in
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.mutter.keybindings"
-                group="system"
-                _name="Windows"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="toggle-tiled-left"
-                      _description="View split on left"/>
-
-	<KeyListEntry name="toggle-tiled-right"
-                      _description="View split on right"/>
-
-</KeyListEntries>
-
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,8 @@ INCLUDES=								\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"

 mutter_built_sources = \
+	mutter-marshal.h \
+	mutter-marshal.c \
 	mutter-enum-types.h \
 	mutter-enum-types.c

@@ -259,11 +261,6 @@ wmproperties_in_files=mutter-wm.desktop.in
 wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
 wmproperties_DATA = $(wmproperties_files)

-xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = \
-        50-mutter-windows.xml.in
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
-
 gsettings_SCHEMAS = org.gnome.mutter.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
@@ -282,7 +279,6 @@ CLEANFILES =					\
 	mutter.desktop				\
 	mutter-wm.desktop			\
 	org.gnome.mutter.gschema.xml		\
-	$(xml_DATA)				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)
@@ -299,18 +295,38 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(IMAGES) 			\
 	$(desktopfiles_in_files)	\
 	$(wmproperties_in_files)	\
-	$(xml_in_files)			\
 	org.gnome.mutter.gschema.xml.in \
 	mutter-schemas.convert \
 	libmutter.pc.in \
 	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
-	mutter-enum-types.c.in
+	mutter-enum-types.c.in \
+	mutter-marshal.list

 BUILT_SOURCES += $(mutter_built_sources)
-MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
+MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)

+mutter-marshal.h: stamp-mutter-marshal.h
+	@true
+stamp-mutter-marshal.h: Makefile mutter-marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--header \
+	$(srcdir)/mutter-marshal.list > xgen-tmh && \
+	(cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \
+	rm -f xgen-tmh && \
+	echo timestamp > $(@F)
+
+mutter-marshal.c: Makefile mutter-marshal.list
+	 $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
+	 $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--body \
+	 $(srcdir)/mutter-marshal.list ) > xgen-tmc && \
+	cp -f xgen-tmc mutter-marshal.c && \
+	rm -f xgen-tmc
+
 mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 	@true
 stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -515,15 +515,13 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  meta_screen_set_cm_selection (screen);

-  info->stage = clutter_stage_new ();
+  info->stage = clutter_stage_get_default ();

  meta_screen_get_size (screen, &width, &height);
-  clutter_actor_realize (info->stage);
+  clutter_actor_set_size (info->stage, width, height);

  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));

-  XResizeWindow (xdisplay, xwin, width, height);
-
  event_mask = FocusChangeMask |
               ExposureMask |
               EnterWindowMask | LeaveWindowMask |
@@ -1141,18 +1139,12 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,
 				  guint		   width,
 				  guint		   height)
 {
-  MetaDisplay    *display = meta_screen_get_display (screen);
-  MetaCompScreen *info    = meta_screen_get_compositor_data (screen);
-  Display        *xdisplay;
-  Window          xwin;
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);

  DEBUG_TRACE ("meta_compositor_sync_screen_size\n");
  g_return_if_fail (info);

-  xdisplay = meta_display_get_xdisplay (display);
-  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
-
-  XResizeWindow (xdisplay, xwin, width, height);
+  clutter_actor_set_size (info->stage, width, height);

  meta_background_actor_screen_size_changed (screen);

--- a/src/compositor/meta-shadow-factory.c
+++ b/src/compositor/meta-shadow-factory.c
@@ -442,7 +442,8 @@ meta_shadow_factory_class_init (MetaShadowFactoryClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -232,13 +232,15 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
    g_signal_new ("position-changed",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
+                  0, NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
  signals[SIZE_CHANGED] =
    g_signal_new ("size-changed",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
+                  0, NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

@@ -1253,24 +1255,19 @@ void
 meta_window_actor_set_redirected (MetaWindowActor *self, gboolean state)
 {
  MetaWindow *metaWindow = meta_window_actor_get_meta_window (self);
-  MetaDisplay *display = meta_window_get_display (metaWindow);

-  Display *xdisplay = meta_display_get_xdisplay (display);
+  Display *xdisplay = meta_display_get_xdisplay (meta_window_get_display (metaWindow));
  Window  xwin = meta_window_actor_get_x_window (self);

  if (state)
    {
-      meta_error_trap_push (display);
      XCompositeRedirectWindow (xdisplay, xwin, CompositeRedirectManual);
-      meta_error_trap_pop (display);
      meta_window_actor_queue_create_pixmap (self);
      self->priv->unredirected = FALSE;
    }
  else
    {
-      meta_error_trap_push (display);
      XCompositeUnredirectWindow (xdisplay, xwin, CompositeRedirectManual);
-      meta_error_trap_pop (display);
      self->priv->unredirected = TRUE;
    }
 }
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -439,13 +439,9 @@ setup_constraint_info (ConstraintInfo      *info,
                                         monitor_info->number);

  /* Workaround braindead legacy apps that don't know how to
-   * fullscreen themselves properly - don't get fooled by
-   * windows which hide their titlebar when maximized; that's
-   * not the same as fullscreen, even if there are no struts
-   * making the workarea smaller than the monitor.
+   * fullscreen themselves properly.
   */
  if (meta_prefs_get_force_fullscreen() &&
-      !window->hide_titlebar_when_maximized &&
      meta_rectangle_equal (new, &monitor_info->rect) &&
      window->has_fullscreen_func &&
      !window->fullscreen)
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -230,7 +230,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  display_signals[WINDOW_CREATED] =
@@ -238,7 +239,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1, META_TYPE_WINDOW);

  display_signals[WINDOW_DEMANDS_ATTENTION] =
@@ -246,7 +248,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1, META_TYPE_WINDOW);

  display_signals[WINDOW_MARKED_URGENT] =
@@ -254,7 +257,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  META_TYPE_WINDOW);

--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -3232,46 +3232,6 @@ handle_toggle_above       (MetaDisplay    *display,
    meta_window_make_above (window);
 }

-static void
-handle_toggle_tiled (MetaDisplay    *display,
-                     MetaScreen     *screen,
-                     MetaWindow     *window,
-                     XEvent         *event,
-                     MetaKeyBinding *binding,
-                     gpointer        dummy)
-{
-  MetaTileMode mode = binding->handler->data;
-
-  if ((META_WINDOW_TILED_LEFT (window) && mode == META_TILE_LEFT) ||
-      (META_WINDOW_TILED_RIGHT (window) && mode == META_TILE_RIGHT))
-    {
-      window->tile_monitor_number = window->saved_maximize ? window->monitor->number
-                                                           : -1;
-      window->tile_mode = window->saved_maximize ? META_TILE_MAXIMIZED
-                                                 : META_TILE_NONE;
-
-      if (window->saved_maximize)
-        meta_window_maximize (window, META_MAXIMIZE_VERTICAL |
-                                      META_MAXIMIZE_HORIZONTAL);
-      else
-        meta_window_unmaximize (window, META_MAXIMIZE_VERTICAL |
-                                        META_MAXIMIZE_HORIZONTAL);
-    }
-  else if (meta_window_can_tile_side_by_side (window))
-    {
-      window->tile_monitor_number = window->monitor->number;
-      window->tile_mode = mode;
-      /* Maximization constraints beat tiling constraints, so if the window
-       * is maximized, tiling won't have any effect unless we unmaximize it
-       * horizontally first; rather than calling meta_window_unmaximize(),
-       * we just set the flag and rely on meta_window_tile() syncing it to
-       * save an additional roundtrip.
-       */
-      window->maximized_horizontally = FALSE;
-      meta_window_tile (window);
-    }
-}
-
 static void
 handle_toggle_maximized    (MetaDisplay    *display,
                           MetaScreen     *screen,
@@ -3929,20 +3889,6 @@ init_builtin_key_bindings (MetaDisplay *display)
                          META_KEYBINDING_ACTION_TOGGLE_MAXIMIZED,
                          handle_toggle_maximized, 0);

-  add_builtin_keybinding (display,
-                          "toggle-tiled-left",
-                          SCHEMA_MUTTER_KEYBINDINGS,
-                          META_KEY_BINDING_PER_WINDOW,
-                          META_KEYBINDING_ACTION_TOGGLE_TILED_LEFT,
-                          handle_toggle_tiled, META_TILE_LEFT);
-
-  add_builtin_keybinding (display,
-                          "toggle-tiled-right",
-                          SCHEMA_MUTTER_KEYBINDINGS,
-                          META_KEY_BINDING_PER_WINDOW,
-                          META_KEYBINDING_ACTION_TOGGLE_TILED_RIGHT,
-                          handle_toggle_tiled, META_TILE_RIGHT);
-
  add_builtin_keybinding (display,
                          "toggle-above",
                          SCHEMA_COMMON_KEYBINDINGS,
--- a/src/core/mutter.c
+++ b/src/core/mutter.c
@@ -25,7 +25,9 @@

 #include <meta/main.h>
 #include <meta/util.h>
+#ifdef HAVE_INTROSPECTION
 #include "meta-plugin-manager.h"
+#endif

 #include <glib.h>

--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -914,8 +914,6 @@ do_override (char *key,
  detailed_signal = g_strdup_printf ("changed::%s", key);
  handler_id = g_signal_connect (settings, detailed_signal,
                                 G_CALLBACK (settings_changed), NULL);
-  g_free (detailed_signal);
-
  g_object_set_data (G_OBJECT (settings), key, GUINT_TO_POINTER (handler_id));

  settings_changed (settings, key, NULL);
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -39,6 +39,7 @@
 #include "stack.h"
 #include "xprops.h"
 #include <meta/compositor.h>
+#include "mutter-marshal.h"
 #include "mutter-enum-types.h"

 #ifdef HAVE_SOLARIS_XINERAMA
@@ -161,7 +162,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaScreenClass, restacked),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  pspec = g_param_spec_int ("n-workspaces",
@@ -175,7 +177,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__INT,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_INT);
@@ -185,7 +188,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__INT,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_INT);
@@ -195,7 +199,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_INT_ENUM,
                  G_TYPE_NONE,
                  3,
                  G_TYPE_INT,
@@ -207,7 +212,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_OBJECT,
                  G_TYPE_NONE, 2,
                  G_TYPE_INT,
                  META_TYPE_WINDOW);
@@ -217,7 +223,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_OBJECT,
                  G_TYPE_NONE, 2,
                  G_TYPE_INT,
                  META_TYPE_WINDOW);
@@ -227,7 +234,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__POINTER,
                  G_TYPE_NONE, 1, G_TYPE_POINTER);

  screen_signals[TOGGLE_RECORDING] =
@@ -235,7 +243,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  screen_signals[WORKAREAS_CHANGED] =
@@ -243,7 +252,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaScreenClass, workareas_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  screen_signals[MONITORS_CHANGED] =
@@ -251,7 +261,8 @@ meta_screen_class_init (MetaScreenClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (MetaScreenClass, monitors_changed),
-          NULL, NULL, NULL,
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);

  g_object_class_install_property (object_class,
@@ -1554,7 +1565,7 @@ static void
 update_num_workspaces (MetaScreen *screen,
                       guint32     timestamp)
 {
-  int new_num, old_num;
+  int new_num;
  GList *tmp;
  int i;
  GList *extras;
@@ -1584,7 +1595,6 @@ update_num_workspaces (MetaScreen *screen,
      ++i;
      tmp = tmp->next;
    }
-  old_num = i;

  g_assert (last_remaining);
  
@@ -1619,22 +1629,22 @@ update_num_workspaces (MetaScreen *screen,

      g_assert (w->windows == NULL);
      meta_workspace_remove (w);
-
+      
      tmp = tmp->next;
    }
-
+  
  g_list_free (extras);
-
-  for (i = old_num; i < new_num; i++)
-    meta_workspace_new (screen);
+  
+  while (i < new_num)
+    {
+      meta_workspace_new (screen);
+      ++i;
+    }

  set_number_of_spaces_hint (screen, new_num);

  meta_screen_queue_workarea_recalc (screen);

-  for (i = old_num; i < new_num; i++)
-    g_signal_emit (screen, screen_signals[WORKSPACE_ADDED], 0, i);
-
  g_object_notify (G_OBJECT (screen), "n-workspaces");
 }

--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -105,7 +105,6 @@ struct _MetaWindow
  char *dbus_unique_name;
  char *dbus_object_path;

-  int hide_titlebar_when_maximized;
  int net_wm_pid;
  
  Window xtransient_for;
@@ -134,9 +133,6 @@ struct _MetaWindow
   * this is the current mode. If not, it is the mode which will be
   * requested after the window grab is released */
  guint tile_mode : 2;
-  /* The last "full" maximized/unmaximized state. We need to keep track of
-   * that to toggle between normal/tiled or maximized/tiled states. */
-  guint saved_maximize : 1;
  int tile_monitor_number;

  /* Whether we're shaded */
@@ -658,6 +654,5 @@ void meta_window_propagate_focus_appearance (MetaWindow *window,
                                             gboolean    focused);

 gboolean meta_window_should_attach_to_parent (MetaWindow *window);
-gboolean meta_window_can_tile_side_by_side   (MetaWindow *window);

 #endif
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1578,39 +1578,14 @@ reload_gtk_theme_variant (MetaWindow    *window,
                    requested_variant, window->desc);
    }

-  if (g_strcmp0 (requested_variant, current_variant) != 0)
+  if (g_strcmp0 (requested_variant, current_variant))
    {
      g_free (current_variant);

-      window->gtk_theme_variant = g_strdup (requested_variant);
-
-      if (window->frame)
-        meta_ui_update_frame_style (window->screen->ui, window->frame->xwindow);
-    }
-}
-
-static void
-reload_gtk_hide_titlebar_when_maximized (MetaWindow    *window,
-                                         MetaPropValue *value,
-                                         gboolean       initial)
-{
-  gboolean requested_value = FALSE;
-  gboolean current_value = window->hide_titlebar_when_maximized;
-
-  if (value->type != META_PROP_VALUE_INVALID)
-    {
-      requested_value = ((int) value->v.cardinal == 1);
-      meta_verbose ("Request to hide titlebar for window %s.\n", window->desc);
-    }
-
-  if (requested_value == current_value)
-    return;
-
-  window->hide_titlebar_when_maximized = requested_value;
-
-  if (META_WINDOW_MAXIMIZED (window))
-    {
-      meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
+      if (requested_variant)
+        window->gtk_theme_variant = g_strdup (requested_variant);
+      else
+        window->gtk_theme_variant = NULL;

      if (window->frame)
        meta_ui_update_frame_style (window->screen->ui, window->frame->xwindow);
@@ -1628,7 +1603,7 @@ reload_dbus_application_id (MetaWindow    *window,
  if (value->type != META_PROP_VALUE_INVALID)
    new_id = value->v.str;

-  if (g_strcmp0 (new_id, current_id) != 0)
+  if (g_strcmp0 (new_id, current_id))
    {
      g_free (current_id);

@@ -1652,11 +1627,14 @@ reload_dbus_unique_name (MetaWindow    *window,
  if (value->type != META_PROP_VALUE_INVALID)
    new_id = value->v.str;

-  if (g_strcmp0 (new_id, current_id) != 0)
+  if (g_strcmp0 (new_id, current_id))
    {
      g_free (current_id);

-      window->dbus_unique_name = g_strdup (new_id);
+      if (new_id)
+        window->dbus_unique_name = g_strdup (new_id);
+      else
+        window->dbus_unique_name = NULL;

      g_object_notify ((GObject*)window, "dbus-unique-name");
    }
@@ -1673,11 +1651,14 @@ reload_dbus_object_path (MetaWindow    *window,
  if (value->type != META_PROP_VALUE_INVALID)
    new_path = value->v.str;

-  if (g_strcmp0 (new_path, current_path) != 0)
+  if (g_strcmp0 (new_path, current_path))
    {
      g_free (current_path);

-      window->dbus_object_path = g_strdup (new_path);
+      if (new_path)
+        window->dbus_object_path = g_strdup (new_path);
+      else
+        window->dbus_object_path = NULL;

      g_object_notify ((GObject*)window, "dbus-object-path");
    }
@@ -1736,7 +1717,6 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
    { display->atom__MOTIF_WM_HINTS,   META_PROP_VALUE_MOTIF_HINTS, reload_mwm_hints,      TRUE,  FALSE },
    { XA_WM_TRANSIENT_FOR,             META_PROP_VALUE_WINDOW,    reload_transient_for,    TRUE,  FALSE },
    { display->atom__GTK_THEME_VARIANT, META_PROP_VALUE_UTF8,     reload_gtk_theme_variant, TRUE, FALSE },
-    { display->atom__GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, META_PROP_VALUE_CARDINAL,     reload_gtk_hide_titlebar_when_maximized, TRUE, FALSE },
    { display->atom__DBUS_APPLICATION_ID, META_PROP_VALUE_UTF8,   reload_dbus_application_id, TRUE, FALSE },
    { display->atom__DBUS_UNIQUE_NAME, META_PROP_VALUE_UTF8,      reload_dbus_unique_name, TRUE, FALSE },
    { display->atom__DBUS_OBJECT_PATH, META_PROP_VALUE_UTF8,      reload_dbus_object_path, TRUE, FALSE },
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -468,7 +468,7 @@ meta_window_class_init (MetaWindowClass *klass)
  g_object_class_install_property (object_class,
                                   PROP_DBUS_APPLICATION_ID,
                                   g_param_spec_string ("dbus-application-id",
-                                                        "DBusApplicationID",
+                                                        "_DBUS_APPLICATION_ID",
                                                        "Contents of the _DBUS_APPLICATION_ID property of this window",
                                                        NULL,
                                                        G_PARAM_READABLE));
@@ -494,7 +494,8 @@ meta_window_class_init (MetaWindowClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaWindowClass, workspace_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__INT,
                  G_TYPE_NONE, 1,
                  G_TYPE_INT);

@@ -503,7 +504,8 @@ meta_window_class_init (MetaWindowClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaWindowClass, focus),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  window_signals[RAISED] =
@@ -511,7 +513,8 @@ meta_window_class_init (MetaWindowClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaWindowClass, raised),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  window_signals[UNMANAGED] =
@@ -519,7 +522,8 @@ meta_window_class_init (MetaWindowClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaWindowClass, unmanaged),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

@@ -3454,9 +3458,6 @@ meta_window_maximize_internal (MetaWindow        *window,
  else
    meta_window_save_rect (window);

-  if (maximize_horizontally && maximize_vertically)
-    window->saved_maximize = TRUE;
-
  window->maximized_horizontally =
    window->maximized_horizontally || maximize_horizontally;
  window->maximized_vertically =
@@ -3619,10 +3620,6 @@ meta_window_tile (MetaWindow *window)
                                       window,
                                       &old_rect,
                                       &new_rect);
-
-      if (window->frame)
-        meta_ui_queue_frame_draw (window->screen->ui,
-                                  window->frame->xwindow);
    }
  else
    {
@@ -3635,10 +3632,16 @@ meta_window_tile (MetaWindow *window)
 static gboolean
 meta_window_can_tile_maximized (MetaWindow *window)
 {
-  return window->has_maximize_func;
+  if (!META_WINDOW_ALLOWS_RESIZE (window))
+    return FALSE;
+
+  if (!window->has_maximize_func)
+    return FALSE;
+
+  return TRUE;
 }

-gboolean
+static gboolean
 meta_window_can_tile_side_by_side (MetaWindow *window)
 {
  const MetaMonitorInfo *monitor;
@@ -3717,9 +3720,6 @@ meta_window_unmaximize_internal (MetaWindow        *window,
  unmaximize_vertically   = directions & META_MAXIMIZE_VERTICAL;
  g_assert (unmaximize_horizontally || unmaximize_vertically);

-  if (unmaximize_horizontally && unmaximize_vertically)
-    window->saved_maximize = FALSE;
-
  /* Only do something if the window isn't already maximized in the
   * given direction(s).
   */
@@ -10539,8 +10539,7 @@ meta_window_get_frame_type (MetaWindow *window)
      /* can't add border if undecorated */
      return META_FRAME_TYPE_LAST;
    }
-  else if ((window->border_only && base_type != META_FRAME_TYPE_ATTACHED) ||
-           (window->hide_titlebar_when_maximized && META_WINDOW_MAXIMIZED (window)))
+  else if (window->border_only && base_type != META_FRAME_TYPE_ATTACHED)
    {
      /* override base frame type */
      return META_FRAME_TYPE_BORDER;
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -121,14 +121,16 @@ meta_workspace_class_init (MetaWorkspaceClass *klass)
                                        G_TYPE_FROM_CLASS (klass),
                                        G_SIGNAL_RUN_LAST,
                                        0,
-                                        NULL, NULL, NULL,
+                                        NULL, NULL,
+                                        g_cclosure_marshal_VOID__OBJECT,
                                        G_TYPE_NONE, 1,
                                        META_TYPE_WINDOW);
  signals[WINDOW_REMOVED] = g_signal_new ("window-removed",
                                          G_TYPE_FROM_CLASS (klass),
                                          G_SIGNAL_RUN_LAST,
                                          0,
-                                          NULL, NULL, NULL,
+                                          NULL, NULL,
+                                          g_cclosure_marshal_VOID__OBJECT,
                                          G_TYPE_NONE, 1,
                                          META_TYPE_WINDOW);

--- a/src/meta/atomnames.h
+++ b/src/meta/atomnames.h
@@ -59,7 +59,6 @@ item(_MUTTER_SET_KEYBINDINGS_MESSAGE)
 item(_MUTTER_TOGGLE_VERBOSE)
 item(_MUTTER_HINTS)
 item(_GTK_THEME_VARIANT)
-item(_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED)
 item(_DBUS_APPLICATION_ID)
 item(_DBUS_UNIQUE_NAME)
 item(_DBUS_OBJECT_PATH)
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -191,8 +191,6 @@ typedef enum _MetaKeyBindingAction
  META_KEYBINDING_ACTION_ACTIVATE_WINDOW_MENU,
  META_KEYBINDING_ACTION_TOGGLE_FULLSCREEN,
  META_KEYBINDING_ACTION_TOGGLE_MAXIMIZED,
-  META_KEYBINDING_ACTION_TOGGLE_TILED_LEFT,
-  META_KEYBINDING_ACTION_TOGGLE_TILED_RIGHT,
  META_KEYBINDING_ACTION_TOGGLE_ABOVE,
  META_KEYBINDING_ACTION_MAXIMIZE,
  META_KEYBINDING_ACTION_UNMAXIMIZE,
--- a/src/mutter-marshal.list
+++ b/src/mutter-marshal.list
@@ -0,0 +1,2 @@
+VOID:INT,INT,ENUM
+VOID:INT,OBJECT
--- a/src/org.gnome.mutter.gschema.xml.in
+++ b/src/org.gnome.mutter.gschema.xml.in
@@ -83,14 +83,6 @@
      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
    </key>

-    <key name="toggle-tiled-left" type="as">
-      <default><![CDATA[['<Super>Left']]]></default>
-    </key>
-
-    <key name="toggle-tiled-right" type="as">
-      <default><![CDATA[['<Super>Right']]]></default>
-    </key>
-
    <key name="tab-popup-select" type="as">
      <default>[]</default>
      <_summary>Select window from tab popup</_summary>
Author	SHA1	Message	Date
Ryan Lortie	393a80d434	Add _DBUS_UNIQUE_NAME and _OBJECT_PATH properties https://bugzilla.gnome.org/show_bug.cgi?id=664851	2011-12-05 12:54:29 -05:00
Colin Walters	a2f95e115c	Load _DBUS_APPLICATION_ID property, expose it via API This is used to associate GtkApplication -> X window, and will be consumed by gnome-shell. https://bugzilla.gnome.org/show_bug.cgi?id=664851	2011-12-05 12:52:29 -05:00