[cheese/cheese-window-refactor] Cleanup debug category init

[Bastien Nocera <hadess src gnome org>]

commit 3798c8e0990ab4f4d8f1145818c13b82f79e3855
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Feb 2 10:07:32 2010 +0000

    Cleanup debug category init
    
    And fix run-time warning with GStreamer debugging enabled.

 libcheese/cheese-camera-device-monitor.c |   12 +++++++-----
 libcheese/cheese-camera-device.c         |   12 +++++++-----
 libcheese/cheese-camera.c                |   13 +++++++------
 libcheese/cheese-gtk.symbols             |    1 +
 4 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index 90b5c27..80dc28d 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -54,8 +54,8 @@ G_DEFINE_TYPE (CheeseCameraDeviceMonitor, cheese_camera_device_monitor, G_TYPE_O
 
 #define CHEESE_CAMERA_DEVICE_MONITOR_ERROR cheese_camera_device_monitor_error_quark ()
 
-GST_DEBUG_CATEGORY (cheese_device_monitor);
-#define GST_CAT_DEFAULT cheese_device_monitor
+GST_DEBUG_CATEGORY (cheese_device_monitor_cat);
+#define GST_CAT_DEFAULT cheese_device_monitor_cat
 
 enum CheeseCameraDeviceMonitorError
 {
@@ -331,6 +331,11 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  if (cheese_device_monitor_cat == NULL)
+    GST_DEBUG_CATEGORY_INIT (cheese_device_monitor_cat,
+                             "cheese-device-monitor",
+                             0, "Cheese Camera Device Monitor");
+
   object_class->finalize = cheese_camera_device_monitor_finalize;
 
   /**
@@ -367,9 +372,6 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
 static void
 cheese_camera_device_monitor_init (CheeseCameraDeviceMonitor *monitor)
 {
-  GST_DEBUG_CATEGORY_INIT (cheese_device_monitor,
-                           "cheese-device-monitor",
-                           0, "Cheese Camera Device Monitor");
 #ifdef HAVE_UDEV
   CheeseCameraDeviceMonitorPrivate *priv         = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
   const gchar *const                subsystems[] = {"video4linux", NULL};
diff --git a/libcheese/cheese-camera-device.c b/libcheese/cheese-camera-device.c
index d6b08d2..6e21b16 100644
--- a/libcheese/cheese-camera-device.c
+++ b/libcheese/cheese-camera-device.c
@@ -51,8 +51,8 @@ enum CheeseCameraDeviceError
   CHEESE_CAMERA_DEVICE_ERROR_UNSUPPORTED_CAPS
 };
 
-GST_DEBUG_CATEGORY (cheese_camera_device);
-#define GST_CAT_DEFAULT cheese_camera_device
+GST_DEBUG_CATEGORY (cheese_camera_device_cat);
+#define GST_CAT_DEFAULT cheese_camera_device_cat
 
 static gchar *supported_formats[] = {
   "video/x-raw-rgb",
@@ -437,6 +437,11 @@ cheese_camera_device_class_init (CheeseCameraDeviceClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  if (cheese_camera_device_cat == NULL)
+    GST_DEBUG_CATEGORY_INIT (cheese_camera_device_cat,
+			     "cheese-camera-device",
+			     0, "Cheese Camera Device");
+
   object_class->finalize     = cheese_camera_device_finalize;
   object_class->get_property = cheese_camera_device_get_property;
   object_class->set_property = cheese_camera_device_set_property;
@@ -476,9 +481,6 @@ cheese_camera_device_init (CheeseCameraDevice *device)
   CheeseCameraDevicePrivate *priv =
     CHEESE_CAMERA_DEVICE_GET_PRIVATE (device);
 
-  GST_DEBUG_CATEGORY_INIT (cheese_camera_device,
-                           "cheese-camera-device",
-                           0, "Cheese Camera Device");
   priv->device = NULL;
   priv->id     = NULL;
   priv->src    = NULL;
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 63e4139..003e67d 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -134,8 +134,8 @@ static const EffectToPipelineDesc EFFECT_TO_PIPELINE_DESC[] = {
 
 static const int NUM_EFFECTS = G_N_ELEMENTS (EFFECT_TO_PIPELINE_DESC);
 
-GST_DEBUG_CATEGORY (cheese_camera);
-#define GST_CAT_DEFAULT cheese_camera
+GST_DEBUG_CATEGORY (cheese_camera_cat);
+#define GST_CAT_DEFAULT cheese_camera_cat
 
 GQuark
 cheese_camera_error_quark (void)
@@ -1011,6 +1011,11 @@ cheese_camera_class_init (CheeseCameraClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  if (cheese_camera_cat == NULL)
+    GST_DEBUG_CATEGORY_INIT (cheese_camera_cat,
+                             "cheese-camera",
+                             0, "Cheese Camera");
+
   object_class->finalize     = cheese_camera_finalize;
   object_class->get_property = cheese_camera_get_property;
   object_class->set_property = cheese_camera_set_property;
@@ -1065,10 +1070,6 @@ cheese_camera_init (CheeseCamera *camera)
 {
   CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
 
-  GST_DEBUG_CATEGORY_INIT (cheese_camera,
-                           "cheese-camera",
-                           0, "Cheese Camera");
-
   priv->is_recording            = FALSE;
   priv->pipeline_is_playing     = FALSE;
   priv->photo_filename          = NULL;
diff --git a/libcheese/cheese-gtk.symbols b/libcheese/cheese-gtk.symbols
index 8612f5e..4c26468 100644
--- a/libcheese/cheese-gtk.symbols
+++ b/libcheese/cheese-gtk.symbols
@@ -6,6 +6,7 @@ cheese_widget_get_video_area
 cheese_gconf_get_type
 cheese_camera_get_type
 cheese_camera_device_get_type
+cheese_camera_device_cat
 cheese_video_format_get_type
 cheese_avatar_chooser_get_type
 cheese_avatar_chooser_new