rpms/accountsdialog
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:main
rpms:f14
rpms:f13
rpms:accountsdialog-0_6-3_fc13
rpms:accountsdialog-0_6-3_fc14
rpms:accountsdialog-0_6-2_fc13
rpms:accountsdialog-0_6-2_fc14
rpms:accountsdialog-0_6-1_fc13
rpms:accountsdialog-0_6-1_fc14
rpms:accountsdialog-0_5_1-3_fc13
rpms:accountsdialog-0_5_1-2_fc13
rpms:accountsdialog-0_5_1-2_fc14
rpms:accountsdialog-0_5_2-1_fc14
rpms:accountsdialog-0_5_1-1_fc13
rpms:accountsdialog-0_5_1-1_fc14
rpms:accountsdialog-0_5-2_fc14
rpms:accountsdialog-0_5-2_fc13
rpms:accountsdialog-0_5-1_fc13
rpms:F-13-start
rpms:F-13-split
rpms:accountsdialog-0_4_1-2_fc13
rpms:accountsdialog-0_4_1-1_fc13
..
compare: rpms:f14
Branches Tags
rpms:main
rpms:rawhide
rpms:f14
rpms:f13
rpms:accountsdialog-0_6-3_fc13
rpms:accountsdialog-0_6-3_fc14
rpms:accountsdialog-0_6-2_fc13
rpms:accountsdialog-0_6-2_fc14
rpms:accountsdialog-0_6-1_fc13
rpms:accountsdialog-0_6-1_fc14
rpms:accountsdialog-0_5_1-3_fc13
rpms:accountsdialog-0_5_1-2_fc13
rpms:accountsdialog-0_5_1-2_fc14
rpms:accountsdialog-0_5_2-1_fc14
rpms:accountsdialog-0_5_1-1_fc13
rpms:accountsdialog-0_5_1-1_fc14
rpms:accountsdialog-0_5-2_fc14
rpms:accountsdialog-0_5-2_fc13
rpms:accountsdialog-0_5-1_fc13
rpms:F-13-start
rpms:F-13-split
rpms:accountsdialog-0_4_1-2_fc13
rpms:accountsdialog-0_4_1-1_fc13

1 commit
rawhide ... f14

Author SHA1 Message Date
Matthias Clasen
e484a8a4c7 Drop explicit cheese-libs dep 2010-08-13 12:32:55 -04:00
9 changed files with 390 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
0001-Explicitely-require-gstreamer-0.10-for-linking.patch Normal file
View file

@ -0,0 +1,29 @@
From def097f5f374cc490ea0307eddd9f3894cfade03 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 10 Feb 2010 10:54:59 +0000
Subject: [PATCH] Explicitely require gstreamer-0.10 for linking
Otherwise we get this error:
/usr/bin/ld: main.o: undefined reference to symbol 'gst_init_get_option_group'
/usr/bin/ld: note: 'gst_init_get_option_group' is defined in DSO /usr/lib/libgstreamer-0.10.so.0 so try adding it to the linker command line
/usr/lib/libgstreamer-0.10.so.0: could not read symbols: Invalid operation
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 43d6452..01b4533 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
PKG_CHECK_MODULES(UNIQUE, unique-1.0)
PKG_CHECK_MODULES(POLKIT, polkit-gtk-1)
PKG_CHECK_MODULES(GCONF, gconf-2.0)
-PKG_CHECK_MODULES(CHEESE, cheese-gtk > 2.29.6, have_cheese=yes, have_cheese=no)
+PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk > 2.29.6, have_cheese=yes, have_cheese=no)
if test x$have_cheese = xyes ; then
AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
--
1.6.6

49
0001-Fix-a-possible-crash-when-changing-password.patch Normal file
View file

@ -0,0 +1,49 @@
From adf5a77d5f4f5f0e94f0fad669ee7192d1a5f5f5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 5 Apr 2010 22:03:02 -0400
Subject: [PATCH] Fix a possible crash when changing password
---
src/run-passwd.c | 1 -
src/um-password-dialog.c | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/run-passwd.c b/src/run-passwd.c
index c702364..7e40661 100644
--- a/src/run-passwd.c
+++ b/src/run-passwd.c
@@ -57,7 +57,6 @@ typedef enum {
struct PasswdHandler {
const char *current_password;
const char *new_password;
- const char *retyped_password;
/* Communication with the passwd program */
GPid backend_pid;
diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c
index d581a18..81c03dd 100644
--- a/src/um-password-dialog.c
+++ b/src/um-password-dialog.c
@@ -777,10 +777,6 @@ um_password_dialog_set_user (UmPasswordDialog *um,
GdkPixbuf *pixbuf;
GtkTreeModel *model;
- if (um->passwd_handler) {
- passwd_destroy (um->passwd_handler);
- um->passwd_handler = NULL;
- }
if (um->user) {
g_object_unref (um->user);
um->user = NULL;
@@ -803,6 +799,8 @@ um_password_dialog_set_user (UmPasswordDialog *um,
if (um_user_get_uid (um->user) == getuid()) {
gtk_widget_show (um->old_password_label);
gtk_widget_show (um->old_password_entry);
+ if (um->passwd_handler != NULL)
+ passwd_destroy (um->passwd_handler);
um->passwd_handler = passwd_init ();
um->old_password_ok = FALSE;
}
--
1.7.0.1

51
0001-Fix-some-issues-with-icon-handling.patch Normal file
View file

@ -0,0 +1,51 @@
From 8ad8318ae483cae8f6a9b53245e10de428e55a63 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 5 Apr 2010 11:31:01 -0400
Subject: [PATCH] Fix some issues with icon handling
Preserve alpha channels if present in the file, and be careful
about not passing out-of-bounds coordinates to gdk_pixbuf_new_subpixbuf()
---
src/um-crop-area.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/um-crop-area.c b/src/um-crop-area.c
index 2c473a1..14ba5ee 100644
--- a/src/um-crop-area.c
+++ b/src/um-crop-area.c
@@ -107,8 +107,10 @@ update_pixbufs (UmCropArea *area)
gdk_pixbuf_get_height (area->priv->pixbuf) != allocation.height) {
if (area->priv->pixbuf != NULL)
g_object_unref (area->priv->pixbuf);
- area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
- allocation.width, allocation.height);
+ area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ gdk_pixbuf_get_has_alpha (area->priv->browse_pixbuf),
+ 8,
+ allocation.width, allocation.height);
color = &widget->style->bg[GTK_WIDGET_STATE (widget)];
pixel = ((color->red & 0xff00) << 16) |
@@ -800,9 +802,17 @@ um_crop_area_new (void)
GdkPixbuf *
um_crop_area_get_picture (UmCropArea *area)
{
+ gint width, height;
+
+ width = gdk_pixbuf_get_width (area->priv->browse_pixbuf);
+ height = gdk_pixbuf_get_height (area->priv->browse_pixbuf);
+ width = MIN (area->priv->crop.width, width - area->priv->crop.x);
+ height = MIN (area->priv->crop.height, height - area->priv->crop.y);
+
return gdk_pixbuf_new_subpixbuf (area->priv->browse_pixbuf,
- area->priv->crop.x, area->priv->crop.y,
- area->priv->crop.width, area->priv->crop.height);
+ area->priv->crop.x,
+ area->priv->crop.y,
+ width, height);
}
void
--
1.7.0.1

51
0001-Remove-unused-m4-macros.patch Normal file
View file

@ -0,0 +1,51 @@
From 31fb4bbef99a7ca0ab3626921fc4e12f85fa2929 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 10 Feb 2010 11:08:02 +0000
Subject: [PATCH] Remove unused m4 macros
---
Makefile.am | 2 -
m4/Makefile.am | 9 -
m4/gettext.m4 | 381 ----------------------------
m4/gettext.m4~ | 381 ----------------------------
m4/iconv.m4 | 180 --------------
m4/iconv.m4~ | 180 --------------
m4/lib-ld.m4 | 110 ---------
m4/lib-ld.m4~ | 110 ---------
m4/lib-link.m4 | 709 -----------------------------------------------------
m4/lib-link.m4~ | 709 -----------------------------------------------------
m4/lib-prefix.m4 | 185 --------------
m4/lib-prefix.m4~ | 185 --------------
m4/nls.m4 | 31 ---
m4/nls.m4~ | 31 ---
m4/po.m4 | 449 ---------------------------------
m4/po.m4~ | 449 ---------------------------------
m4/progtest.m4 | 92 -------
m4/progtest.m4~ | 92 -------
18 files changed, 0 insertions(+), 4285 deletions(-)
delete mode 100644 m4/Makefile.am
delete mode 100644 m4/gettext.m4
delete mode 100644 m4/gettext.m4~
delete mode 100644 m4/iconv.m4
delete mode 100644 m4/iconv.m4~
delete mode 100644 m4/lib-ld.m4
delete mode 100644 m4/lib-ld.m4~
delete mode 100644 m4/lib-link.m4
delete mode 100644 m4/lib-link.m4~
delete mode 100644 m4/lib-prefix.m4
delete mode 100644 m4/lib-prefix.m4~
delete mode 100644 m4/nls.m4
delete mode 100644 m4/nls.m4~
delete mode 100644 m4/po.m4
delete mode 100644 m4/po.m4~
delete mode 100644 m4/progtest.m4
delete mode 100644 m4/progtest.m4~
diff --git a/Makefile.am b/Makefile.am
index 4f2fe8c..c4b9f50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1 @@
SUBDIRS = src data po
-
-ACLOCAL_AMFLAGS = -I m4

29
0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch Normal file
View file

@ -0,0 +1,29 @@
From 9182adfcf23a5cdaff79c19c1d738f2d44c88889 Mon Sep 17 00:00:00 2001
From: Filippo Argiolas <filippo.argiolas@gmail.com>
Date: Sun, 21 Feb 2010 15:31:23 +0100
Subject: [PATCH 1/2] Update cheese dependencies and reflect recent api changes
---
configure.ac | 2 +-
src/um-photo-dialog.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/um-photo-dialog.c b/src/um-photo-dialog.c
index 14be1e0..d546741 100644
--- a/src/um-photo-dialog.c
+++ b/src/um-photo-dialog.c
@@ -306,7 +306,10 @@ update_photo_menu_status (UmPhotoDialog *um)
static void
device_added (CheeseCameraDeviceMonitor *monitor,
- GObject *device,
+ const gchar *id,
+ const gchar *device_file,
+ const gchar *product_name,
+ gint api_version,
UmPhotoDialog *um)
{
um->num_cameras++;
--
1.6.6.1

109
accountsdialog.spec Normal file
View file

@ -0,0 +1,109 @@
Name: accountsdialog
Version: 0.6
Release: 4%{?dist}
Summary: An application to view and modify user accounts information
Group: Applications/System
License: GPLv3+
URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog
#VCS: git:git://git.gnome.org/accountsdialog
Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{version}.tar.bz2
# hide nonfunctional UI
Patch0: hide-unimplemented-parts.patch
# upstream fix
Patch1: 0001-Fix-some-issues-with-icon-handling.patch
# upstream fix
Patch2: 0001-Fix-a-possible-crash-when-changing-password.patch
BuildRequires: intltool
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
BuildRequires: gnome-desktop-devel
BuildRequires: dbus-glib-devel
BuildRequires: unique-devel
BuildRequires: polkit-gnome-devel
BuildRequires: GConf2-devel
BuildRequires: iso-codes-devel
BuildRequires: cheese-libs-devel
BuildRequires: apg
BuildRequires: desktop-file-utils
Requires: accountsservice >= 0.6
Requires: apg
Requires: GConf2
Requires: passwd
%description
The AccountsDialog project provides an application to view and modify
user account information that is provided by the AccountsService. It
also lets you configure some aspects of the gdm login screen.
%prep
%setup -q
%patch0 -p1 -b .hide-unimplemented-parts
%patch1 -p1 -b .icon-changes
%patch2 -p1 -b .password-crash
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/accountsdialog.desktop
%find_lang accounts-dialog
%clean
rm -rf $RPM_BUILD_ROOT
%files -f accounts-dialog.lang
%defattr(-,root,root,-)
%doc COPYING README AUTHORS
%{_bindir}/accounts-dialog
%{_datadir}/accountsdialog
%{_datadir}/applications/accountsdialog.desktop
%changelog
* Fri Aug 13 2010 Matthias Clasen <mclasen@redhat.com> - 0.6-4
- Drop explicit cheese-libs dep
* Mon Apr 5 2010 Matthias Clasen <mclasen@redhat.com> - 0.6-3
- Fix a possible crash when changing password
* Mon Apr 5 2010 Matthias Clasen <mclasen@redhat.com> - 0.6-2
- Fix some issues with icon handling
* Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> - 0.6-1
- Update to 0.6
* Thu Mar 11 2010 Matthias Clasen <mclasen@redhat.com> - 0.5.1-2
- Rebuild against new cheese
* Mon Mar 1 2010 Matthias Clasen <mclasen@redhat.com> - 0.5.1-1
- Update to 0.5.1
- Password dialog improvements
* Mon Feb 22 2010 Bastien Nocera <bnocera@redhat.com> 0.5-2
- Fix crasher with newer cheese
* Mon Feb 15 2010 Matthias Clasen <mclasen@redhat.com> 0.5-1
- Update to 0.5
- Require passwd
* Tue Feb 09 2010 Bastien Nocera <bnocera@redhat.com> 0.4.1-2
- Compile with webcam avatar capture
* Tue Feb 2 2010 Matthias Clasen <mclasen@redhat.com> 0.4.1-1
- Update to 0.4.1
- Incorporate package review feedback
- Hide unimplemented parts of the UI
* Fri Jan 29 2010 Matthias Clasen <mclasen@redhat.com> 0.4-1
- Initial packaging, based on work of Richard Hughes

2
dead.package
View file

@ -1,2 +0,0 @@
This has been merged upstream in the gnome-control-center, and
will be available in the control-center package in Fedora.

71
hide-unimplemented-parts.patch Normal file
View file

@ -0,0 +1,71 @@
diff --git a/data/user-accounts-dialog.ui b/data/user-accounts-dialog.ui
index da6d217..98d6330 100644
--- a/data/user-accounts-dialog.ui
+++ b/data/user-accounts-dialog.ui
@@ -146,11 +146,11 @@
<property name="column_spacing">10</property>
<child>
<object class="GtkHBox" id="hbox20">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<child>
<object class="GtkButton" id="button11">
<property name="label" translatable="yes">Open</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="xalign">0</property>
@@ -177,7 +177,7 @@
<child>
<object class="GtkButton" id="button10">
<property name="label" translatable="yes">Open</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="xalign">0</property>
@@ -199,6 +199,7 @@
<child>
<object class="GtkLabel" id="account-parental-controls-label1">
<property name="xalign">1</property>
+ <property name="visible">False</property>
<property name="label" translatable="yes">Address Book Card:</property>
<attributes>
<attribute name="foreground" value="#555555555555"/>
@@ -576,7 +577,7 @@
</child>
<child>
<object class="GtkLabel" id="account-parental-controls-label">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Restrictions:</property>
<attributes>
@@ -821,7 +822,7 @@
<child>
<object class="GtkCheckButton" id="dm-show-password-hints-checkbutton">
<property name="label" translatable="yes">Show password hints</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="active">True</property>
@@ -835,7 +836,7 @@
</child>
<child>
<object class="GtkLabel" id="label1">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">A guest account will allow anyone to temporarily log in to this computer without a password. For security, remote logins to this account are not allowed.
@@ -853,7 +854,7 @@
<child>
<object class="GtkCheckButton" id="dm-allow-guest-login-checkbutton">
<property name="label" translatable="yes">Allow guests to log in to this computer</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="active">True</property>

1
sources Normal file
View file

@ -0,0 +1 @@
7e6dc4dd8a8d83b49df613a65e911eaf accountsdialog-0.6.tar.bz2