[accounts-dialog] Update cheese dependencies and reflect recent api changes
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [accounts-dialog] Update cheese dependencies and reflect recent api changes
- Date: Mon, 22 Feb 2010 13:44:34 +0000 (UTC)
commit 9182adfcf23a5cdaff79c19c1d738f2d44c88889
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Sun Feb 21 15:31:23 2010 +0100
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/configure.ac b/configure.ac
index f87d976..7d18dae 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, gstreamer-0.10 cheese-gtk > 2.29.6, have_cheese=yes, have_cheese=no)
+PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk > 2.29.90, 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])
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++;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]