[Xfce4-commits] [xfce/xfce4-settings] 56/57: color: Make type naming consistent

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       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 xfce/xfce4-settings.

commit 7bbb761d89497ee072e9046a1b99b269bcef5f6c
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Tue Mar 12 22:27:24 2019 +0100

    color: Make type naming consistent
---
 dialogs/color-settings/color-device.c | 14 +++++++-------
 dialogs/color-settings/color-device.h |  2 +-
 dialogs/color-settings/main.c         |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dialogs/color-settings/color-device.c b/dialogs/color-settings/color-device.c
index d3b0902..4b3ce28 100644
--- a/dialogs/color-settings/color-device.c
+++ b/dialogs/color-settings/color-device.c
@@ -201,14 +201,14 @@ color_device_refresh (ColorDevice *color_device)
 CdDevice *
 color_device_get_device (ColorDevice *color_device)
 {
-  g_return_val_if_fail (CC_IS_COLOR_DEVICE (color_device), NULL);
+  g_return_val_if_fail (SETTINGS_IS_COLOR_DEVICE (color_device), NULL);
   return color_device->device;
 }
 
 const gchar *
 color_device_get_sortable (ColorDevice *color_device)
 {
-  g_return_val_if_fail (CC_IS_COLOR_DEVICE (color_device), NULL);
+  g_return_val_if_fail (SETTINGS_IS_COLOR_DEVICE (color_device), NULL);
   return color_device->sortable;
 }
 
@@ -216,7 +216,7 @@ static void
 color_device_get_property (GObject *object, guint param_id,
                               GValue *value, GParamSpec *pspec)
 {
-  ColorDevice *color_device = CC_COLOR_DEVICE (object);
+  ColorDevice *color_device = SETTINGS_COLOR_DEVICE (object);
   switch (param_id)
     {
       case PROP_DEVICE:
@@ -232,7 +232,7 @@ static void
 color_device_set_property (GObject *object, guint param_id,
                               const GValue *value, GParamSpec *pspec)
 {
-  ColorDevice *color_device = CC_COLOR_DEVICE (object);
+  ColorDevice *color_device = SETTINGS_COLOR_DEVICE (object);
 
   switch (param_id)
     {
@@ -248,7 +248,7 @@ color_device_set_property (GObject *object, guint param_id,
 static void
 color_device_finalize (GObject *object)
 {
-  ColorDevice *color_device = CC_COLOR_DEVICE (object);
+  ColorDevice *color_device = SETTINGS_COLOR_DEVICE (object);
 
   if (color_device->device_changed_id > 0)
     g_signal_handler_disconnect (color_device->device, color_device->device_changed_id);
@@ -281,7 +281,7 @@ color_device_notify_enable_device_cb (GtkSwitch *sw,
                                          GParamSpec *pspec,
                                          gpointer user_data)
 {
-  ColorDevice *color_device = CC_COLOR_DEVICE (user_data);
+  ColorDevice *color_device = SETTINGS_COLOR_DEVICE (user_data);
   gboolean enable;
   gboolean ret;
   g_autoptr(GError) error = NULL;
@@ -308,7 +308,7 @@ color_device_changed_cb (CdDevice *device,
 static void
 color_device_constructed (GObject *object)
 {
-  ColorDevice *color_device = CC_COLOR_DEVICE (object);
+  ColorDevice *color_device = SETTINGS_COLOR_DEVICE (object);
   g_autofree gchar *sortable_tmp = NULL;
 
   /* watch the device for changes */
diff --git a/dialogs/color-settings/color-device.h b/dialogs/color-settings/color-device.h
index 87dd073..c71f5a5 100644
--- a/dialogs/color-settings/color-device.h
+++ b/dialogs/color-settings/color-device.h
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 #define TYPE_COLOR_DEVICE (color_device_get_type ())
-G_DECLARE_FINAL_TYPE (ColorDevice, color_device, CC, COLOR_DEVICE, GtkListBoxRow)
+G_DECLARE_FINAL_TYPE (ColorDevice, color_device, SETTINGS, COLOR_DEVICE, GtkListBoxRow)
 
 gchar   *color_device_get_kind          (CdDevice *device);
 gchar   *color_device_get_sortable_base (CdDevice *device);
diff --git a/dialogs/color-settings/main.c b/dialogs/color-settings/main.c
index 4d355a3..5c8cd08 100644
--- a/dialogs/color-settings/main.c
+++ b/dialogs/color-settings/main.c
@@ -1064,7 +1064,7 @@ color_settings_remove_device (ColorSettings *settings, CdDevice *device)
 
     list = gtk_container_get_children (GTK_CONTAINER (settings->list_box));
     for (l = list; l != NULL; l = l->next) {
-        device_tmp = color_device_get_device (CC_COLOR_DEVICE (l->data));
+        device_tmp = color_device_get_device (SETTINGS_COLOR_DEVICE (l->data));
 
         if (g_strcmp0 (cd_device_get_object_path (device),
                        cd_device_get_object_path (device_tmp)) == 0) {
@@ -1138,8 +1138,8 @@ color_settings_sort_func (GtkListBoxRow *a,
   const gchar *sort_a = NULL;
   const gchar *sort_b = NULL;
 
-  sort_a = color_device_get_sortable (CC_COLOR_DEVICE (a));
-  sort_b = color_device_get_sortable (CC_COLOR_DEVICE (b));
+  sort_a = color_device_get_sortable (SETTINGS_COLOR_DEVICE (a));
+  sort_b = color_device_get_sortable (SETTINGS_COLOR_DEVICE (b));
 
   return g_strcmp0 (sort_b, sort_a);
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.