[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 17/21: Tidy up DeviceMenuItem
noreply at xfce.org
noreply at xfce.org
Sat Sep 23 21:27:43 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-pulseaudio-plugin.
commit 811a39d5900a86e402bb9f1b0ccb0d9fb027ef50
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Thu Sep 14 05:56:35 2017 -0400
Tidy up DeviceMenuItem
---
panel-plugin/devicemenuitem.c | 167 +++++++++++++++++++++++-------------------
panel-plugin/devicemenuitem.h | 8 +-
2 files changed, 94 insertions(+), 81 deletions(-)
diff --git a/panel-plugin/devicemenuitem.c b/panel-plugin/devicemenuitem.c
index db09ea5..0f1fea4 100644
--- a/panel-plugin/devicemenuitem.c
+++ b/panel-plugin/devicemenuitem.c
@@ -39,10 +39,6 @@ struct _DeviceMenuItemPrivate {
-static void device_menu_item_finalize (GObject *object);
-
-
-
enum {
DEVICE_CHANGED,
LAST_SIGNAL
@@ -50,7 +46,6 @@ enum {
-
static guint signals[LAST_SIGNAL] = { 0 };
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@@ -61,66 +56,14 @@ G_GNUC_END_IGNORE_DEPRECATIONS
-static void
-device_menu_item_class_init (DeviceMenuItemClass *item_class)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (item_class);
-
- gobject_class->finalize = device_menu_item_finalize;
-
- /**
- * DeviceMenuItem::value-changed:
- * @menuitem: the #DeviceMenuItem for which the value changed
- * @value: the new value
- *
- * Emitted whenever the value of the contained scale changes because
- * of user input.
- */
- signals[DEVICE_CHANGED] = g_signal_new ("device-changed",
- TYPE_DEVICE_MENU_ITEM,
- G_SIGNAL_RUN_LAST,
- 0, NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE,
- 1, G_TYPE_STRING);
-
-
- g_type_class_add_private (item_class, sizeof (DeviceMenuItemPrivate));
-}
-
-static void
-device_menu_item_init (DeviceMenuItem *self)
-{
- DeviceMenuItemPrivate *priv;
-
- priv = GET_PRIVATE (self);
-
- priv->submenu = NULL;
- priv->label = NULL;
- priv->image = NULL;
- priv->title = NULL;
- priv->group = NULL;
-}
-
-static void
-device_menu_item_finalize (GObject *object)
-{
- DeviceMenuItem *self;
- DeviceMenuItemPrivate *priv;
-
- self = DEVICE_MENU_ITEM (object);
- priv = GET_PRIVATE (self);
-
- if (priv->title)
- g_free (priv->title);
+/* Static Declarations */
+static void device_menu_item_finalize (GObject *object);
+static void device_menu_item_device_toggled (DeviceMenuItem *item,
+ GtkCheckMenuItem *menu_item);
- g_object_unref (priv->submenu);
- g_object_unref (priv->image);
- g_object_unref (priv->label);
- (*G_OBJECT_CLASS (device_menu_item_parent_class)->finalize) (object);
-}
+/* Public API */
GtkWidget*
device_menu_item_new_with_label (const gchar *label)
{
@@ -162,18 +105,23 @@ G_GNUC_END_IGNORE_DEPRECATIONS
return GTK_WIDGET(device_item);
}
-static void
-device_menu_item_device_toggled (DeviceMenuItem *self,
- GtkCheckMenuItem *menu_item)
+
+
+void
+device_menu_item_set_image_from_icon_name (DeviceMenuItem *item,
+ const gchar *icon_name)
{
- g_return_if_fail (IS_DEVICE_MENU_ITEM (self));
+ DeviceMenuItemPrivate *priv;
- if (gtk_check_menu_item_get_active (menu_item))
- {
- g_signal_emit (self, signals[DEVICE_CHANGED], 0, (gchar *)g_object_get_data (G_OBJECT(menu_item), "name"));
- }
+ g_return_if_fail (IS_DEVICE_MENU_ITEM (item));
+
+ priv = GET_PRIVATE (item);
+
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
}
+
+
void
device_menu_item_add_device (DeviceMenuItem *item,
const gchar *name,
@@ -195,9 +143,11 @@ device_menu_item_add_device (DeviceMenuItem *item,
g_signal_connect_swapped (G_OBJECT (mi), "toggled", G_CALLBACK (device_menu_item_device_toggled), item);
}
+
+
void
-device_menu_item_set_device_by_name (DeviceMenuItem *item,
- const gchar *name)
+device_menu_item_set_device_by_name (DeviceMenuItem *item,
+ const gchar *name)
{
DeviceMenuItemPrivate *priv;
GList *children = NULL;
@@ -231,15 +181,78 @@ device_menu_item_set_device_by_name (DeviceMenuItem *item,
g_list_free (children);
}
-void
-device_menu_item_set_image_from_icon_name (DeviceMenuItem *item,
- const gchar *icon_name)
+
+
+/* Private API */
+static void
+device_menu_item_class_init (DeviceMenuItemClass *item_class)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (item_class);
+
+ gobject_class->finalize = device_menu_item_finalize;
+
+ /**
+ * DeviceMenuItem::value-changed:
+ * @menuitem: the #DeviceMenuItem for which the value changed
+ * @value: the new value
+ *
+ * Emitted whenever the value of the contained scale changes because
+ * of user input.
+ */
+ signals[DEVICE_CHANGED] = g_signal_new ("device-changed",
+ TYPE_DEVICE_MENU_ITEM,
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE,
+ 1, G_TYPE_STRING);
+
+ g_type_class_add_private (item_class, sizeof (DeviceMenuItemPrivate));
+}
+
+static void
+device_menu_item_init (DeviceMenuItem *item)
{
DeviceMenuItemPrivate *priv;
- g_return_if_fail (IS_DEVICE_MENU_ITEM (item));
+ priv = GET_PRIVATE (item);
+ priv->submenu = NULL;
+ priv->label = NULL;
+ priv->image = NULL;
+ priv->title = NULL;
+ priv->group = NULL;
+}
+
+static void
+device_menu_item_finalize (GObject *object)
+{
+ DeviceMenuItem *item;
+ DeviceMenuItemPrivate *priv;
+
+ item = DEVICE_MENU_ITEM (object);
priv = GET_PRIVATE (item);
- gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
+ if (priv->title)
+ g_free (priv->title);
+
+ g_object_unref (priv->submenu);
+ g_object_unref (priv->image);
+ g_object_unref (priv->label);
+
+ (*G_OBJECT_CLASS (device_menu_item_parent_class)->finalize) (object);
+}
+
+
+
+static void
+device_menu_item_device_toggled (DeviceMenuItem *item,
+ GtkCheckMenuItem *menu_item)
+{
+ g_return_if_fail (IS_DEVICE_MENU_ITEM (item));
+
+ if (gtk_check_menu_item_get_active (menu_item))
+ {
+ g_signal_emit (item, signals[DEVICE_CHANGED], 0, (gchar *)g_object_get_data (G_OBJECT(menu_item), "name"));
+ }
}
diff --git a/panel-plugin/devicemenuitem.h b/panel-plugin/devicemenuitem.h
index 8392dc6..f37dc70 100644
--- a/panel-plugin/devicemenuitem.h
+++ b/panel-plugin/devicemenuitem.h
@@ -53,16 +53,16 @@ struct _DeviceMenuItemClass
GType device_menu_item_get_type (void) G_GNUC_CONST;
-GtkWidget *device_menu_item_new_with_label (const gchar *label);
+GtkWidget *device_menu_item_new_with_label (const gchar *label);
-void device_menu_item_set_image_from_icon_name (DeviceMenuItem *menuitem,
+void device_menu_item_set_image_from_icon_name (DeviceMenuItem *item,
const gchar *icon_name);
-void device_menu_item_add_device (DeviceMenuItem *menuitem,
+void device_menu_item_add_device (DeviceMenuItem *item,
const gchar *name,
const gchar *description);
-void device_menu_item_set_device_by_name (DeviceMenuItem *menuitem,
+void device_menu_item_set_device_by_name (DeviceMenuItem *item,
const gchar *name);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list