cheese-camera-device-monitor: move from Empathy to tp-account-widgets

This commit also changes the licence of the moved code from GPL to LGPL.
See GOSSIP-RELICENSING.txt for details.

https://bugzilla.gnome.org/show_bug.cgi?id=699492

6 files changed, 145 insertions, 136 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b75c35a8a..d6b9faa7b 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -104,7 +104,7 @@ libempathy_la_LDFLAGS = \
 
 libempathy_la_SOURCES = \
 	$(libempathy_handwritten_source) \
-	cheese-camera-device-monitor.c cheese-camera-device-monitor.h
+	$(NULL)
 
 libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
diff --git a/libempathy/cheese-camera-device-monitor.h b/libempathy/cheese-camera-device-monitor.h
deleted file mode 100644
index f3cc3db14..000000000
--- a/libempathy/cheese-camera-device-monitor.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* This file is a copy of cheese-camera-device-monitor.h from Empathy. We
- * just renamespaced it to avoid conflicts when linking on libcheese. */
-/*
- * Copyright © 2007,2008 Jaap Haitsma <jaap@haitsma.org>
- * Copyright © 2007-2009 daniel g. siegel <dgsiegel@gnome.org>
- * Copyright © 2008 Ryan zeigler <zeiglerr@gmail.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef __EMPATHY_CAMERA_DEVICE_MONITOR_H__
-#define __EMPATHY_CAMERA_DEVICE_MONITOR_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_CAMERA_DEVICE_MONITOR (empathy_camera_device_monitor_get_type ())
-#define EMPATHY_CAMERA_DEVICE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                               EmpathyCameraDeviceMonitor))
-#define EMPATHY_CAMERA_DEVICE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                            EmpathyCameraDeviceMonitorClass))
-#define EMPATHY_IS_CAMERA_DEVICE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR))
-#define EMPATHY_IS_CAMERA_DEVICE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR))
-#define EMPATHY_CAMERA_DEVICE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                              EmpathyCameraDeviceMonitorClass))
-
-typedef struct _EmpathyCameraDeviceMonitorClass EmpathyCameraDeviceMonitorClass;
-typedef struct _EmpathyCameraDeviceMonitor EmpathyCameraDeviceMonitor;
-
-struct _EmpathyCameraDeviceMonitor
-{
-  GObject parent;
-};
-
-struct _EmpathyCameraDeviceMonitorClass
-{
-  GObjectClass parent_class;
-
-  void (*added)(EmpathyCameraDeviceMonitor *camera,
-                const char                *id,
-                const char                *device_file,
-                const char                *product_name,
-                int                        api_version);
-  void (*removed)(EmpathyCameraDeviceMonitor *camera, const char *id);
-};
-
-GType                      empathy_camera_device_monitor_get_type (void) G_GNUC_CONST;
-EmpathyCameraDeviceMonitor *empathy_camera_device_monitor_new (void);
-void                       empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CAMERA_DEVICE_MONITOR_H__ */
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 6e6691120..cbbd81d4a 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -21,14 +21,14 @@
 #include "config.h"
 #include "empathy-camera-monitor.h"
 
-#include "cheese-camera-device-monitor.h"
+#include <tp-account-widgets/cheese-camera-device-monitor.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 struct _EmpathyCameraMonitorPrivate
 {
-  EmpathyCameraDeviceMonitor *empathy_monitor;
+  TpawCameraDeviceMonitor *empathy_monitor;
   GQueue *cameras;
   gint num_cameras;
 };
@@ -103,7 +103,7 @@ empathy_camera_monitor_free_camera_foreach (gpointer data,
 }
 
 static void
-on_camera_added (EmpathyCameraDeviceMonitor *device,
+on_camera_added (TpawCameraDeviceMonitor *device,
     gchar *id,
     gchar *filename,
     gchar *product_name,
@@ -128,7 +128,7 @@ on_camera_added (EmpathyCameraDeviceMonitor *device,
 }
 
 static void
-on_camera_removed (EmpathyCameraDeviceMonitor *device,
+on_camera_removed (TpawCameraDeviceMonitor *device,
     gchar *id,
     EmpathyCameraMonitor *self)
 {
@@ -205,7 +205,7 @@ empathy_camera_monitor_constructed (GObject *object)
 
   G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->constructed (object);
 
-  empathy_camera_device_monitor_coldplug (self->priv->empathy_monitor);
+  tpaw_camera_device_monitor_coldplug (self->priv->empathy_monitor);
 }
 
 static void
@@ -247,7 +247,7 @@ empathy_camera_monitor_init (EmpathyCameraMonitor *self)
 
   self->priv->cameras = g_queue_new ();
 
-  self->priv->empathy_monitor = empathy_camera_device_monitor_new ();
+  self->priv->empathy_monitor = tpaw_camera_device_monitor_new ();
 
   g_signal_connect (self->priv->empathy_monitor, "added",
       G_CALLBACK (on_camera_added), self);
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index 3aafe3df9..7bbe9f1cc 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -7,9 +7,14 @@ AM_CPPFLAGS =                                           \
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(UDEV_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
+libtp_account_widgets_LIBADD =				\
+	$(UDEV_LIBS)					\
+	$(NULL)
+
 BUILT_SOURCES = 					\
 	tpaw-account-widgets-resources.c		\
 	tpaw-account-widgets-resources.h		\
@@ -62,6 +67,11 @@ libtp_account_widgets_headers =			\
 	totem-subtitle-encoding.h		\
 	$(NULL)
 
+nocheck_sources = \
+	cheese-camera-device-monitor.c		\
+	cheese-camera-device-monitor.h		\
+	$(NULL)
+
 pkglib_LTLIBRARIES = libtp-account-widgets.la
 
 # libtp-account-widgets's API is not stable and will never be, so use -release to make the
@@ -74,6 +84,7 @@ libtp_account_widgets_la_LDFLAGS = \
 libtp_account_widgets_la_SOURCES =			\
 	$(libtp_account_widgets_sources)		\
 	$(libtp_account_widgets_headers)		\
+	$(nocheck_sources)				\
 	$(NULL)
 
 # these are sources that depend on Ubuntu Online Accounts
diff --git a/libempathy/cheese-camera-device-monitor.c b/tp-account-widgets/cheese-camera-device-monitor.c
index 0e868f2b6..84e0fc86c 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/tp-account-widgets/cheese-camera-device-monitor.c
@@ -1,4 +1,4 @@
-/* This file is a copy of cheese-camera-device-monitor.c from Empathy. We
+/* This file is a copy of cheese-camera-device-monitor.c from Tpaw. We
  * just renamespaced it to avoid conflicts when linking on libcheese. */
 /*
  * Copyright © 2007,2008 Jaap Haitsma <jaap@haitsma.org>
@@ -6,20 +6,19 @@
  * Copyright © 2008 Ryan Zeigler <zeiglerr@gmail.com>
  * Copyright © 2010 Filippo Argiolas <filippo.argiolas@gmail.com>
  *
- * Licensed under the GNU General Public License Version 2
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -50,31 +49,31 @@
  * @short_description: Simple object to enumerate v4l devices
  * @include: cheese/cheese-camera-device-monitor.h
  *
- * #EmpathyCameraDeviceMonitor provides a basic interface for
+ * #TpawCameraDeviceMonitor provides a basic interface for
  * video4linux device enumeration and hotplugging.
  *
  * It uses either GUdev or some platform specific code to list video
  * devices.  It is also capable (right now in linux only, with the
  * udev backend) to monitor device plugging and emit a
- * EmpathyCameraDeviceMonitor::added or
- * EmpathyCameraDeviceMonitor::removed signal when an event happens.
+ * TpawCameraDeviceMonitor::added or
+ * TpawCameraDeviceMonitor::removed signal when an event happens.
  */
 
-G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE_OBJECT)
+G_DEFINE_TYPE (TpawCameraDeviceMonitor, tpaw_camera_device_monitor, G_TYPE_OBJECT)
 
-#define EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),                               \
-                                                                                  EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                                  EmpathyCameraDeviceMonitorPrivate))
+#define TPAW_CAMERA_DEVICE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),                               \
+                                                                                  TPAW_TYPE_CAMERA_DEVICE_MONITOR, \
+                                                                                  TpawCameraDeviceMonitorPrivate))
 
-#define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
+#define TPAW_CAMERA_DEVICE_MONITOR_ERROR tpaw_camera_device_monitor_error_quark ()
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-enum EmpathyCameraDeviceMonitorError
+enum TpawCameraDeviceMonitorError
 {
-  EMPATHY_CAMERA_DEVICE_MONITOR_ERROR_UNKNOWN,
-  EMPATHY_CAMERA_DEVICE_MONITOR_ERROR_ELEMENT_NOT_FOUND
+  TPAW_CAMERA_DEVICE_MONITOR_ERROR_UNKNOWN,
+  TPAW_CAMERA_DEVICE_MONITOR_ERROR_ELEMENT_NOT_FOUND
 };
 
 typedef struct
@@ -84,7 +83,7 @@ typedef struct
 #else
   guint filler;
 #endif /* HAVE_UDEV */
-} EmpathyCameraDeviceMonitorPrivate;
+} TpawCameraDeviceMonitorPrivate;
 
 enum
 {
@@ -97,15 +96,15 @@ static guint monitor_signals[LAST_SIGNAL];
 
 #if 0
 GQuark
-empathy_camera_device_monitor_error_quark (void)
+tpaw_camera_device_monitor_error_quark (void)
 {
-  return g_quark_from_static_string ("empathy-camera-error-quark");
+  return g_quark_from_static_string ("tpaw-camera-error-quark");
 }
 #endif
 
 #ifdef HAVE_UDEV
 static void
-empathy_camera_device_monitor_added (EmpathyCameraDeviceMonitor *monitor,
+tpaw_camera_device_monitor_added (TpawCameraDeviceMonitor *monitor,
                                     GUdevDevice               *udevice)
 {
   const char *device_file;
@@ -191,7 +190,7 @@ empathy_camera_device_monitor_added (EmpathyCameraDeviceMonitor *monitor,
 }
 
 static void
-empathy_camera_device_monitor_removed (EmpathyCameraDeviceMonitor *monitor,
+tpaw_camera_device_monitor_removed (TpawCameraDeviceMonitor *monitor,
                                       GUdevDevice               *udevice)
 {
   g_signal_emit (monitor, monitor_signals[REMOVED], 0,
@@ -199,20 +198,20 @@ empathy_camera_device_monitor_removed (EmpathyCameraDeviceMonitor *monitor,
 }
 
 static void
-empathy_camera_device_monitor_uevent_cb (GUdevClient               *client,
+tpaw_camera_device_monitor_uevent_cb (GUdevClient               *client,
                                         const gchar               *action,
                                         GUdevDevice               *udevice,
-                                        EmpathyCameraDeviceMonitor *monitor)
+                                        TpawCameraDeviceMonitor *monitor)
 {
   if (g_str_equal (action, "remove"))
-    empathy_camera_device_monitor_removed (monitor, udevice);
+    tpaw_camera_device_monitor_removed (monitor, udevice);
   else if (g_str_equal (action, "add"))
-    empathy_camera_device_monitor_added (monitor, udevice);
+    tpaw_camera_device_monitor_added (monitor, udevice);
 }
 
 /**
- * empathy_camera_device_monitor_coldplug:
- * @monitor: a #EmpathyCameraDeviceMonitor object.
+ * tpaw_camera_device_monitor_coldplug:
+ * @monitor: a #TpawCameraDeviceMonitor object.
  *
  * Will actively look for plugged in cameras and emit
  * ::added for those new cameras.
@@ -220,9 +219,9 @@ empathy_camera_device_monitor_uevent_cb (GUdevClient               *client,
  * to those signals before they are emitted.
  */
 void
-empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
+tpaw_camera_device_monitor_coldplug (TpawCameraDeviceMonitor *monitor)
 {
-  EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
+  TpawCameraDeviceMonitorPrivate *priv = TPAW_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
   GList                            *devices, *l;
   gint                              i = 0;
 
@@ -236,7 +235,7 @@ empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
   /* Initialize camera structures */
   for (l = devices; l != NULL; l = l->next)
   {
-    empathy_camera_device_monitor_added (monitor, l->data);
+    tpaw_camera_device_monitor_added (monitor, l->data);
     g_object_unref (l->data);
     i++;
   }
@@ -247,10 +246,10 @@ empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
 
 #else /* HAVE_UDEV */
 void
-empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
+tpaw_camera_device_monitor_coldplug (TpawCameraDeviceMonitor *monitor)
 {
   #if 0
-  EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
+  TpawCameraDeviceMonitorPrivate *priv = TPAW_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
   struct v4l2_capability            v2cap;
   struct video_capability           v1cap;
   int                               fd, ok;
@@ -308,7 +307,7 @@ empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
   /* Initialize camera structures */
   for (l = devices; l != NULL; l = l->next)
   {
-    empathy_camera_device_monitor_added (monitor, l->data);
+    tpaw_camera_device_monitor_added (monitor, l->data);
     g_object_unref (l->data);
   }
   g_list_free (devices);
@@ -318,11 +317,11 @@ empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
 #endif /* HAVE_UDEV */
 
 static void
-empathy_camera_device_monitor_finalize (GObject *object)
+tpaw_camera_device_monitor_finalize (GObject *object)
 {
 #ifdef HAVE_UDEV
-  EmpathyCameraDeviceMonitor *monitor = EMPATHY_CAMERA_DEVICE_MONITOR (object);
-  EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
+  TpawCameraDeviceMonitor *monitor = TPAW_CAMERA_DEVICE_MONITOR (object);
+  TpawCameraDeviceMonitorPrivate *priv = TPAW_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
 
   if (priv->client != NULL)
   {
@@ -330,18 +329,18 @@ empathy_camera_device_monitor_finalize (GObject *object)
     priv->client = NULL;
   }
 #endif /* HAVE_UDEV */
-  G_OBJECT_CLASS (empathy_camera_device_monitor_parent_class)->finalize (object);
+  G_OBJECT_CLASS (tpaw_camera_device_monitor_parent_class)->finalize (object);
 }
 
 static void
-empathy_camera_device_monitor_class_init (EmpathyCameraDeviceMonitorClass *klass)
+tpaw_camera_device_monitor_class_init (TpawCameraDeviceMonitorClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = empathy_camera_device_monitor_finalize;
+  object_class->finalize = tpaw_camera_device_monitor_finalize;
 
   /**
-   * EmpathyCameraDeviceMonitor::added:
+   * TpawCameraDeviceMonitor::added:
    * @device: A private object representing the newly added camera.
    * @id: Device unique identifier.
    * @device: Device file name  (e.g. /dev/video2).
@@ -349,17 +348,17 @@ empathy_camera_device_monitor_class_init (EmpathyCameraDeviceMonitorClass *klass
    * @api_version: Supported video4linux API: 1 for v4l, 2 for v4l2.
    *
    * The ::added signal is emitted when a camera is added, or on start-up
-   * after #empathy_camera_device_monitor_colplug is called.
+   * after #tpaw_camera_device_monitor_colplug is called.
    **/
   monitor_signals[ADDED] = g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass),
                                          G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                                         G_STRUCT_OFFSET (EmpathyCameraDeviceMonitorClass, added),
+                                         G_STRUCT_OFFSET (TpawCameraDeviceMonitorClass, added),
                                          NULL, NULL,
                                          g_cclosure_marshal_generic,
                                          G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 
   /**
-   * EmpathyCameraDeviceMonitor::removed:
+   * TpawCameraDeviceMonitor::removed:
    * @device: A private object representing the newly added camera
    * @id: Device unique identifier.
    *
@@ -368,38 +367,38 @@ empathy_camera_device_monitor_class_init (EmpathyCameraDeviceMonitorClass *klass
    **/
   monitor_signals[REMOVED] = g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass),
                                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                                           G_STRUCT_OFFSET (EmpathyCameraDeviceMonitorClass, removed),
+                                           G_STRUCT_OFFSET (TpawCameraDeviceMonitorClass, removed),
                                            NULL, NULL,
                                            g_cclosure_marshal_generic,
                                            G_TYPE_NONE, 1, G_TYPE_STRING);
 
-  g_type_class_add_private (klass, sizeof (EmpathyCameraDeviceMonitorPrivate));
+  g_type_class_add_private (klass, sizeof (TpawCameraDeviceMonitorPrivate));
 }
 
 static void
-empathy_camera_device_monitor_init (EmpathyCameraDeviceMonitor *monitor)
+tpaw_camera_device_monitor_init (TpawCameraDeviceMonitor *monitor)
 {
 #ifdef HAVE_UDEV
-  EmpathyCameraDeviceMonitorPrivate *priv         = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
+  TpawCameraDeviceMonitorPrivate *priv         = TPAW_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
   const gchar *const                subsystems[] = {"video4linux", NULL};
 
   priv->client = g_udev_client_new (subsystems);
   g_signal_connect (G_OBJECT (priv->client), "uevent",
-                    G_CALLBACK (empathy_camera_device_monitor_uevent_cb), monitor);
+                    G_CALLBACK (tpaw_camera_device_monitor_uevent_cb), monitor);
 #endif /* HAVE_UDEV */
 }
 
 /**
- * empathy_camera_device_monitor_new:
+ * tpaw_camera_device_monitor_new:
  *
- * Returns a new #EmpathyCameraDeviceMonitor object.
+ * Returns a new #TpawCameraDeviceMonitor object.
  *
- * Return value: a new #EmpathyCameraDeviceMonitor object.
+ * Return value: a new #TpawCameraDeviceMonitor object.
  **/
-EmpathyCameraDeviceMonitor *
-empathy_camera_device_monitor_new (void)
+TpawCameraDeviceMonitor *
+tpaw_camera_device_monitor_new (void)
 {
-  return g_object_new (EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, NULL);
+  return g_object_new (TPAW_TYPE_CAMERA_DEVICE_MONITOR, NULL);
 }
 
 /*
diff --git a/tp-account-widgets/cheese-camera-device-monitor.h b/tp-account-widgets/cheese-camera-device-monitor.h
new file mode 100644
index 000000000..353440226
--- /dev/null
+++ b/tp-account-widgets/cheese-camera-device-monitor.h
@@ -0,0 +1,67 @@
+/* This file is a copy of cheese-camera-device-monitor.h from Tpaw. We
+ * just renamespaced it to avoid conflicts when linking on libcheese. */
+/*
+ * Copyright © 2007,2008 Jaap Haitsma <jaap@haitsma.org>
+ * Copyright © 2007-2009 daniel g. siegel <dgsiegel@gnome.org>
+ * Copyright © 2008 Ryan zeigler <zeiglerr@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#ifndef __TPAW_CAMERA_DEVICE_MONITOR_H__
+#define __TPAW_CAMERA_DEVICE_MONITOR_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define TPAW_TYPE_CAMERA_DEVICE_MONITOR (tpaw_camera_device_monitor_get_type ())
+#define TPAW_CAMERA_DEVICE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TPAW_TYPE_CAMERA_DEVICE_MONITOR, \
+                                                                               TpawCameraDeviceMonitor))
+#define TPAW_CAMERA_DEVICE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TPAW_TYPE_CAMERA_DEVICE_MONITOR, \
+                                                                            TpawCameraDeviceMonitorClass))
+#define TPAW_IS_CAMERA_DEVICE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TPAW_TYPE_CAMERA_DEVICE_MONITOR))
+#define TPAW_IS_CAMERA_DEVICE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TPAW_TYPE_CAMERA_DEVICE_MONITOR))
+#define TPAW_CAMERA_DEVICE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TPAW_TYPE_CAMERA_DEVICE_MONITOR, \
+                                                                              TpawCameraDeviceMonitorClass))
+
+typedef struct _TpawCameraDeviceMonitorClass TpawCameraDeviceMonitorClass;
+typedef struct _TpawCameraDeviceMonitor TpawCameraDeviceMonitor;
+
+struct _TpawCameraDeviceMonitor
+{
+  GObject parent;
+};
+
+struct _TpawCameraDeviceMonitorClass
+{
+  GObjectClass parent_class;
+
+  void (*added)(TpawCameraDeviceMonitor *camera,
+                const char                *id,
+                const char                *device_file,
+                const char                *product_name,
+                int                        api_version);
+  void (*removed)(TpawCameraDeviceMonitor *camera, const char *id);
+};
+
+GType                      tpaw_camera_device_monitor_get_type (void) G_GNUC_CONST;
+TpawCameraDeviceMonitor *tpaw_camera_device_monitor_new (void);
+void                       tpaw_camera_device_monitor_coldplug (TpawCameraDeviceMonitor *monitor);
+
+G_END_DECLS
+
+#endif /* __TPAW_CAMERA_DEVICE_MONITOR_H__ */