[gnome-control-center] user-accounts: Fix uninstalled files location
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: Fix uninstalled files location
- Date: Fri, 21 Jan 2011 14:49:42 +0000 (UTC)
commit 21b79f304587f7caff3625f36da1b0f5b199f257
Author: Bastien Nocera <hadess hadess net>
Date: Fri Jan 21 14:49:04 2011 +0000
user-accounts: Fix uninstalled files location
Uninstalled .ui files aren't in ../data/ anymore, but in data/
panels/user-accounts/um-account-dialog.c | 2 +-
panels/user-accounts/um-fingerprint-dialog.c | 2 +-
panels/user-accounts/um-language-dialog.c | 2 +-
panels/user-accounts/um-password-dialog.c | 2 +-
panels/user-accounts/um-user-panel.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
index 6bf485a..73803c0 100644
--- a/panels/user-accounts/um-account-dialog.c
+++ b/panels/user-accounts/um-account-dialog.c
@@ -440,7 +440,7 @@ um_account_dialog_new (void)
filename = UIDIR "/account-dialog.ui";
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- filename = "../data/account-dialog.ui";
+ filename = "data/account-dialog.ui";
if (!gtk_builder_add_from_file (builder, filename, &error)) {
g_error ("%s", error->message);
g_error_free (error);
diff --git a/panels/user-accounts/um-fingerprint-dialog.c b/panels/user-accounts/um-fingerprint-dialog.c
index 58e9890..5df7ad7 100644
--- a/panels/user-accounts/um-fingerprint-dialog.c
+++ b/panels/user-accounts/um-fingerprint-dialog.c
@@ -576,7 +576,7 @@ enroll_fingerprints (GtkWindow *parent,
dialog = gtk_builder_new ();
filename = UIDIR "/account-fingerprint.ui";
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- filename = "../data/account-fingerprint.ui";
+ filename = "data/account-fingerprint.ui";
if (!gtk_builder_add_from_file (dialog, filename, &error)) {
g_error ("%s", error->message);
g_error_free (error);
diff --git a/panels/user-accounts/um-language-dialog.c b/panels/user-accounts/um-language-dialog.c
index 7b06332..24fa485 100644
--- a/panels/user-accounts/um-language-dialog.c
+++ b/panels/user-accounts/um-language-dialog.c
@@ -330,7 +330,7 @@ um_language_chooser_new (void)
builder = gtk_builder_new ();
filename = UIDIR "/language-chooser.ui";
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- filename = "../data/language-chooser.ui";
+ filename = "data/language-chooser.ui";
if (!gtk_builder_add_from_file (builder, filename, &error)) {
g_warning ("failed to load language chooser: %s", error->message);
g_error_free (error);
diff --git a/panels/user-accounts/um-password-dialog.c b/panels/user-accounts/um-password-dialog.c
index a78d07d..a7c9223 100644
--- a/panels/user-accounts/um-password-dialog.c
+++ b/panels/user-accounts/um-password-dialog.c
@@ -620,7 +620,7 @@ um_password_dialog_new (void)
error = NULL;
filename = UIDIR "/password-dialog.ui";
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- filename = "../data/password-dialog.ui";
+ filename = "data/password-dialog.ui";
if (!gtk_builder_add_from_file (builder, filename, &error)) {
g_error ("%s", error->message);
g_error_free (error);
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index afb9ab9..fc25ae1 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1215,7 +1215,7 @@ um_user_panel_init (UmUserPanel *self)
filename = UIDIR "/user-accounts-dialog.ui";
if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
- filename = "../data/user-accounts-dialog.ui";
+ filename = "data/user-accounts-dialog.ui";
}
error = NULL;
if (!gtk_builder_add_from_file (d->builder, filename, &error)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]