dist-git conversion

0001-Fix-a-possible-crash-when-changing-password.patch

@@ -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
+

0001-Fix-some-issues-with-icon-handling.patch

@@ -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
+

0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch

@@ -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
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: accountsdialog
-# $Id$
-NAME := accountsdialog
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

accountsdialog.spec

@@ -1,15 +1,22 @@
 Name:           accountsdialog
-Version:        0.5
-Release:        1%{?dist}
+Version:        0.6
+Release:        3%{?dist}
 Summary:        An application to view and modify user accounts information
 
 Group:          Applications/System
 License:        GPLv3+
 URL:            http://www.fedoraproject.org/wiki/Features/UserAccountDialog
-Source0:        http://download.gnome.org/sources/accountsdialog/0.5/accountsdialog-0.5.tar.bz2
+#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
+
+Requires: cheese-libs >= 2.29.90
 
 BuildRequires:  intltool
 BuildRequires:  glib2-devel
@@ -24,7 +31,7 @@ BuildRequires:  cheese-libs-devel
 BuildRequires:  apg
 BuildRequires:  desktop-file-utils
 
-Requires:       accountsservice
+Requires:       accountsservice >= 0.6
 Requires:       apg
 Requires:       GConf2
 Requires:       passwd
@@ -37,6 +44,8 @@ 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
@@ -64,6 +73,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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

import.log

@@ -1 +0,0 @@
-accountsdialog-0_4_1-1_fc12:HEAD:accountsdialog-0.4.1-1.fc12.src.rpm:1265211308

sources

@@ -1 +1 @@
-59e2bc339c60a6b11c0d97c47d3a391d  accountsdialog-0.5.tar.bz2
+7e6dc4dd8a8d83b49df613a65e911eaf  accountsdialog-0.6.tar.bz2