[cheese] Rename camerabin2 to camerabin

[David King <davidk src gnome org>]

commit 46f85427fe762175e7f014999ccc9732fe60b13d
Author: Thiago Santos <thiago sousa santos collabora com>
Date:   Tue Aug 28 20:35:12 2012 -0300

    Rename camerabin2 to camerabin
    
    camerabin2 was renamed to camerabin in GStreamer 1.0.

 configure.ac              |    2 +-
 libcheese/cheese-camera.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8431967..013bab0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,7 @@ PKG_CHECK_MODULES([CHEESE_GTK],
 AC_PATH_PROGS([GST_INSPECT], [gst-inspect-1.0], [notfound])
 AS_IF([test "x$GST_INSPECT" = "xnotfound"],
   [AC_MSG_WARN([unable to check for runtime GStreamer plugin dependencies])],
-  [GST_RUNTIME_PLUGINS="camerabin2 vp8enc webmmux"
+  [GST_RUNTIME_PLUGINS="camerabin vp8enc webmmux"
    for gst_runtime_plugin in $GST_RUNTIME_PLUGINS
    do
      AC_MSG_CHECKING([for $gst_runtime_plugin GStreamer plugin])
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 69bbeea..59470aa 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -234,7 +234,7 @@ cheese_camera_bus_message_cb (GstBus *bus, GstMessage *message, CheeseCamera *ca
     }
     case GST_MESSAGE_STATE_CHANGED:
     {
-      if (strcmp (GST_MESSAGE_SRC_NAME (message), "camerabin2") == 0)
+      if (strcmp (GST_MESSAGE_SRC_NAME (message), "camerabin") == 0)
       {
         GstState old, new;
         gst_message_parse_state_changed (message, &old, &new, NULL);
@@ -268,7 +268,7 @@ cheese_camera_bus_message_cb (GstBus *bus, GstMessage *message, CheeseCamera *ca
           }
         }
       }
-      if (strcmp (GST_MESSAGE_SRC_NAME (message), "camerabin2") == 0)
+      if (strcmp (GST_MESSAGE_SRC_NAME (message), "camerabin") == 0)
       {
         structure = gst_message_get_structure (message);
         if (strcmp (gst_structure_get_name (structure), "image-done") == 0)
@@ -1530,9 +1530,9 @@ cheese_camera_setup (CheeseCamera *camera, const gchar *uuid, GError **error)
   }
 
 
-  if ((priv->camerabin = gst_element_factory_make ("camerabin2", "camerabin2")) == NULL)
+  if ((priv->camerabin = gst_element_factory_make ("camerabin", "camerabin")) == NULL)
   {
-    cheese_camera_set_error_element_not_found (error, "camerabin2");
+    cheese_camera_set_error_element_not_found (error, "camerabin");
   }
   if ((priv->camera_source = gst_element_factory_make ("wrappercamerabinsrc", "camera_source")) == NULL)
   {
@@ -1798,7 +1798,7 @@ cheese_camera_get_recorded_time (CheeseCamera *camera)
     return g_strdup_printf (C_("time format", "%02i:%02i:%02i"),
                             hours, minutes, seconds);
   } else {
-    GST_WARNING ("Failed to get time from video filesink from camerabin2");
+    GST_WARNING ("Failed to get time from video filesink from camerabin");
     return "";
   }
 }