[gnome-flashback] sound-applet: remove unused GObject properties
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] sound-applet: remove unused GObject properties
- Date: Fri, 16 Aug 2019 15:35:46 +0000 (UTC)
commit a23debe13c112f81617f0d61b881b2a05a5af539
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Aug 16 17:26:55 2019 +0300
sound-applet: remove unused GObject properties
gnome-flashback/libsound-applet/gvc-channel-bar.c | 93 ----------------------
.../libsound-applet/gvc-stream-status-icon.c | 31 --------
2 files changed, 124 deletions(-)
---
diff --git a/gnome-flashback/libsound-applet/gvc-channel-bar.c
b/gnome-flashback/libsound-applet/gvc-channel-bar.c
index 08bcdc0..e90730d 100644
--- a/gnome-flashback/libsound-applet/gvc-channel-bar.c
+++ b/gnome-flashback/libsound-applet/gvc-channel-bar.c
@@ -66,11 +66,6 @@ enum
PROP_0,
PROP_ORIENTATION,
PROP_IS_MUTED,
- PROP_ADJUSTMENT,
- PROP_ICON_NAME,
- PROP_LOW_ICON_NAME,
- PROP_HIGH_ICON_NAME,
- PROP_IS_AMPLIFIED
};
static void gvc_channel_bar_finalize (GObject *object);
@@ -252,7 +247,6 @@ gvc_channel_bar_set_icon_name (GvcChannelBar *bar,
g_free (bar->priv->icon_name);
bar->priv->icon_name = g_strdup (name);
update_image (bar);
- g_object_notify (G_OBJECT (bar), "icon-name");
}
void
@@ -267,7 +261,6 @@ gvc_channel_bar_set_low_icon_name (GvcChannelBar *bar,
gtk_image_set_from_icon_name (GTK_IMAGE (bar->priv->low_image),
bar->priv->low_icon_name,
GTK_ICON_SIZE_MENU);
- g_object_notify (G_OBJECT (bar), "low-icon-name");
}
}
@@ -283,7 +276,6 @@ gvc_channel_bar_set_high_icon_name (GvcChannelBar *bar,
gtk_image_set_from_icon_name (GTK_IMAGE (bar->priv->high_image),
bar->priv->high_icon_name,
GTK_ICON_SIZE_MENU);
- g_object_notify (G_OBJECT (bar), "high-icon-name");
}
}
@@ -300,25 +292,6 @@ gvc_channel_bar_set_orientation (GvcChannelBar *bar,
}
}
-static void
-gvc_channel_bar_set_adjustment (GvcChannelBar *bar,
- GtkAdjustment *adjustment)
-{
- g_return_if_fail (GVC_CHANNEL_BAR (bar));
- g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-
- if (bar->priv->adjustment != NULL) {
- g_object_unref (bar->priv->adjustment);
- }
- bar->priv->adjustment = g_object_ref_sink (adjustment);
-
- if (bar->priv->scale != NULL) {
- gtk_range_set_adjustment (GTK_RANGE (bar->priv->scale), adjustment);
- }
-
- g_object_notify (G_OBJECT (bar), "adjustment");
-}
-
GtkAdjustment *
gvc_channel_bar_get_adjustment (GvcChannelBar *bar)
{
@@ -581,21 +554,6 @@ gvc_channel_bar_set_property (GObject *object,
case PROP_IS_MUTED:
gvc_channel_bar_set_is_muted (self, g_value_get_boolean (value));
break;
- case PROP_ICON_NAME:
- gvc_channel_bar_set_icon_name (self, g_value_get_string (value));
- break;
- case PROP_LOW_ICON_NAME:
- gvc_channel_bar_set_low_icon_name (self, g_value_get_string (value));
- break;
- case PROP_HIGH_ICON_NAME:
- gvc_channel_bar_set_high_icon_name (self, g_value_get_string (value));
- break;
- case PROP_ADJUSTMENT:
- gvc_channel_bar_set_adjustment (self, g_value_get_object (value));
- break;
- case PROP_IS_AMPLIFIED:
- gvc_channel_bar_set_is_amplified (self, g_value_get_boolean (value));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -618,21 +576,6 @@ gvc_channel_bar_get_property (GObject *object,
case PROP_IS_MUTED:
g_value_set_boolean (value, priv->is_muted);
break;
- case PROP_ICON_NAME:
- g_value_set_string (value, priv->icon_name);
- break;
- case PROP_LOW_ICON_NAME:
- g_value_set_string (value, priv->low_icon_name);
- break;
- case PROP_HIGH_ICON_NAME:
- g_value_set_string (value, priv->high_icon_name);
- break;
- case PROP_ADJUSTMENT:
- g_value_set_object (value, gvc_channel_bar_get_adjustment (self));
- break;
- case PROP_IS_AMPLIFIED:
- g_value_set_boolean (value, priv->is_amplified);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -681,42 +624,6 @@ gvc_channel_bar_class_init (GvcChannelBarClass *klass)
"Whether stream is muted",
FALSE,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
- g_object_class_install_property (object_class,
- PROP_ADJUSTMENT,
- g_param_spec_object ("adjustment",
- "Adjustment",
- "The GtkAdjustment that contains the current
value of this scale button object",
- GTK_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
- g_object_class_install_property (object_class,
- PROP_ICON_NAME,
- g_param_spec_string ("icon-name",
- "Icon Name",
- "Name of icon to display for this stream",
- NULL,
- G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class,
- PROP_LOW_ICON_NAME,
- g_param_spec_string ("low-icon-name",
- "Icon Name",
- "Name of icon to display for this stream",
- "audio-volume-low",
- G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class,
- PROP_HIGH_ICON_NAME,
- g_param_spec_string ("high-icon-name",
- "Icon Name",
- "Name of icon to display for this stream",
- "audio-volume-high",
- G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class,
- PROP_IS_AMPLIFIED,
- g_param_spec_boolean ("is-amplified",
- "Is amplified",
- "Whether the stream is digitally amplified",
- FALSE,
- G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
}
static void
diff --git a/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
b/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
index 3ec78bf..9eff811 100644
--- a/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
+++ b/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
@@ -48,9 +48,7 @@ struct GvcStreamStatusIconPrivate
enum
{
PROP_0,
- PROP_DISPLAY_NAME,
PROP_MIXER_CONTROL,
- PROP_MIXER_STREAM,
PROP_ICON_NAMES,
};
@@ -493,7 +491,6 @@ gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon,
g_free (icon->priv->display_name);
icon->priv->display_name = g_strdup (name);
update_icon (icon);
- g_object_notify (G_OBJECT (icon), "display-name");
}
void
@@ -547,8 +544,6 @@ gvc_stream_status_icon_set_mixer_stream (GvcStreamStatusIcon *icon,
}
update_icon (icon);
-
- g_object_notify (G_OBJECT (icon), "mixer-stream");
}
static void
@@ -563,12 +558,6 @@ gvc_stream_status_icon_set_property (GObject *object,
case PROP_MIXER_CONTROL:
self->priv->mixer_control = g_value_dup_object (value);
break;
- case PROP_MIXER_STREAM:
- gvc_stream_status_icon_set_mixer_stream (self, g_value_get_object (value));
- break;
- case PROP_DISPLAY_NAME:
- gvc_stream_status_icon_set_display_name (self, g_value_get_string (value));
- break;
case PROP_ICON_NAMES:
gvc_stream_status_icon_set_icon_names (self, g_value_get_boxed (value));
break;
@@ -591,12 +580,6 @@ gvc_stream_status_icon_get_property (GObject *object,
case PROP_MIXER_CONTROL:
g_value_set_object (value, priv->mixer_control);
break;
- case PROP_MIXER_STREAM:
- g_value_set_object (value, priv->mixer_stream);
- break;
- case PROP_DISPLAY_NAME:
- g_value_set_string (value, priv->display_name);
- break;
case PROP_ICON_NAMES:
g_value_set_boxed (value, priv->icon_names);
break;
@@ -727,20 +710,6 @@ gvc_stream_status_icon_class_init (GvcStreamStatusIconClass *klass)
GVC_TYPE_MIXER_CONTROL,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
- g_object_class_install_property (object_class,
- PROP_MIXER_STREAM,
- g_param_spec_object ("mixer-stream",
- "mixer stream",
- "mixer stream",
- GVC_TYPE_MIXER_STREAM,
- G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class,
- PROP_DISPLAY_NAME,
- g_param_spec_string ("display-name",
- "Display Name",
- "Name to display for this stream",
- NULL,
- G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
PROP_ICON_NAMES,
g_param_spec_boxed ("icon-names",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
