[cheese/capsrework: 7/9] Fix some warning
- From: Filippo Argiolas <fargiolas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [cheese/capsrework: 7/9] Fix some warning
- Date: Sun, 13 Dec 2009 20:09:05 +0000 (UTC)
commit 83f213fe687c7aab42d37de81564e956593230ee
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Sun Dec 13 20:29:05 2009 +0100
Fix some warning
libcheese/cheese-camera.c | 11 +----------
src/cheese-prefs-resolution-combo.c | 3 +--
2 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 9096aa9..58a33ca 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -288,7 +288,7 @@ cheese_camera_add_device (CheeseCameraDeviceMonitor *monitor,
}
static void
-cheese_camera_get_video_devices_from_udev (CheeseCamera *camera)
+cheese_camera_detect_camera_devices (CheeseCamera *camera)
{
CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
CheeseCameraDeviceMonitor *monitor;
@@ -303,15 +303,6 @@ cheese_camera_get_video_devices_from_udev (CheeseCamera *camera)
g_object_unref (monitor);
}
-static void
-cheese_camera_detect_camera_devices (CheeseCamera *camera)
-{
- CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
-
- /* FIXME: reduntant */
- cheese_camera_get_video_devices_from_udev (camera);
-}
-
static gboolean
cheese_camera_create_camera_source_bin (CheeseCamera *camera)
{
diff --git a/src/cheese-prefs-resolution-combo.c b/src/cheese-prefs-resolution-combo.c
index 9b08b21..5ccb48f 100644
--- a/src/cheese-prefs-resolution-combo.c
+++ b/src/cheese-prefs-resolution-combo.c
@@ -112,10 +112,9 @@ cheese_prefs_resolution_combo_synchronize (CheesePrefsWidget *prefs_widget)
CheesePrefsResolutionComboPrivate *priv = CHEESE_PREFS_RESOLUTION_COMBO_GET_PRIVATE (self);
GtkWidget *combo_box;
- CheeseVideoFormat *current_format;
+ const CheeseVideoFormat *current_format;
GList *formats;
GList *l;
- int i;
CheeseVideoFormat *format;
gchar *format_name;
GtkTreeIter iter;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]