From 0d754295cec3792bb27878d61864e8c36780b5ea Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Thu, 8 Nov 2018 10:23:00 +1300
Subject: [PATCH] user-accounts: Rename um-resources to
 cc-user-accounts-resources

um- is a naming hangover from before this was part of g-c-c.
---
 panels/user-accounts/cc-login-history-dialog.c | 4 ++--
 panels/user-accounts/cc-password-dialog.c      | 4 ++--
 panels/user-accounts/cc-user-panel.c           | 4 ++--
 panels/user-accounts/meson.build               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/panels/user-accounts/cc-login-history-dialog.c b/panels/user-accounts/cc-login-history-dialog.c
index d262b3f29..bd7230504 100644
--- a/panels/user-accounts/cc-login-history-dialog.c
+++ b/panels/user-accounts/cc-login-history-dialog.c
@@ -31,8 +31,8 @@
 #include <act/act.h>
 
 #include "cc-login-history-dialog.h"
+#include "cc-user-accounts-resources.h"
 #include "cc-util.h"
-#include "um-resources.h"
 #include "um-utils.h"
 
 struct _CcLoginHistoryDialog
@@ -308,7 +308,7 @@ cc_login_history_dialog_class_init (CcLoginHistoryDialogClass *klass)
 void
 cc_login_history_dialog_init (CcLoginHistoryDialog *self)
 {
-        g_resources_register (um_get_resource ());
+        g_resources_register (cc_user_accounts_get_resource ());
 
         gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/user-accounts/cc-password-dialog.c b/panels/user-accounts/cc-password-dialog.c
index 9320a132f..3a57485c3 100644
--- a/panels/user-accounts/cc-password-dialog.c
+++ b/panels/user-accounts/cc-password-dialog.c
@@ -31,9 +31,9 @@
 #include <act/act.h>
 
 #include "cc-password-dialog.h"
+#include "cc-user-accounts-resources.h"
 #include "pw-utils.h"
 #include "run-passwd.h"
-#include "um-resources.h"
 #include "um-utils.h"
 
 #define PASSWORD_CHECK_TIMEOUT 600
@@ -481,7 +481,7 @@ cc_password_dialog_class_init (CcPasswordDialogClass *klass)
 static void
 cc_password_dialog_init (CcPasswordDialog *self)
 {
-        g_resources_register (um_get_resource ());
+        g_resources_register (cc_user_accounts_get_resource ());
 
         gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
index 934beb1b5..691cda7ec 100644
--- a/panels/user-accounts/cc-user-panel.c
+++ b/panels/user-accounts/cc-user-panel.c
@@ -40,6 +40,7 @@
 
 #include "um-user-image.h"
 
+#include "cc-user-accounts-resources.h"
 #include "um-account-dialog.h"
 #include "cc-language-chooser.h"
 #include "cc-login-history-dialog.h"
@@ -48,7 +49,6 @@
 #include "um-photo-dialog.h"
 #include "um-fingerprint-dialog.h"
 #include "um-utils.h"
-#include "um-resources.h"
 
 #include "cc-common-language.h"
 #include "cc-util.h"
@@ -1365,7 +1365,7 @@ cc_user_panel_init (CcUserPanel *self)
         volatile GType type G_GNUC_UNUSED;
         GtkCssProvider *provider;
 
-        g_resources_register (um_get_resource ());
+        g_resources_register (cc_user_accounts_get_resource ());
 
         /* register types that the builder might need */
         type = um_user_image_get_type ();
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index 12ff5d7ee..c77c33a51 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -125,9 +125,9 @@ resource_data = files(
 )
 
 common_sources += gnome.compile_resources(
-  'um-resources',
+  'cc-' + cappletname + '-resources',
   cappletname + '.gresource.xml',
-  c_name: 'um',
+  c_name: 'cc_' + cappletname.underscorify(),
   dependencies: resource_data,
   export: true
 )