Commit a1427c71 authored by Jasper St. Pierre's avatar Jasper St. Pierre
Browse files

Revert "Move MetaGroup to be X11-specific"

This reverts commit f940292c.

Turns out MetaGroup was public API and was used by gnome-shell.
Ugh.
parent 91ad92c9
......@@ -176,10 +176,11 @@ libmutter_wayland_la_SOURCES = \
x11/iconcache.h \
x11/async-getprop.c \
x11/async-getprop.h \
x11/group-private.h \
x11/group-props.c \
x11/group-props.h \
x11/group.c \
x11/group.h \
meta/group.h \
x11/session.c \
x11/session.h \
x11/window-props.c \
......@@ -228,6 +229,7 @@ libmutterinclude_base_headers = \
meta/display.h \
meta/errors.h \
meta/gradient.h \
meta/group.h \
meta/keybindings.h \
meta/main.h \
meta/meta-background-actor.h \
......
......@@ -30,12 +30,13 @@
#include "window-private.h"
#include <meta/errors.h>
#include "frame.h"
#include <meta/group.h>
#include <meta/prefs.h>
#include <meta/workspace.h>
#include <X11/Xatom.h>
#include "x11/group.h"
#include "x11/group-private.h"
#define WINDOW_HAS_TRANSIENT_TYPE(w) \
(w->type == META_WINDOW_DIALOG || \
......
......@@ -44,7 +44,7 @@
#include <clutter/clutter.h>
#include "x11/iconcache.h"
#include "x11/group.h"
#include "x11/group-private.h"
#include "wayland/meta-wayland-types.h"
......
......@@ -39,6 +39,7 @@
#include "ui.h"
#include "place.h"
#include <meta/prefs.h>
#include <meta/group.h>
#include "resizepopup.h"
#include "constraints.h"
#include "mutter-enum-types.h"
......@@ -58,7 +59,6 @@
#include "x11/window-x11.h"
#include "x11/window-props.h"
#include "x11/xprops.h"
#include "x11/group.h"
#include "x11/session.h"
#include "wayland/meta-wayland-private.h"
......
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* Mutter window group private header */
/* Mutter window groups */
/*
/*
* Copyright (C) 2002 Red Hat Inc.
*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
......@@ -14,7 +14,7 @@
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
......@@ -26,21 +26,9 @@
#include <glib.h>
#include <meta/types.h>
typedef struct _MetaGroup MetaGroup;
struct _MetaGroup
{
int refcount;
MetaDisplay *display;
GSList *windows;
Window group_leader;
char *startup_id;
char *wm_client_machine;
};
/* note, can return NULL */
MetaGroup* meta_window_get_group (MetaWindow *window);
void meta_window_compute_group (MetaWindow *window);
void meta_window_compute_group (MetaWindow* window);
void meta_window_shutdown_group (MetaWindow *window);
void meta_window_group_leader_changed (MetaWindow *window);
......@@ -61,3 +49,7 @@ gboolean meta_group_property_notify (MetaGroup *group,
XEvent *event);
#endif
......@@ -30,6 +30,11 @@ typedef struct _MetaFrame MetaFrame;
typedef struct _MetaScreen MetaScreen;
typedef struct _MetaWindow MetaWindow;
typedef struct _MetaWorkspace MetaWorkspace;
/**
* MetaGroup: (skip)
*
*/
typedef struct _MetaGroup MetaGroup;
typedef struct _MetaKeyBinding MetaKeyBinding;
typedef struct _MetaCursorTracker MetaCursorTracker;
......
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* Mutter window group private header */
/*
* Copyright (C) 2002 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef META_GROUP_PRIVATE_H
#define META_GROUP_PRIVATE_H
#include <meta/group.h>
struct _MetaGroup
{
int refcount;
MetaDisplay *display;
GSList *windows;
Window group_leader;
char *startup_id;
char *wm_client_machine;
};
#endif
......@@ -21,6 +21,7 @@
#include <config.h>
#include "group-props.h"
#include "group-private.h"
#include "xprops.h"
#include <X11/Xatom.h>
......
......@@ -22,7 +22,7 @@
#ifndef META_GROUP_PROPS_H
#define META_GROUP_PROPS_H
#include "group.h"
#include <meta/group.h>
#include "window-private.h"
void meta_group_reload_property (MetaGroup *group,
......
......@@ -27,7 +27,7 @@
#include <config.h>
#include <meta/util.h>
#include "group.h"
#include "group-private.h"
#include "group-props.h"
#include "window-private.h"
#include <meta/window.h>
......
......@@ -44,7 +44,7 @@
#include <meta/errors.h>
#include "xprops.h"
#include "frame.h"
#include "group.h"
#include <meta/group.h>
#include <X11/Xatom.h>
#include <unistd.h>
#include <string.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment