[gnome-control-center] user-accounts: Rename UmCarousel to CcCarousel

[Robert Ancell <rancell src gnome org>]

commit 262baed6a1bc842738bd4eee8f7e877a47d180e7
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Nov 7 16:28:36 2018 +1300

    user-accounts: Rename UmCarousel to CcCarousel
    
    Um is a naming hangover from before this was part of g-c-c.

 .../user-accounts/{um-carousel.c => cc-carousel.c} | 132 ++++++++++-----------
 .../user-accounts/{um-carousel.h => cc-carousel.h} |  22 ++--
 .../{data/carousel.ui => cc-carousel.ui}           |   6 +-
 panels/user-accounts/cc-user-panel.c               |  24 ++--
 panels/user-accounts/cc-user-panel.ui              |   2 +-
 panels/user-accounts/meson.build                   |   4 +-
 panels/user-accounts/user-accounts.gresource.xml   |   2 +-
 7 files changed, 96 insertions(+), 96 deletions(-)
---
diff --git a/panels/user-accounts/um-carousel.c b/panels/user-accounts/cc-carousel.c
similarity index 74%
rename from panels/user-accounts/um-carousel.c
rename to panels/user-accounts/cc-carousel.c
index 7616a9a98..94f2e4979 100644
--- a/panels/user-accounts/um-carousel.c
+++ b/panels/user-accounts/cc-carousel.c
@@ -18,46 +18,46 @@
  * Author: Felipe Borges <felipeborges gnome org>
  */
 
-#include "um-carousel.h"
+#include "cc-carousel.h"
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
 #define ARROW_SIZE 20
 
-struct _UmCarouselItem {
+struct _CcCarouselItem {
         GtkRadioButton parent;
 
         gint page;
 };
 
-G_DEFINE_TYPE (UmCarouselItem, um_carousel_item, GTK_TYPE_RADIO_BUTTON)
+G_DEFINE_TYPE (CcCarouselItem, cc_carousel_item, GTK_TYPE_RADIO_BUTTON)
 
 GtkWidget *
-um_carousel_item_new (void)
+cc_carousel_item_new (void)
 {
-        return g_object_new (UM_TYPE_CAROUSEL_ITEM, NULL);
+        return g_object_new (CC_TYPE_CAROUSEL_ITEM, NULL);
 }
 
 static void
-um_carousel_item_class_init (UmCarouselItemClass *klass)
+cc_carousel_item_class_init (CcCarouselItemClass *klass)
 {
 }
 
 static void
-um_carousel_item_init (UmCarouselItem *self)
+cc_carousel_item_init (CcCarouselItem *self)
 {
         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (self), FALSE);
         gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self)),
                                      "carousel-item");
 }
 
-struct _UmCarousel {
+struct _CcCarousel {
         GtkRevealer parent;
 
         GList *children;
         gint visible_page;
-        UmCarouselItem *selected_item;
+        CcCarouselItem *selected_item;
         GtkWidget *last_box;
         GtkWidget *arrow;
         gint arrow_start_x;
@@ -70,7 +70,7 @@ struct _UmCarousel {
         GtkStyleProvider *provider;
 };
 
-G_DEFINE_TYPE (UmCarousel, um_carousel, GTK_TYPE_REVEALER)
+G_DEFINE_TYPE (CcCarousel, cc_carousel, GTK_TYPE_REVEALER)
 
 enum {
         ITEM_ACTIVATED,
@@ -82,8 +82,8 @@ static guint signals[NUM_SIGNALS] = { 0, };
 #define ITEMS_PER_PAGE 3
 
 static gint
-um_carousel_item_get_x (UmCarouselItem *item,
-                        UmCarousel     *carousel)
+cc_carousel_item_get_x (CcCarouselItem *item,
+                        CcCarousel     *carousel)
 {
         GtkWidget *widget, *parent;
         gint width;
@@ -106,7 +106,7 @@ um_carousel_item_get_x (UmCarouselItem *item,
 }
 
 static void
-um_carousel_move_arrow (UmCarousel *self)
+cc_carousel_move_arrow (CcCarousel *self)
 {
         GtkStyleContext *context;
         gchar *css;
@@ -115,7 +115,7 @@ um_carousel_move_arrow (UmCarousel *self)
         if (!self->selected_item)
                 return;
 
-        end_x = um_carousel_item_get_x (self->selected_item, self);
+        end_x = cc_carousel_item_get_x (self->selected_item, self);
 
         context = gtk_widget_get_style_context (self->arrow);
         if (self->provider)
@@ -138,7 +138,7 @@ um_carousel_move_arrow (UmCarousel *self)
 }
 
 static gint
-get_last_page_number (UmCarousel *self)
+get_last_page_number (CcCarousel *self)
 {
         if (g_list_length (self->children) == 0)
                 return 0;
@@ -147,28 +147,28 @@ get_last_page_number (UmCarousel *self)
 }
 
 static void
-update_buttons_visibility (UmCarousel *self)
+update_buttons_visibility (CcCarousel *self)
 {
         gtk_widget_set_visible (self->go_back_button, (self->visible_page > 0));
         gtk_widget_set_visible (self->go_next_button, (self->visible_page < get_last_page_number (self)));
 }
 
 /**
- * um_carousel_find_item:
- * @carousel: an UmCarousel instance
+ * cc_carousel_find_item:
+ * @carousel: an CcCarousel instance
  * @data: user data passed to the comparation function
  * @func: the function to call for each element.
  *      It should return 0 when the desired element is found
  *
- * Finds an UmCarousel item using the supplied function to find the
+ * Finds an CcCarousel item using the supplied function to find the
  * desired element.
  * Ideally useful for matching a model object and its correspondent
  * widget.
  *
- * Returns: the found UmCarouselItem, or %NULL if it is not found
+ * Returns: the found CcCarouselItem, or %NULL if it is not found
  */
-UmCarouselItem *
-um_carousel_find_item (UmCarousel    *self,
+CcCarouselItem *
+cc_carousel_find_item (CcCarousel    *self,
                        gconstpointer  data,
                        GCompareFunc   func)
 {
@@ -186,18 +186,18 @@ um_carousel_find_item (UmCarousel    *self,
 }
 
 static void
-on_item_toggled (UmCarouselItem *item,
+on_item_toggled (CcCarouselItem *item,
                  GdkEvent       *event,
                  gpointer        user_data)
 {
-        UmCarousel *self = UM_CAROUSEL (user_data);
+        CcCarousel *self = CC_CAROUSEL (user_data);
 
-        um_carousel_select_item (self, item);
+        cc_carousel_select_item (self, item);
 }
 
 void
-um_carousel_select_item (UmCarousel     *self,
-                         UmCarouselItem *item)
+cc_carousel_select_item (CcCarousel     *self,
+                         CcCarouselItem *item)
 {
         gchar *page_name;
         gboolean page_changed = TRUE;
@@ -214,7 +214,7 @@ um_carousel_select_item (UmCarousel     *self,
         if (self->selected_item != NULL)
         {
                 page_changed = (self->selected_item->page != item->page);
-                self->arrow_start_x = um_carousel_item_get_x (self->selected_item, self);
+                self->arrow_start_x = cc_carousel_item_get_x (self->selected_item, self);
         }
 
         self->selected_item = item;
@@ -223,7 +223,7 @@ um_carousel_select_item (UmCarousel     *self,
 
         if (!page_changed)
         {
-                um_carousel_move_arrow (self);
+                cc_carousel_move_arrow (self);
                 return;
         }
 
@@ -234,38 +234,38 @@ um_carousel_select_item (UmCarousel     *self,
 
         update_buttons_visibility (self);
 
-        /* um_carousel_move_arrow is called from on_transition_running */
+        /* cc_carousel_move_arrow is called from on_transition_running */
 }
 
 static void
-um_carousel_select_item_at_index (UmCarousel *self,
+cc_carousel_select_item_at_index (CcCarousel *self,
                                   gint        index)
 {
         GList *l = NULL;
 
         l = g_list_nth (self->children, index);
-        um_carousel_select_item (self, l->data);
+        cc_carousel_select_item (self, l->data);
 }
 
 static void
-um_carousel_goto_previous_page (GtkWidget *button,
+cc_carousel_goto_previous_page (GtkWidget *button,
                                 gpointer   user_data)
 {
-        UmCarousel *self = UM_CAROUSEL (user_data);
+        CcCarousel *self = CC_CAROUSEL (user_data);
 
         self->visible_page--;
         if (self->visible_page < 0)
                 self->visible_page = 0;
 
         /* Select first item of the page */
-        um_carousel_select_item_at_index (self, self->visible_page * ITEMS_PER_PAGE);
+        cc_carousel_select_item_at_index (self, self->visible_page * ITEMS_PER_PAGE);
 }
 
 static void
-um_carousel_goto_next_page (GtkWidget *button,
+cc_carousel_goto_next_page (GtkWidget *button,
                             gpointer   user_data)
 {
-        UmCarousel *self = UM_CAROUSEL (user_data);
+        CcCarousel *self = CC_CAROUSEL (user_data);
         gint last_page;
 
         last_page = get_last_page_number (self);
@@ -275,18 +275,18 @@ um_carousel_goto_next_page (GtkWidget *button,
                 self->visible_page = last_page;
 
         /* Select first item of the page */
-        um_carousel_select_item_at_index (self, self->visible_page * ITEMS_PER_PAGE);
+        cc_carousel_select_item_at_index (self, self->visible_page * ITEMS_PER_PAGE);
 }
 
 static void
-um_carousel_add (GtkContainer *container,
+cc_carousel_add (GtkContainer *container,
                  GtkWidget    *widget)
 {
-        UmCarousel *self = UM_CAROUSEL (container);
+        CcCarousel *self = CC_CAROUSEL (container);
         gboolean last_box_is_full;
 
-        if (!UM_IS_CAROUSEL_ITEM (widget)) {
-                GTK_CONTAINER_CLASS (um_carousel_parent_class)->add (container, widget);
+        if (!CC_IS_CAROUSEL_ITEM (widget)) {
+                GTK_CONTAINER_CLASS (cc_carousel_parent_class)->add (container, widget);
                 return;
         }
 
@@ -294,7 +294,7 @@ um_carousel_add (GtkContainer *container,
         gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE);
 
         self->children = g_list_append (self->children, widget);
-        UM_CAROUSEL_ITEM (widget)->page = get_last_page_number (self);
+        CC_CAROUSEL_ITEM (widget)->page = get_last_page_number (self);
         if (self->selected_item != NULL)
                 gtk_radio_button_join_group (GTK_RADIO_BUTTON (widget), GTK_RADIO_BUTTON 
(self->selected_item));
         g_signal_connect (widget, "button-press-event", G_CALLBACK (on_item_toggled), self);
@@ -303,7 +303,7 @@ um_carousel_add (GtkContainer *container,
         if (last_box_is_full) {
                 gchar *page;
 
-                page = g_strdup_printf ("%d", UM_CAROUSEL_ITEM (widget)->page);
+                page = g_strdup_printf ("%d", CC_CAROUSEL_ITEM (widget)->page);
                 self->last_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
                 gtk_widget_show (self->last_box);
                 gtk_widget_set_valign (self->last_box, GTK_ALIGN_CENTER);
@@ -317,7 +317,7 @@ um_carousel_add (GtkContainer *container,
 }
 
 void
-um_carousel_purge_items (UmCarousel *self)
+cc_carousel_purge_items (CcCarousel *self)
 {
         gtk_container_forall (GTK_CONTAINER (self->stack),
                               (GtkCallback) gtk_widget_destroy,
@@ -329,43 +329,43 @@ um_carousel_purge_items (UmCarousel *self)
         self->selected_item = NULL;
 }
 
-UmCarousel *
-um_carousel_new (void)
+CcCarousel *
+cc_carousel_new (void)
 {
-        return g_object_new (UM_TYPE_CAROUSEL, NULL);
+        return g_object_new (CC_TYPE_CAROUSEL, NULL);
 }
 
 static void
-um_carousel_class_init (UmCarouselClass *klass)
+cc_carousel_class_init (CcCarouselClass *klass)
 {
         GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass);
         GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
 
         gtk_widget_class_set_template_from_resource (wclass,
-                                                     "/org/gnome/control-center/user-accounts/carousel.ui");
+                                                     
"/org/gnome/control-center/user-accounts/cc-carousel.ui");
 
-        gtk_widget_class_bind_template_child (wclass, UmCarousel, stack);
-        gtk_widget_class_bind_template_child (wclass, UmCarousel, go_back_button);
-        gtk_widget_class_bind_template_child (wclass, UmCarousel, go_next_button);
-        gtk_widget_class_bind_template_child (wclass, UmCarousel, arrow);
+        gtk_widget_class_bind_template_child (wclass, CcCarousel, stack);
+        gtk_widget_class_bind_template_child (wclass, CcCarousel, go_back_button);
+        gtk_widget_class_bind_template_child (wclass, CcCarousel, go_next_button);
+        gtk_widget_class_bind_template_child (wclass, CcCarousel, arrow);
 
-        gtk_widget_class_bind_template_callback (wclass, um_carousel_goto_previous_page);
-        gtk_widget_class_bind_template_callback (wclass, um_carousel_goto_next_page);
+        gtk_widget_class_bind_template_callback (wclass, cc_carousel_goto_previous_page);
+        gtk_widget_class_bind_template_callback (wclass, cc_carousel_goto_next_page);
 
-        container_class->add = um_carousel_add;
+        container_class->add = cc_carousel_add;
 
         signals[ITEM_ACTIVATED] = g_signal_new ("item-activated",
-                                                UM_TYPE_CAROUSEL,
+                                                CC_TYPE_CAROUSEL,
                                                 G_SIGNAL_RUN_LAST,
                                                 0,
                                                 NULL, NULL,
                                                 g_cclosure_marshal_VOID__OBJECT,
                                                 G_TYPE_NONE, 1,
-                                                UM_TYPE_CAROUSEL_ITEM);
+                                                CC_TYPE_CAROUSEL_ITEM);
 }
 
 static void
-on_size_allocate (UmCarousel *self)
+on_size_allocate (CcCarousel *self)
 {
        if (self->selected_item == NULL)
                return;
@@ -373,19 +373,19 @@ on_size_allocate (UmCarousel *self)
        if (gtk_stack_get_transition_running (self->stack))
                return;
 
-       self->arrow_start_x = um_carousel_item_get_x (self->selected_item, self);
-       um_carousel_move_arrow (self);
+       self->arrow_start_x = cc_carousel_item_get_x (self->selected_item, self);
+       cc_carousel_move_arrow (self);
 }
 
 static void
-on_transition_running (UmCarousel *self)
+on_transition_running (CcCarousel *self)
 {
         if (!gtk_stack_get_transition_running (self->stack))
-                um_carousel_move_arrow (self);
+                cc_carousel_move_arrow (self);
 }
 
 static void
-um_carousel_init (UmCarousel *self)
+cc_carousel_init (CcCarousel *self)
 {
         GtkStyleProvider *provider;
 
@@ -406,7 +406,7 @@ um_carousel_init (UmCarousel *self)
 }
 
 guint
-um_carousel_get_item_count (UmCarousel *self)
+cc_carousel_get_item_count (CcCarousel *self)
 {
         return g_list_length (self->children);
 }
diff --git a/panels/user-accounts/um-carousel.h b/panels/user-accounts/cc-carousel.h
similarity index 61%
rename from panels/user-accounts/um-carousel.h
rename to panels/user-accounts/cc-carousel.h
index d6da5cd88..8cd3f9af2 100644
--- a/panels/user-accounts/um-carousel.h
+++ b/panels/user-accounts/cc-carousel.h
@@ -24,27 +24,27 @@
 
 G_BEGIN_DECLS
 
-#define UM_TYPE_CAROUSEL_ITEM (um_carousel_item_get_type ())
+#define CC_TYPE_CAROUSEL_ITEM (cc_carousel_item_get_type ())
 
-G_DECLARE_FINAL_TYPE (UmCarouselItem, um_carousel_item, UM, CAROUSEL_ITEM, GtkRadioButton)
+G_DECLARE_FINAL_TYPE (CcCarouselItem, cc_carousel_item, CC, CAROUSEL_ITEM, GtkRadioButton)
 
-#define UM_TYPE_CAROUSEL (um_carousel_get_type ())
+#define CC_TYPE_CAROUSEL (cc_carousel_get_type ())
 
-G_DECLARE_FINAL_TYPE (UmCarousel, um_carousel, UM, CAROUSEL, GtkRevealer)
+G_DECLARE_FINAL_TYPE (CcCarousel, cc_carousel, CC, CAROUSEL, GtkRevealer)
 
-GtkWidget       *um_carousel_item_new    (void);
+GtkWidget       *cc_carousel_item_new    (void);
 
-UmCarousel      *um_carousel_new         (void);
+CcCarousel      *cc_carousel_new         (void);
 
-void             um_carousel_purge_items (UmCarousel     *self);
+void             cc_carousel_purge_items (CcCarousel     *self);
 
-UmCarouselItem  *um_carousel_find_item   (UmCarousel     *self,
+CcCarouselItem  *cc_carousel_find_item   (CcCarousel     *self,
                                           gconstpointer   data,
                                           GCompareFunc    func);
 
-void             um_carousel_select_item (UmCarousel     *self,
-                                          UmCarouselItem *item);
+void             cc_carousel_select_item (CcCarousel     *self,
+                                          CcCarouselItem *item);
 
-guint            um_carousel_get_item_count (UmCarousel  *self);
+guint            cc_carousel_get_item_count (CcCarousel  *self);
 
 G_END_DECLS
diff --git a/panels/user-accounts/data/carousel.ui b/panels/user-accounts/cc-carousel.ui
similarity index 94%
rename from panels/user-accounts/data/carousel.ui
rename to panels/user-accounts/cc-carousel.ui
index 301a03855..77ba44b88 100644
--- a/panels/user-accounts/data/carousel.ui
+++ b/panels/user-accounts/cc-carousel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 3.8 -->
-  <template class="UmCarousel" parent="GtkRevealer">
+  <template class="CcCarousel" parent="GtkRevealer">
     <property name="transition_duration">400</property>
     <property name="reveal-child">True</property>
     <child>
@@ -43,7 +43,7 @@
                         <property name="icon_name">go-previous-symbolic</property>
                       </object>
                     </child>
-                    <signal name="clicked" handler="um_carousel_goto_previous_page" object="UmCarousel" 
swapped="no"/>
+                    <signal name="clicked" handler="cc_carousel_goto_previous_page" object="CcCarousel" 
swapped="no"/>
                   </object>
                   <packing>
                     <property name="pack_type">GTK_PACK_START</property>
@@ -64,7 +64,7 @@
                         <property name="icon_name">go-next-symbolic</property>
                       </object>
                     </child>
-                    <signal name="clicked" handler="um_carousel_goto_next_page" object="UmCarousel" 
swapped="no"/>
+                    <signal name="clicked" handler="cc_carousel_goto_next_page" object="CcCarousel" 
swapped="no"/>
                   </object>
                   <packing>
                     <property name="pack_type">GTK_PACK_END</property>
diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
index b5f2ba13d..b87306704 100644
--- a/panels/user-accounts/cc-user-panel.c
+++ b/panels/user-accounts/cc-user-panel.c
@@ -39,12 +39,12 @@
 #include <libgnome-desktop/gnome-languages.h>
 
 #include "cc-add-user-dialog.h"
+#include "cc-carousel.h"
 #include "cc-language-chooser.h"
 #include "cc-login-history-dialog.h"
 #include "cc-password-dialog.h"
 #include "cc-user-accounts-resources.h"
 #include "cc-user-image.h"
-#include "um-carousel.h"
 #include "um-photo-dialog.h"
 #include "um-fingerprint-dialog.h"
 #include "um-utils.h"
@@ -72,7 +72,7 @@ struct _CcUserPanel {
         GtkBox          *autologin_box;
         GtkLabel        *autologin_label;
         GtkSwitch       *autologin_switch;
-        UmCarousel      *carousel;
+        CcCarousel      *carousel;
         GtkButton       *fingerprint_button;
         GtkLabel        *fingerprint_label;
         GtkEntry        *full_name_entry;
@@ -175,7 +175,7 @@ get_real_or_user_name (ActUser *user)
 static void show_user (ActUser *user, CcUserPanel *self);
 
 static void
-set_selected_user (CcUserPanel *self, UmCarouselItem *item)
+set_selected_user (CcUserPanel *self, CcCarouselItem *item)
 {
         uid_t uid;
 
@@ -238,7 +238,7 @@ user_added (CcUserPanel *self, ActUser *user)
         g_debug ("user added: %d %s\n", act_user_get_uid (user), get_real_or_user_name (user));
 
         widget = create_carousel_entry (self, user);
-        item = um_carousel_item_new ();
+        item = cc_carousel_item_new ();
         gtk_container_add (GTK_CONTAINER (item), widget);
 
         g_object_set_data (G_OBJECT (item), "uid", GINT_TO_POINTER (act_user_get_uid (user)));
@@ -290,7 +290,7 @@ reload_users (CcUserPanel *self, ActUser *selected_user)
 {
         ActUser *user;
         GSList *list, *l;
-        UmCarouselItem *item = NULL;
+        CcCarouselItem *item = NULL;
         GtkSettings *settings;
         gboolean animations;
 
@@ -299,7 +299,7 @@ reload_users (CcUserPanel *self, ActUser *selected_user)
         g_object_get (settings, "gtk-enable-animations", &animations, NULL);
         g_object_set (settings, "gtk-enable-animations", FALSE, NULL);
 
-        um_carousel_purge_items (self->carousel);
+        cc_carousel_purge_items (self->carousel);
         self->other_accounts = 0;
 
         list = act_user_manager_list_users (self->um);
@@ -313,14 +313,14 @@ reload_users (CcUserPanel *self, ActUser *selected_user)
         }
         g_slist_free (list);
 
-        if (um_carousel_get_item_count (self->carousel) == 0)
+        if (cc_carousel_get_item_count (self->carousel) == 0)
                 gtk_stack_set_visible_child_name (self->stack, PAGE_NO_USERS);
         if (self->other_accounts == 0)
                 gtk_revealer_set_reveal_child (GTK_REVEALER (self->carousel), FALSE);
 
         if (selected_user)
-                item = um_carousel_find_item (self->carousel, selected_user, user_compare);
-        um_carousel_select_item (self->carousel, item);
+                item = cc_carousel_find_item (self->carousel, selected_user, user_compare);
+        cc_carousel_select_item (self->carousel, item);
 
         g_object_set (settings, "gtk-enable-animations", animations, NULL);
 }
@@ -329,12 +329,12 @@ static gint
 user_compare (gconstpointer i,
               gconstpointer u)
 {
-        UmCarouselItem *item;
+        CcCarouselItem *item;
         ActUser *user;
         gint uid_a, uid_b;
         gint result;
 
-        item = (UmCarouselItem *) i;
+        item = (CcCarouselItem *) i;
         user = ACT_USER (u);
 
         uid_a = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "uid"));
@@ -1358,7 +1358,7 @@ cc_user_panel_init (CcUserPanel *self)
 
         /* register types that the builder might need */
         type = cc_user_image_get_type ();
-        type = um_carousel_get_type ();
+        type = cc_carousel_get_type ();
 
         gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/panels/user-accounts/cc-user-panel.ui b/panels/user-accounts/cc-user-panel.ui
index 6eaac6aec..0c144018b 100644
--- a/panels/user-accounts/cc-user-panel.ui
+++ b/panels/user-accounts/cc-user-panel.ui
@@ -105,7 +105,7 @@
                 <property name="orientation">vertical</property>
                 <property name="border_width">0</property>
                 <child>
-                  <object class="UmCarousel" id="carousel">
+                  <object class="CcCarousel" id="carousel">
                     <property name="visible">True</property>
                     <signal name="item-activated" handler="set_selected_user" object="CcUserPanel" 
swapped="yes"/>
                   </object>
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index 479fea6ce..55e6948d7 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -102,6 +102,7 @@ common_sources = files(
 
 resource_data = files(
   'cc-add-user-dialog.ui',
+  'cc-carousel.ui',
   'cc-login-history-dialog.ui',
   'cc-password-dialog.ui',
   'cc-user-panel.ui',
@@ -119,7 +120,6 @@ resource_data = files(
   'data/icons/right-thumb.png',
   'data/account-fingerprint.ui',
   'data/carousel.css',
-  'data/carousel.ui',
   'data/join-dialog.ui',
   'data/user-accounts-dialog.css',
 )
@@ -144,13 +144,13 @@ common_sources += gnome.gdbus_codegen(
 )
 
 sources = common_sources + files(
+  'cc-carousel.c',
   'cc-crop-area.c',
   'cc-login-history-dialog.c',
   'cc-password-dialog.c',
   'cc-user-image.c',
   'cc-user-panel.c',
   'run-passwd.c',
-  'um-carousel.c',
   'um-fingerprint-dialog.c',
   'um-photo-dialog.c',
 )
diff --git a/panels/user-accounts/user-accounts.gresource.xml 
b/panels/user-accounts/user-accounts.gresource.xml
index 32f24a61f..1c0d442dd 100644
--- a/panels/user-accounts/user-accounts.gresource.xml
+++ b/panels/user-accounts/user-accounts.gresource.xml
@@ -2,6 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/control-center/user-accounts">
     <file preprocess="xml-stripblanks">cc-add-user-dialog.ui</file>
+    <file preprocess="xml-stripblanks">cc-carousel.ui</file>
     <file preprocess="xml-stripblanks">cc-login-history-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-password-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-user-panel.ui</file>
@@ -9,7 +10,6 @@
     <file alias="join-dialog.ui" preprocess="xml-stripblanks">data/join-dialog.ui</file>
     <file alias="account-fingerprint.ui" preprocess="xml-stripblanks">data/account-fingerprint.ui</file>
     <file alias="user-accounts-dialog.css">data/user-accounts-dialog.css</file>
-    <file alias="carousel.ui" preprocess="xml-stripblanks">data/carousel.ui</file>
     <file alias="carousel.css">data/carousel.css</file>
     <file alias="left-index-finger.png">data/icons/left-index-finger.png</file>
     <file alias="left-middle-finger.png">data/icons/left-middle-finger.png</file>