[gnome-control-center] user-accounts: Switch from UmStrengthBar to CcStrengthBar

[Richard Hughes <rhughes src gnome org>]

commit ccf5d0028c558134ee9dd53c7238fa4789f46271
Author: Richard Hughes <richard hughsie com>
Date:   Tue Feb 14 16:56:23 2012 +0000

    user-accounts: Switch from UmStrengthBar to CcStrengthBar

 panels/user-accounts/Makefile.am             |    3 +-
 panels/user-accounts/data/password-dialog.ui |    2 +-
 panels/user-accounts/um-password-dialog.c    |    4 +-
 panels/user-accounts/um-strength-bar.c       |  264 --------------------------
 panels/user-accounts/um-strength-bar.h       |   62 ------
 panels/user-accounts/um-user-panel.c         |    4 +-
 6 files changed, 6 insertions(+), 333 deletions(-)
---
diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am
index 5a81737..2907f01 100644
--- a/panels/user-accounts/Makefile.am
+++ b/panels/user-accounts/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS =						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
 	-I$(srcdir)/../common/				\
+	-I$(srcdir)/../../shell/			\
 	$(PANEL_CFLAGS)					\
 	$(USER_ACCOUNTS_PANEL_CFLAGS)
 
@@ -41,8 +42,6 @@ libuser_accounts_la_SOURCES =		\
 	um-utils.h			\
 	um-utils.c			\
 	fingerprint-strings.h		\
-	um-strength-bar.h		\
-	um-strength-bar.c		\
 	run-passwd.h			\
 	run-passwd.c			\
 	um-editable-button.h		\
diff --git a/panels/user-accounts/data/password-dialog.ui b/panels/user-accounts/data/password-dialog.ui
index e80d657..b2f8e36 100644
--- a/panels/user-accounts/data/password-dialog.ui
+++ b/panels/user-accounts/data/password-dialog.ui
@@ -245,7 +245,7 @@
                             <property name="top_padding">6</property>
                             <property name="bottom_padding">6</property>
                             <child>
-                              <object class="UmStrengthBar" id="strength-indicator">
+                              <object class="CcStrengthBar" id="strength-indicator">
                                 <property name="visible">True</property>
                               </object>
                             </child>
diff --git a/panels/user-accounts/um-password-dialog.c b/panels/user-accounts/um-password-dialog.c
index 713a4cb..d6aec6d 100644
--- a/panels/user-accounts/um-password-dialog.c
+++ b/panels/user-accounts/um-password-dialog.c
@@ -32,7 +32,7 @@
 
 #include "um-password-dialog.h"
 #include "um-user-manager.h"
-#include "um-strength-bar.h"
+#include "cc-strength-bar.h"
 #include "um-utils.h"
 #include "run-passwd.h"
 
@@ -474,7 +474,7 @@ update_password_strength (UmPasswordDialog *um)
         else
                 hint = C_("Password strength", "Strong");
 
-        um_strength_bar_set_strength (UM_STRENGTH_BAR (um->strength_indicator), strength);
+        cc_strength_bar_set_fraction (CC_STRENGTH_BAR (um->strength_indicator), strength);
         gtk_label_set_label (GTK_LABEL (um->strength_indicator_label), hint);
 }
 
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index 6b6b22b..c4777ab 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -42,7 +42,7 @@
 #include "um-user.h"
 #include "um-user-manager.h"
 
-#include "um-strength-bar.h"
+#include "cc-strength-bar.h"
 #include "um-editable-button.h"
 #include "um-editable-combo.h"
 
@@ -1244,7 +1244,7 @@ um_user_panel_init (UmUserPanel *self)
         d = self->priv = UM_USER_PANEL_PRIVATE (self);
 
         /* register types that the builder might need */
-        type = um_strength_bar_get_type ();
+        type = cc_strength_bar_get_type ();
         type = um_editable_button_get_type ();
         type = cc_editable_entry_get_type ();
         type = um_editable_combo_get_type ();