[accounts-dialog: 17/19] Merge branch 'control-center-panel'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [accounts-dialog: 17/19] Merge branch 'control-center-panel'
- Date: Fri, 16 Jul 2010 03:00:20 +0000 (UTC)
commit db413ae3b6912d7b7477c558f651c2861720d44e
Merge: e82ba94 5bd7ec3
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jul 15 22:16:38 2010 -0400
Merge branch 'control-center-panel'
configure.ac | 8 +-
data/photo-dialog.ui | 4 +-
data/user-accounts-dialog.ui | 307 ++-----------
src/Makefile.am | 52 ++-
src/um-editable-button.c | 403 ++++++++++++++++
src/um-editable-button.h | 72 +++
src/um-editable-combo.c | 439 +++++++++++++++++
src/um-editable-combo.h | 76 +++
src/um-editable-entry.c | 487 +++++++++++++++++++
src/um-editable-entry.h | 72 +++
src/um-language-dialog.c | 68 ++--
src/um-language-dialog.h | 9 +-
src/um-login-options.c | 13 +
src/um-photo-dialog.c | 17 +-
src/um-photo-dialog.h | 3 +-
src/um-user-module.c | 41 ++
src/{main.c => um-user-panel.c} | 1005 +++++++++++----------------------------
src/um-user-panel.h | 59 +++
src/um-user.c | 2 +-
src/user-panel.desktop.in | 9 +
20 files changed, 2072 insertions(+), 1074 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]