diff options
| author | Michal Ratajsky <[email protected]> | 2014-10-31 14:50:29 +0100 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-10-31 14:50:29 +0100 |
| commit | 20afadff90fb6a866d3e361b2b294a67775da95e (patch) | |
| tree | f5707583cb7fbe267bdba4c04a639e8e9b8dfb5c /libmatemixer | |
| parent | 1897445a80677ec89e7eef9f2a76e630fd088588 (diff) | |
| download | libmatemixer-20afadff90fb6a866d3e361b2b294a67775da95e.tar.bz2 libmatemixer-20afadff90fb6a866d3e361b2b294a67775da95e.tar.xz | |
Remove ability to have no active switch option and fix OSS to correctly handle such case
Diffstat (limited to 'libmatemixer')
| -rw-r--r-- | libmatemixer/matemixer-enum-types.c | 1 | ||||
| -rw-r--r-- | libmatemixer/matemixer-enums.h | 5 | ||||
| -rw-r--r-- | libmatemixer/matemixer-switch.c | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/libmatemixer/matemixer-enum-types.c b/libmatemixer/matemixer-enum-types.c index cbc4ea8..6d88a83 100644 --- a/libmatemixer/matemixer-enum-types.c +++ b/libmatemixer/matemixer-enum-types.c @@ -198,7 +198,6 @@ mate_mixer_switch_flags_get_type (void) static const GFlagsValue values[] = { { MATE_MIXER_SWITCH_NO_FLAGS, "MATE_MIXER_SWITCH_NO_FLAGS", "no-flags" }, { MATE_MIXER_SWITCH_TOGGLE, "MATE_MIXER_SWITCH_TOGGLE", "toggle" }, - { MATE_MIXER_SWITCH_ALLOWS_NO_ACTIVE_OPTION, "MATE_MIXER_SWITCH_ALLOWS_NO_ACTIVE_OPTION", "allows-no-active-option" }, { 0, NULL, NULL } }; etype = g_flags_register_static ( diff --git a/libmatemixer/matemixer-enums.h b/libmatemixer/matemixer-enums.h index 96176fa..befc651 100644 --- a/libmatemixer/matemixer-enums.h +++ b/libmatemixer/matemixer-enums.h @@ -266,9 +266,8 @@ typedef enum { * The switch is a #MateMixerToggle. */ typedef enum { /*< flags >*/ - MATE_MIXER_SWITCH_NO_FLAGS = 0, - MATE_MIXER_SWITCH_TOGGLE = 1 << 0, - MATE_MIXER_SWITCH_ALLOWS_NO_ACTIVE_OPTION = 1 << 1 + MATE_MIXER_SWITCH_NO_FLAGS = 0, + MATE_MIXER_SWITCH_TOGGLE = 1 << 0, } MateMixerSwitchFlags; /** diff --git a/libmatemixer/matemixer-switch.c b/libmatemixer/matemixer-switch.c index 87580dd..6466838 100644 --- a/libmatemixer/matemixer-switch.c +++ b/libmatemixer/matemixer-switch.c @@ -359,6 +359,7 @@ mate_mixer_switch_set_active_option (MateMixerSwitch *swtch, MateMixerSwitchClass *klass; g_return_val_if_fail (MATE_MIXER_IS_SWITCH (swtch), FALSE); + g_return_val_if_fail (MATE_MIXER_IS_SWITCH_OPTION (option), FALSE); klass = MATE_MIXER_SWITCH_GET_CLASS (swtch); if (klass->set_active_option == NULL) @@ -398,7 +399,7 @@ _mate_mixer_switch_set_active_option (MateMixerSwitch *swtch, MateMixerSwitchOption *option) { g_return_if_fail (MATE_MIXER_IS_SWITCH (swtch)); - g_return_if_fail (option == NULL || MATE_MIXER_IS_SWITCH_OPTION (option)); + g_return_if_fail (MATE_MIXER_IS_SWITCH_OPTION (option)); if (swtch->priv->active == option) return; @@ -406,10 +407,7 @@ _mate_mixer_switch_set_active_option (MateMixerSwitch *swtch, if (swtch->priv->active != NULL) g_object_unref (swtch->priv->active); - if (option != NULL) - swtch->priv->active = g_object_ref (option); - else - swtch->priv->active = NULL; + swtch->priv->active = g_object_ref (option); g_object_notify_by_pspec (G_OBJECT (swtch), properties[PROP_ACTIVE_OPTION]); } |