mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 08:00:42 -05:00
Remove unused public window-property functions
Simplify the set of window-property functions to remove the unused functions: meta_window_reload_properties_from_xwindow() meta_window_reload_properties() And to make: meta_window_reload_property() static. The code is considerably simplified by removing the plural variants. https://bugzilla.gnome.org/show_bug.cgi?id=587255
This commit is contained in:
parent
7938458eb8
commit
c02e1b6f56
@ -77,75 +77,39 @@ static MetaWindowPropHooks* find_hooks (MetaDisplay *display,
|
|||||||
Atom property);
|
Atom property);
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
meta_window_reload_property (MetaWindow *window,
|
|
||||||
Atom property,
|
|
||||||
gboolean initial)
|
|
||||||
{
|
|
||||||
meta_window_reload_properties (window, &property, 1, initial);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
meta_window_reload_properties (MetaWindow *window,
|
|
||||||
const Atom *properties,
|
|
||||||
int n_properties,
|
|
||||||
gboolean initial)
|
|
||||||
{
|
|
||||||
meta_window_reload_properties_from_xwindow (window,
|
|
||||||
window->xwindow,
|
|
||||||
properties,
|
|
||||||
n_properties,
|
|
||||||
initial);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
meta_window_reload_property_from_xwindow (MetaWindow *window,
|
meta_window_reload_property_from_xwindow (MetaWindow *window,
|
||||||
Window xwindow,
|
Window xwindow,
|
||||||
Atom property,
|
Atom property,
|
||||||
gboolean initial)
|
gboolean initial)
|
||||||
{
|
{
|
||||||
meta_window_reload_properties_from_xwindow (window, xwindow, &property, 1,
|
MetaPropValue value = { 0, };
|
||||||
initial);
|
MetaWindowPropHooks *hooks;
|
||||||
}
|
|
||||||
|
|
||||||
void
|
hooks = find_hooks (window->display, property);
|
||||||
meta_window_reload_properties_from_xwindow (MetaWindow *window,
|
if (!hooks)
|
||||||
Window xwindow,
|
return;
|
||||||
const Atom *properties,
|
|
||||||
int n_properties,
|
|
||||||
gboolean initial)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
MetaPropValue *values;
|
|
||||||
|
|
||||||
g_return_if_fail (properties != NULL);
|
init_prop_value (window, hooks, &value);
|
||||||
g_return_if_fail (n_properties > 0);
|
|
||||||
|
|
||||||
values = g_new0 (MetaPropValue, n_properties);
|
|
||||||
|
|
||||||
i = 0;
|
|
||||||
while (i < n_properties)
|
|
||||||
{
|
|
||||||
MetaWindowPropHooks *hooks = find_hooks (window->display, properties[i]);
|
|
||||||
init_prop_value (window, hooks, &values[i]);
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
|
|
||||||
meta_prop_get_values (window->display, xwindow,
|
meta_prop_get_values (window->display, xwindow,
|
||||||
values, n_properties);
|
&value, 1);
|
||||||
|
|
||||||
i = 0;
|
reload_prop_value (window, hooks, &value,
|
||||||
while (i < n_properties)
|
initial);
|
||||||
{
|
|
||||||
MetaWindowPropHooks *hooks = find_hooks (window->display, properties[i]);
|
|
||||||
reload_prop_value (window, hooks, &values[i], initial);
|
|
||||||
|
|
||||||
++i;
|
meta_prop_free_values (&value, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_prop_free_values (values, n_properties);
|
static void
|
||||||
|
meta_window_reload_property (MetaWindow *window,
|
||||||
g_free (values);
|
Atom property,
|
||||||
|
gboolean initial)
|
||||||
|
{
|
||||||
|
meta_window_reload_property_from_xwindow (window,
|
||||||
|
window->xwindow,
|
||||||
|
property,
|
||||||
|
initial);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -35,35 +35,6 @@
|
|||||||
|
|
||||||
#include "window-private.h"
|
#include "window-private.h"
|
||||||
|
|
||||||
/**
|
|
||||||
* meta_window_reload_property:
|
|
||||||
* @window: The window.
|
|
||||||
* @property: A single X atom.
|
|
||||||
*
|
|
||||||
* Requests the current values of a single property for a given
|
|
||||||
* window from the server, and deals with it appropriately.
|
|
||||||
* Does not return it to the caller (it's been dealt with!)
|
|
||||||
*/
|
|
||||||
void meta_window_reload_property (MetaWindow *window,
|
|
||||||
Atom property,
|
|
||||||
gboolean initial);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* meta_window_reload_properties:
|
|
||||||
* @window: The window.
|
|
||||||
* @properties: A pointer to a list of X atoms, "n_properties" long.
|
|
||||||
* @n_properties: The length of the properties list.
|
|
||||||
*
|
|
||||||
* Requests the current values of a set of properties for a given
|
|
||||||
* window from the server, and deals with them appropriately.
|
|
||||||
* Does not return them to the caller (they've been dealt with!)
|
|
||||||
*/
|
|
||||||
void meta_window_reload_properties (MetaWindow *window,
|
|
||||||
const Atom *properties,
|
|
||||||
int n_properties,
|
|
||||||
gboolean initial);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* meta_window_reload_property_from_xwindow:
|
* meta_window_reload_property_from_xwindow:
|
||||||
* @window: A window on the same display as the one we're
|
* @window: A window on the same display as the one we're
|
||||||
@ -75,31 +46,11 @@ void meta_window_reload_properties (MetaWindow *window,
|
|||||||
* window from the server, and deals with it appropriately.
|
* window from the server, and deals with it appropriately.
|
||||||
* Does not return it to the caller (it's been dealt with!)
|
* Does not return it to the caller (it's been dealt with!)
|
||||||
*/
|
*/
|
||||||
void meta_window_reload_property_from_xwindow
|
void meta_window_reload_property_from_xwindow (MetaWindow *window,
|
||||||
(MetaWindow *window,
|
|
||||||
Window xwindow,
|
Window xwindow,
|
||||||
Atom property,
|
Atom property,
|
||||||
gboolean initial);
|
gboolean initial);
|
||||||
|
|
||||||
/**
|
|
||||||
* meta_window_reload_properties_from_xwindow:
|
|
||||||
* @window: A window on the same display as the one we're
|
|
||||||
* investigating (only used to find the display)
|
|
||||||
* @xwindow: The X handle for the window.
|
|
||||||
* @properties: A pointer to a list of X atoms, "n_properties" long.
|
|
||||||
* @n_properties: The length of the properties list.
|
|
||||||
*
|
|
||||||
* Requests the current values of a set of properties for a given
|
|
||||||
* window from the server, and deals with them appropriately.
|
|
||||||
* Does not return them to the caller (they've been dealt with!)
|
|
||||||
*/
|
|
||||||
void meta_window_reload_properties_from_xwindow
|
|
||||||
(MetaWindow *window,
|
|
||||||
Window xwindow,
|
|
||||||
const Atom *properties,
|
|
||||||
int n_properties,
|
|
||||||
gboolean initial);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* meta_window_load_initial_properties:
|
* meta_window_load_initial_properties:
|
||||||
* @window: The window.
|
* @window: The window.
|
||||||
|
Loading…
Reference in New Issue
Block a user