[gnome-control-center] user-accounts: Rename um-utils.[ch] to user-utils.[ch]



commit b40b0a4d05fae06d555fa289f7651afaf865897d
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Nov 8 11:00:37 2018 +1300

    user-accounts: Rename um-utils.[ch] to user-utils.[ch]
    
    Um is a naming hangover from before this was part of g-c-c.

 panels/user-accounts/cc-add-user-dialog.c         | 2 +-
 panels/user-accounts/cc-login-history-dialog.c    | 2 +-
 panels/user-accounts/cc-password-dialog.c         | 2 +-
 panels/user-accounts/cc-user-panel.c              | 2 +-
 panels/user-accounts/meson.build                  | 2 +-
 panels/user-accounts/{um-utils.c => user-utils.c} | 2 +-
 panels/user-accounts/{um-utils.h => user-utils.h} | 0
 po/POTFILES.in                                    | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/panels/user-accounts/cc-add-user-dialog.c b/panels/user-accounts/cc-add-user-dialog.c
index 70a768b01..e15170ee9 100644
--- a/panels/user-accounts/cc-add-user-dialog.c
+++ b/panels/user-accounts/cc-add-user-dialog.c
@@ -27,7 +27,7 @@
 
 #include "cc-add-user-dialog.h"
 #include "cc-realm-manager.h"
-#include "um-utils.h"
+#include "user-utils.h"
 #include "pw-utils.h"
 
 #define PASSWORD_CHECK_TIMEOUT 600
diff --git a/panels/user-accounts/cc-login-history-dialog.c b/panels/user-accounts/cc-login-history-dialog.c
index bd7230504..4ccf15dac 100644
--- a/panels/user-accounts/cc-login-history-dialog.c
+++ b/panels/user-accounts/cc-login-history-dialog.c
@@ -33,7 +33,7 @@
 #include "cc-login-history-dialog.h"
 #include "cc-user-accounts-resources.h"
 #include "cc-util.h"
-#include "um-utils.h"
+#include "user-utils.h"
 
 struct _CcLoginHistoryDialog
 {
diff --git a/panels/user-accounts/cc-password-dialog.c b/panels/user-accounts/cc-password-dialog.c
index 3a57485c3..449b1b1a3 100644
--- a/panels/user-accounts/cc-password-dialog.c
+++ b/panels/user-accounts/cc-password-dialog.c
@@ -34,7 +34,7 @@
 #include "cc-user-accounts-resources.h"
 #include "pw-utils.h"
 #include "run-passwd.h"
-#include "um-utils.h"
+#include "user-utils.h"
 
 #define PASSWORD_CHECK_TIMEOUT 600
 
diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
index 5002ba4fe..ab933e47f 100644
--- a/panels/user-accounts/cc-user-panel.c
+++ b/panels/user-accounts/cc-user-panel.c
@@ -48,7 +48,7 @@
 #include "cc-user-accounts-resources.h"
 #include "cc-user-image.h"
 #include "um-fingerprint-dialog.h"
-#include "um-utils.h"
+#include "user-utils.h"
 
 #include "cc-common-language.h"
 #include "cc-util.h"
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index cda198a23..b1c322a6b 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -97,7 +97,7 @@ common_sources = files(
   'cc-add-user-dialog.c',
   'cc-realm-manager.c',
   'pw-utils.c',
-  'um-utils.c'
+  'user-utils.c',
 )
 
 resource_data = files(
diff --git a/panels/user-accounts/um-utils.c b/panels/user-accounts/user-utils.c
similarity index 99%
rename from panels/user-accounts/um-utils.c
rename to panels/user-accounts/user-utils.c
index 5f1b30974..1aafe82e0 100644
--- a/panels/user-accounts/um-utils.c
+++ b/panels/user-accounts/user-utils.c
@@ -31,7 +31,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include "um-utils.h"
+#include "user-utils.h"
 
 typedef struct {
         gchar *text;
diff --git a/panels/user-accounts/um-utils.h b/panels/user-accounts/user-utils.h
similarity index 100%
rename from panels/user-accounts/um-utils.h
rename to panels/user-accounts/user-utils.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f1ee0795e..948685c23 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -210,8 +210,8 @@ panels/user-accounts/data/join-dialog.ui
 panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in
 panels/user-accounts/pw-utils.c
 panels/user-accounts/run-passwd.c
+panels/user-accounts/user-utils.c
 panels/user-accounts/um-fingerprint-dialog.c
-panels/user-accounts/um-utils.c
 panels/wacom/button-mapping.ui
 panels/wacom/calibrator/calibrator.ui
 panels/wacom/cc-wacom-button-row.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]