isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta-plugin: Remove "disabled" feature

Browse Source 
It's just code cruft that nobody's using

https://bugzilla.gnome.org/show_bug.cgi?id=676855
This commit is contained in:
Jasper St. Pierre 2012-04-05 01:25:46 -04:00
parent 9fa5aa9889
commit 574c0c3287
3 changed files with 59 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/compositor/meta-plugin-manager.c
View File

@ -205,8 +205,7 @@ meta_plugin_manager_kill_window_effects (MetaPluginManager *plugin_mgr,
MetaPlugin *plugin = l->data; MetaPlugin *plugin = l->data;
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin); MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
if (!meta_plugin_disabled (plugin) if (klass->kill_window_effects)
&& klass->kill_window_effects)
klass->kill_window_effects (plugin, actor); klass->kill_window_effects (plugin, actor);
l = l->next; l = l->next;
@ -223,7 +222,7 @@ meta_plugin_manager_kill_switch_workspace (MetaPluginManager *plugin_mgr)
MetaPlugin *plugin = l->data; MetaPlugin *plugin = l->data;
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin); MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
if (!meta_plugin_disabled (plugin) && klass->kill_switch_workspace) if (klass->kill_switch_workspace)
klass->kill_switch_workspace (plugin); klass->kill_switch_workspace (plugin);
l = l->next; l = l->next;
@ -256,45 +255,40 @@ meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
MetaPlugin *plugin = l->data; MetaPlugin *plugin = l->data;
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin); MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
if (!meta_plugin_disabled (plugin)) switch (event)
{ {
switch (event) case META_PLUGIN_MINIMIZE:
if (klass->minimize)
{ {
case META_PLUGIN_MINIMIZE: retval = TRUE;
if (klass->minimize) meta_plugin_manager_kill_window_effects (plugin_mgr,
{ actor);
retval = TRUE;
meta_plugin_manager_kill_window_effects (
plugin_mgr,
actor);
_meta_plugin_effect_started (plugin); _meta_plugin_effect_started (plugin);
klass->minimize (plugin, actor); klass->minimize (plugin, actor);
}
break;
case META_PLUGIN_MAP:
if (klass->map)
{
retval = TRUE;
meta_plugin_manager_kill_window_effects (
plugin_mgr,
actor);
_meta_plugin_effect_started (plugin);
klass->map (plugin, actor);
}
break;
case META_PLUGIN_DESTROY:
if (klass->destroy)
{
retval = TRUE;
_meta_plugin_effect_started (plugin);
klass->destroy (plugin, actor);
}
break;
default:
g_warning ("Incorrect handler called for event %lu", event);
} }
break;
case META_PLUGIN_MAP:
if (klass->map)
{
retval = TRUE;
meta_plugin_manager_kill_window_effects (plugin_mgr,
actor);
_meta_plugin_effect_started (plugin);
klass->map (plugin, actor);
}
break;
case META_PLUGIN_DESTROY:
if (klass->destroy)
{
retval = TRUE;
_meta_plugin_effect_started (plugin);
klass->destroy (plugin, actor);
}
break;
default:
g_warning ("Incorrect handler called for event %lu", event);
} }
l = l->next; l = l->next;
@ -333,41 +327,36 @@ meta_plugin_manager_event_maximize (MetaPluginManager *plugin_mgr,
MetaPlugin *plugin = l->data; MetaPlugin *plugin = l->data;
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin); MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
if (!meta_plugin_disabled (plugin)) switch (event)
{ {
switch (event) case META_PLUGIN_MAXIMIZE:
if (klass->maximize)
{ {
case META_PLUGIN_MAXIMIZE: retval = TRUE;
if (klass->maximize) meta_plugin_manager_kill_window_effects (plugin_mgr,
{ actor);
retval = TRUE;
meta_plugin_manager_kill_window_effects (
plugin_mgr,
actor);
_meta_plugin_effect_started (plugin); _meta_plugin_effect_started (plugin);
klass->maximize (plugin, actor, klass->maximize (plugin, actor,
target_x, target_y, target_x, target_y,
target_width, target_height); target_width, target_height);
}
break;
case META_PLUGIN_UNMAXIMIZE:
if (klass->unmaximize)
{
retval = TRUE;
meta_plugin_manager_kill_window_effects (
plugin_mgr,
actor);
_meta_plugin_effect_started (plugin);
klass->unmaximize (plugin, actor,
target_x, target_y,
target_width, target_height);
}
break;
default:
g_warning ("Incorrect handler called for event %lu", event);
} }
break;
case META_PLUGIN_UNMAXIMIZE:
if (klass->unmaximize)
{
retval = TRUE;
meta_plugin_manager_kill_window_effects (plugin_mgr,
actor);
_meta_plugin_effect_started (plugin);
klass->unmaximize (plugin, actor,
target_x, target_y,
target_width, target_height);
}
break;
default:
g_warning ("Incorrect handler called for event %lu", event);
} }
l = l->next; l = l->next;
@ -402,7 +391,7 @@ meta_plugin_manager_switch_workspace (MetaPluginManager *plugin_mgr,
MetaPlugin *plugin = l->data; MetaPlugin *plugin = l->data;
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin); MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
if (!meta_plugin_disabled (plugin) && klass->switch_workspace) if (klass->switch_workspace)
{ {
retval = TRUE; retval = TRUE;
meta_plugin_manager_kill_switch_workspace (plugin_mgr); meta_plugin_manager_kill_switch_workspace (plugin_mgr);

24
src/compositor/meta-plugin.c
View File

@ -44,7 +44,6 @@ enum
{ {
PROP_0, PROP_0,
PROP_SCREEN, PROP_SCREEN,
PROP_DISABLED,
PROP_DEBUG_MODE, PROP_DEBUG_MODE,
}; };
@ -54,7 +53,6 @@ struct _MetaPluginPrivate
gint running; gint running;
gboolean disabled : 1;
gboolean debug : 1; gboolean debug : 1;
}; };
@ -71,9 +69,6 @@ meta_plugin_set_property (GObject *object,
case PROP_SCREEN: case PROP_SCREEN:
priv->screen = g_value_get_object (value); priv->screen = g_value_get_object (value);
break; break;
case PROP_DISABLED:
priv->disabled = g_value_get_boolean (value);
break;
case PROP_DEBUG_MODE: case PROP_DEBUG_MODE:
priv->debug = g_value_get_boolean (value); priv->debug = g_value_get_boolean (value);
break; break;
@ -96,9 +91,6 @@ meta_plugin_get_property (GObject *object,
case PROP_SCREEN: case PROP_SCREEN:
g_value_set_object (value, priv->screen); g_value_set_object (value, priv->screen);
break; break;
case PROP_DISABLED:
g_value_set_boolean (value, priv->disabled);
break;
case PROP_DEBUG_MODE: case PROP_DEBUG_MODE:
g_value_set_boolean (value, priv->debug); g_value_set_boolean (value, priv->debug);
break; break;
@ -125,14 +117,6 @@ meta_plugin_class_init (MetaPluginClass *klass)
META_TYPE_SCREEN, META_TYPE_SCREEN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_DISABLED,
g_param_spec_boolean ("disabled",
"Plugin disabled",
"Plugin disabled",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DEBUG_MODE, PROP_DEBUG_MODE,
g_param_spec_boolean ("debug-mode", g_param_spec_boolean ("debug-mode",
@ -152,14 +136,6 @@ meta_plugin_init (MetaPlugin *self)
self->priv = priv = META_PLUGIN_GET_PRIVATE (self); self->priv = priv = META_PLUGIN_GET_PRIVATE (self);
} }
gboolean
meta_plugin_disabled (MetaPlugin *plugin)
{
MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
return priv->disabled;
}
gboolean gboolean
meta_plugin_running (MetaPlugin *plugin) meta_plugin_running (MetaPlugin *plugin)
{ {

1
src/meta/meta-plugin.h
View File

@ -123,7 +123,6 @@ struct _MetaPluginInfo
GType meta_plugin_get_type (void); GType meta_plugin_get_type (void);
gboolean meta_plugin_disabled (MetaPlugin *plugin);
gboolean meta_plugin_running (MetaPlugin *plugin); gboolean meta_plugin_running (MetaPlugin *plugin);
gboolean meta_plugin_debug_mode (MetaPlugin *plugin); gboolean meta_plugin_debug_mode (MetaPlugin *plugin);